diff --git a/package.json b/package.json index 25c774f77..7062f7d71 100644 --- a/package.json +++ b/package.json @@ -84,6 +84,7 @@ "@lezer/highlight": "^1.1.3", "@sveltejs/package": "^2.0.2", "@sveltejs/svelte-virtual-list": "^3.0.1", + "class-variance-authority": "^0.7.0", "date-fns": "^2.29.3", "date-fns-tz": "^1.3.7", "esm-env": "^1.0.0", @@ -93,6 +94,7 @@ "json-bigint": "^1.0.0", "just-debounce": "^1.1.0", "sanitize-html": "^2.8.1", + "tailwind-merge": "^1.14.0", "url-pattern": "^1.0.3", "uuid": "^9.0.0", "vis-timeline": "^7.7.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e98c3223e..6902a1946 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -44,6 +44,9 @@ dependencies: '@sveltejs/svelte-virtual-list': specifier: ^3.0.1 version: 3.0.1 + class-variance-authority: + specifier: ^0.7.0 + version: 0.7.0 date-fns: specifier: ^2.29.3 version: 2.29.3 @@ -71,6 +74,9 @@ dependencies: sanitize-html: specifier: ^2.8.1 version: 2.8.1 + tailwind-merge: + specifier: ^1.14.0 + version: 1.14.0 url-pattern: specifier: ^1.0.3 version: 1.0.3 @@ -3445,6 +3451,12 @@ packages: engines: {node: '>=8'} dev: true + /class-variance-authority@0.7.0: + resolution: {integrity: sha512-jFI8IQw4hczaL4ALINxqLEXQbWcNjoSkloa4IaufXCJr6QawJyw7tuRysRsrE8w2p/4gGaxKIt/hX3qz/IbD1A==} + dependencies: + clsx: 2.0.0 + dev: false + /clean-stack@2.2.0: resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==} engines: {node: '>=6'} @@ -3499,6 +3511,11 @@ packages: wrap-ansi: 7.0.0 dev: true + /clsx@2.0.0: + resolution: {integrity: sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==} + engines: {node: '>=6'} + dev: false + /color-convert@1.9.3: resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==} dependencies: @@ -9295,6 +9312,10 @@ packages: strip-ansi: 6.0.1 dev: true + /tailwind-merge@1.14.0: + resolution: {integrity: sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ==} + dev: false + /tailwindcss@3.2.4(postcss@8.4.21)(ts-node@10.9.1): resolution: {integrity: sha512-AhwtHCKMtR71JgeYDaswmZXhPcW9iuI9Sp2LvZPo9upDZ7231ZJ7eA9RaURbhpXGVlrjX4cFNlB4ieTetEb7hQ==} engines: {node: '>=12.13.0'} diff --git a/src/lib/components/workflow-status.svelte b/src/lib/components/workflow-status.svelte index 1da811869..8e9f58dc8 100644 --- a/src/lib/components/workflow-status.svelte +++ b/src/lib/components/workflow-status.svelte @@ -1,16 +1,19 @@ - - - {label} - {#if isRunning} +
+ + {label[status]} + {#if status === 'Running'} {/if} - - - +
diff --git a/src/lib/components/workflow/workflows-summary-configurable-table/tests/__snapshots__/table-body-cell.test.ts.snap b/src/lib/components/workflow/workflows-summary-configurable-table/tests/__snapshots__/table-body-cell.test.ts.snap index 3f98b4ac7..afeb82ab9 100644 --- a/src/lib/components/workflow/workflows-summary-configurable-table/tests/__snapshots__/table-body-cell.test.ts.snap +++ b/src/lib/components/workflow/workflows-summary-configurable-table/tests/__snapshots__/table-body-cell.test.ts.snap @@ -20,7 +20,7 @@ exports[`Table_body_cell$ > Start renders 1`] = `" State Transitions renders 1`] = `"12"`; -exports[`Table_body_cell$ > Status renders 1`] = `"Running
"`; +exports[`Table_body_cell$ > Status renders 1`] = `"
Running
"`; exports[`Table_body_cell$ > Task Queue renders 1`] = `"task-queue"`; diff --git a/src/lib/components/workflow/workflows-summary-configurable-table/tests/__snapshots__/table-header-cell.test.ts.snap b/src/lib/components/workflow/workflows-summary-configurable-table/tests/__snapshots__/table-header-cell.test.ts.snap index 91a4a281b..f82d80ce2 100644 --- a/src/lib/components/workflow/workflows-summary-configurable-table/tests/__snapshots__/table-header-cell.test.ts.snap +++ b/src/lib/components/workflow/workflows-summary-configurable-table/tests/__snapshots__/table-header-cell.test.ts.snap @@ -20,7 +20,7 @@ exports[`Table_header_cell$ > Start renders 1`] = `" State Transitions renders 1`] = `"State Transitions"`; -exports[`Table_header_cell$ > Status renders 1`] = `"
"`; +exports[`Table_header_cell$ > Status renders 1`] = `"
"`; exports[`Table_header_cell$ > Task Queue renders 1`] = `"Task Queue"`; diff --git a/src/lib/i18n/locales/en/events.ts b/src/lib/i18n/locales/en/events.ts index 7f874c677..a3f2646ff 100644 --- a/src/lib/i18n/locales/en/events.ts +++ b/src/lib/i18n/locales/en/events.ts @@ -38,4 +38,19 @@ export const Strings = { 'history-expected-formats': 'Expected JSON formats', 'event-history-import-error': 'Could not create event history from JSON', 'event-history-load-error': 'Could not parse JSON', + 'event-classification-unspecified': 'Unspecified', + 'event-classification-scheduled': 'Scheduled', + 'event-classification-open': 'Open', + 'event-classification-new': 'New', + 'event-classification-started': 'Started', + 'event-classification-initiated': 'Initiated', + 'event-classification-running': 'Running', + 'event-classification-completed': 'Completed', + 'event-classification-fired': 'Fired', + 'event-classification-cancelrequested': 'Cancel Requested', + 'event-classification-timedout': 'Timed Out', + 'event-classification-signaled': 'Signaled', + 'event-classification-canceled': 'Canceled', + 'event-classification-failed': 'Failed', + 'event-classification-terminated': 'Terminated', } as const; diff --git a/src/lib/models/workflow-status.ts b/src/lib/models/workflow-status.ts index ac867bd4a..1e207f071 100644 --- a/src/lib/models/workflow-status.ts +++ b/src/lib/models/workflow-status.ts @@ -1,9 +1,8 @@ import type { WorkflowStatus } from '$lib/types/workflows'; -export type WorkflowStatuses = readonly WorkflowStatus[]; export type WorkflowFilters = readonly (WorkflowStatus | 'All')[]; -export const workflowStatuses: WorkflowStatuses = [ +export const workflowStatuses: Readonly = [ 'Running', 'TimedOut', 'Completed', diff --git a/src/lib/types/schedule.ts b/src/lib/types/schedule.ts index ebea83219..7c1d6da7a 100644 --- a/src/lib/types/schedule.ts +++ b/src/lib/types/schedule.ts @@ -61,3 +61,5 @@ export type SchedulePresetsParameters = { export type ScheduleParameters = ScheduleActionParameters & ScheduleSpecParameters & SchedulePresetsParameters; + +export type ScheduleStatus = 'Paused' | 'Running';