projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
19462: Updating status colors
[arvados-workbench2.git]
/
src
/
store
/
processes
/
process.ts
diff --git
a/src/store/processes/process.ts
b/src/store/processes/process.ts
index e5b2c8403cc77d5e8aaeb6b961a59d46a8b27b70..354d816b2f8ca7bd19c65c80634d82b8c4ab99bd 100644
(file)
--- a/
src/store/processes/process.ts
+++ b/
src/store/processes/process.ts
@@
-4,11
+4,11
@@
import { ContainerRequestResource, ContainerRequestState } from '../../models/container-request';
import { ContainerResource, ContainerState } from '../../models/container';
import { ContainerRequestResource, ContainerRequestState } from '../../models/container-request';
import { ContainerResource, ContainerState } from '../../models/container';
-import { ResourcesState, getResource } from '
~/
store/resources/resources';
+import { ResourcesState, getResource } from 'store/resources/resources';
import { filterResources } from '../resources/resources';
import { filterResources } from '../resources/resources';
-import { ResourceKind, Resource, extractUuidKind } from '
~/
models/resource';
-import { getTimeDiff } from '
~/
common/formatters';
-import { ArvadosTheme } from '
~/
common/custom-theme';
+import { ResourceKind, Resource, extractUuidKind } from 'models/resource';
+import { getTimeDiff } from 'common/formatters';
+import { ArvadosTheme } from 'common/custom-theme';
export interface Process {
containerRequest: ContainerRequestResource;
export interface Process {
containerRequest: ContainerRequestResource;
@@
-19,10
+19,12
@@
export enum ProcessStatus {
CANCELLED = 'Cancelled',
COMPLETED = 'Completed',
DRAFT = 'Draft',
CANCELLED = 'Cancelled',
COMPLETED = 'Completed',
DRAFT = 'Draft',
+ FAILING = 'Failing',
FAILED = 'Failed',
FAILED = 'Failed',
-
LOCKED = 'Locke
d',
+
ONHOLD = 'On hol
d',
QUEUED = 'Queued',
RUNNING = 'Running',
QUEUED = 'Queued',
RUNNING = 'Running',
+ WARNING = 'Warning',
UNKNOWN = 'Unknown',
}
UNKNOWN = 'Unknown',
}
@@
-71,44
+73,58
@@
export const getProcessRuntime = ({ container }: Process) => {
}
};
}
};
-export const getProcessStatusColor = (status: string, { customs
, palette
}: ArvadosTheme) => {
+export const getProcessStatusColor = (status: string, { customs }: ArvadosTheme) => {
switch (status) {
case ProcessStatus.RUNNING:
switch (status) {
case ProcessStatus.RUNNING:
- return customs.colors.
blue5
00;
+ return customs.colors.
green8
00;
case ProcessStatus.COMPLETED:
case ProcessStatus.COMPLETED:
- return customs.colors.green700;
+ case ProcessStatus.WARNING:
+ return customs.colors.green800;
+ case ProcessStatus.FAILING:
case ProcessStatus.CANCELLED:
case ProcessStatus.FAILED:
return customs.colors.red900;
default:
case ProcessStatus.CANCELLED:
case ProcessStatus.FAILED:
return customs.colors.red900;
default:
- return
palette.grey["500"]
;
+ return
customs.colors.grey600
;
}
};
export const getProcessStatus = ({ containerRequest, container }: Process): ProcessStatus => {
switch (true) {
}
};
export const getProcessStatus = ({ containerRequest, container }: Process): ProcessStatus => {
switch (true) {
+ case containerRequest.state === ContainerRequestState.FINAL &&
+ container?.state !== ContainerState.COMPLETE:
+ // Request was finalized before its container started (or the
+ // container was cancelled)
+ return ProcessStatus.CANCELLED;
+
case containerRequest.state === ContainerRequestState.UNCOMMITTED:
return ProcessStatus.DRAFT;
case containerRequest.state === ContainerRequestState.UNCOMMITTED:
return ProcessStatus.DRAFT;
- case container && container.state === ContainerState.COMPLETE && container.exitCode === 0:
- return ProcessStatus.COMPLETED;
+ case container?.state === ContainerState.COMPLETE:
+ if (container?.exitCode === 0) {
+ return ProcessStatus.COMPLETED;
+ }
+ return ProcessStatus.FAILED;
- case containerRequest.priority === 0:
- case container && container.state === ContainerState.CANCELLED:
+ case container?.state === ContainerState.CANCELLED:
return ProcessStatus.CANCELLED;
return ProcessStatus.CANCELLED;
- case container && container.state === ContainerState.QUEUED:
+ case container?.state === ContainerState.QUEUED ||
+ container?.state === ContainerState.LOCKED:
+ if (containerRequest.priority === 0) {
+ return ProcessStatus.ONHOLD;
+ }
return ProcessStatus.QUEUED;
return ProcessStatus.QUEUED;
- case container && container.state === ContainerState.LOCKED:
- return ProcessStatus.LOCKED;
-
- case container && container.state === ContainerState.RUNNING:
+ case container?.state === ContainerState.RUNNING:
+ if (!!container?.runtimeStatus.error) {
+ return ProcessStatus.FAILING;
+ }
+ if (!!container?.runtimeStatus.warning) {
+ return ProcessStatus.WARNING;
+ }
return ProcessStatus.RUNNING;
return ProcessStatus.RUNNING;
- case container && container.state === ContainerState.COMPLETE && container.exitCode !== 0:
- return ProcessStatus.FAILED;
-
default:
return ProcessStatus.UNKNOWN;
}
default:
return ProcessStatus.UNKNOWN;
}