From f83fe8432a8693c3e57c2bf605ca59974631db34 Mon Sep 17 00:00:00 2001 From: Aleksei Latunov <139361138+alatunov@users.noreply.github.com> Date: Wed, 29 Jan 2025 15:30:56 +0300 Subject: [PATCH 1/2] ADH-5616: Add "Scheduled" status for actions --- .../Cells/ActionStatusCell/ActionStatusCell.tsx | 4 ++-- .../components/common/StatusMarker/StatusMarker.module.scss | 5 +++++ .../src/components/common/StatusMarker/StatusMarker.types.ts | 2 +- .../pages/ActionPage/ActionHeader/ActionHeader.tsx | 2 +- .../app/src/components/uikit/Icon/icons/status-scheduled.svg | 4 ++++ smart-frontend/app/src/components/uikit/Icon/sprite.ts | 1 + smart-frontend/app/src/models/adh/action.ts | 1 + 7 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 smart-frontend/app/src/components/uikit/Icon/icons/status-scheduled.svg diff --git a/smart-frontend/app/src/components/common/Action/ActionTableComponents/Cells/ActionStatusCell/ActionStatusCell.tsx b/smart-frontend/app/src/components/common/Action/ActionTableComponents/Cells/ActionStatusCell/ActionStatusCell.tsx index 21c5d19be7..388b078834 100644 --- a/smart-frontend/app/src/components/common/Action/ActionTableComponents/Cells/ActionStatusCell/ActionStatusCell.tsx +++ b/smart-frontend/app/src/components/common/Action/ActionTableComponents/Cells/ActionStatusCell/ActionStatusCell.tsx @@ -18,8 +18,7 @@ import React from 'react'; import TableCell from '@uikit/Table/TableCell/TableCell'; import StatusMarker from '@commonComponents/StatusMarker/StatusMarker'; -import { AdhActionState } from '@models/adh'; -import type { AdhAction } from '@models/adh'; +import { type AdhAction, AdhActionState } from '@models/adh'; import { getStatusLabel } from '@utils/humanisationUtils'; import type { CommonStatus } from '@commonComponents/StatusMarker/StatusMarker.types'; import { FlexGroup } from '@uikit'; @@ -28,6 +27,7 @@ const actionStateToStatus: Record = { [AdhActionState.Failed]: 'red', [AdhActionState.Running]: 'blue', [AdhActionState.Successful]: 'green', + [AdhActionState.Scheduled]: 'circle', }; interface ActionStatusCellProps { diff --git a/smart-frontend/app/src/components/common/StatusMarker/StatusMarker.module.scss b/smart-frontend/app/src/components/common/StatusMarker/StatusMarker.module.scss index 659d6dbdbf..0f1716d63e 100644 --- a/smart-frontend/app/src/components/common/StatusMarker/StatusMarker.module.scss +++ b/smart-frontend/app/src/components/common/StatusMarker/StatusMarker.module.scss @@ -4,12 +4,14 @@ --statusMarker-blue: var(--color-blue); --statusMarker-green: var(--color-greenSaturated); --statusMarker-red: var(--color-red); + --statusMarker-circle: var(--color-grayUsual); } body.theme-light { --statusMarker-gray: var(--color-popupLightDarker); --statusMarker-blue: var(--color-blue); --statusMarker-green: var(--color-greenLogo); --statusMarker-red: var(--color-red); + --statusMarker-circle: var(--color-grayUsual); } } @@ -31,4 +33,7 @@ &_red { background-color: var(--statusMarker-red); } + &_circle { + border: 1px solid var(--statusMarker-circle); + } } diff --git a/smart-frontend/app/src/components/common/StatusMarker/StatusMarker.types.ts b/smart-frontend/app/src/components/common/StatusMarker/StatusMarker.types.ts index 929bd3a92a..ad2a3f6ac4 100644 --- a/smart-frontend/app/src/components/common/StatusMarker/StatusMarker.types.ts +++ b/smart-frontend/app/src/components/common/StatusMarker/StatusMarker.types.ts @@ -15,4 +15,4 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -export type CommonStatus = 'gray' | 'blue' | 'green' | 'red'; +export type CommonStatus = 'gray' | 'blue' | 'green' | 'red' | 'circle'; diff --git a/smart-frontend/app/src/components/pages/ActionPage/ActionHeader/ActionHeader.tsx b/smart-frontend/app/src/components/pages/ActionPage/ActionHeader/ActionHeader.tsx index 6a4141b29c..39696bf6d0 100644 --- a/smart-frontend/app/src/components/pages/ActionPage/ActionHeader/ActionHeader.tsx +++ b/smart-frontend/app/src/components/pages/ActionPage/ActionHeader/ActionHeader.tsx @@ -16,7 +16,6 @@ * limitations under the License. */ -import React from 'react'; import { type IconsNames, Icon, Title } from '@uikit'; import { AdhActionState } from '@models/adh'; import s from './ActionHeader.module.scss'; @@ -27,6 +26,7 @@ const actionStateToIconName: Record = { [AdhActionState.Failed]: 'status-failed', [AdhActionState.Running]: 'status-running', [AdhActionState.Successful]: 'status-ok', + [AdhActionState.Scheduled]: 'status-scheduled', }; const ActionHeader = () => { diff --git a/smart-frontend/app/src/components/uikit/Icon/icons/status-scheduled.svg b/smart-frontend/app/src/components/uikit/Icon/icons/status-scheduled.svg new file mode 100644 index 0000000000..a2e72a1157 --- /dev/null +++ b/smart-frontend/app/src/components/uikit/Icon/icons/status-scheduled.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/smart-frontend/app/src/components/uikit/Icon/sprite.ts b/smart-frontend/app/src/components/uikit/Icon/sprite.ts index a188938d83..6d7142cd27 100644 --- a/smart-frontend/app/src/components/uikit/Icon/sprite.ts +++ b/smart-frontend/app/src/components/uikit/Icon/sprite.ts @@ -47,6 +47,7 @@ export const allowIconsNames = [ 'status-ok', 'status-running', 'status-warning', + 'status-scheduled', 'table-filter', 'user', ] as const; diff --git a/smart-frontend/app/src/models/adh/action.ts b/smart-frontend/app/src/models/adh/action.ts index d114153420..87d55656ef 100644 --- a/smart-frontend/app/src/models/adh/action.ts +++ b/smart-frontend/app/src/models/adh/action.ts @@ -26,6 +26,7 @@ export enum AdhActionState { Running = 'RUNNING', Successful = 'SUCCESSFUL', Failed = 'FAILED', + Scheduled = 'SCHEDULED', } export interface AdhAction { From 838ec74437014a4a4606bde88c4c531f7a70c7cd Mon Sep 17 00:00:00 2001 From: Aleksei Latunov <139361138+alatunov@users.noreply.github.com> Date: Wed, 29 Jan 2025 16:36:58 +0300 Subject: [PATCH 2/2] ADH-5616: Fix color --- .../src/components/common/StatusMarker/StatusMarker.module.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smart-frontend/app/src/components/common/StatusMarker/StatusMarker.module.scss b/smart-frontend/app/src/components/common/StatusMarker/StatusMarker.module.scss index 0f1716d63e..06de83bd67 100644 --- a/smart-frontend/app/src/components/common/StatusMarker/StatusMarker.module.scss +++ b/smart-frontend/app/src/components/common/StatusMarker/StatusMarker.module.scss @@ -11,7 +11,7 @@ --statusMarker-blue: var(--color-blue); --statusMarker-green: var(--color-greenLogo); --statusMarker-red: var(--color-red); - --statusMarker-circle: var(--color-grayUsual); + --statusMarker-circle: var(--color-ADCM); } }