Merge branch 'master' of git.curoverse.com:arvados-workbench2 into 14433_properties_i...

[arvados-workbench2.git] / src / models / workflow.ts

diff --git a/src/models/workflow.ts b/src/models/workflow.ts
index 1cb3d46e8cb09a925adf1cd1b87de5f61f49b2ea..3a38348ef25751eb147a60c1d7deeacb20b861df 100644 (file)
--- a/src/models/workflow.ts
+++ b/src/models/workflow.ts
@@ -41,6 +41,8 @@ export type CommandInputParameter =
     FileCommandInputParameter |
     DirectoryCommandInputParameter |
     StringArrayCommandInputParameter |
+    IntArrayCommandInputParameter |
+    FloatArrayCommandInputParameter |
     FileArrayCommandInputParameter |
     DirectoryArrayCommandInputParameter |
     EnumCommandInputParameter;
@@ -90,6 +92,8 @@ export interface GenericCommandInputParameter<Type, Value> {
     doc?: string | string[];
     default?: Value;
     type?: Type | Array<Type | CWLType.NULL>;
+    value?: Value;
+    disabled?: boolean;
 }
 export type GenericArrayCommandInputParameter<Type, Value> = GenericCommandInputParameter<CommandInputArraySchema<Type>, Value[]>;
 
@@ -104,9 +108,14 @@ export type DirectoryCommandInputParameter = GenericCommandInputParameter<CWLTyp
 export type EnumCommandInputParameter = GenericCommandInputParameter<CommandInputEnumSchema, string>;
 
 export type StringArrayCommandInputParameter = GenericArrayCommandInputParameter<CWLType.STRING, string>;
+export type IntArrayCommandInputParameter = GenericArrayCommandInputParameter<CWLType.INT, string>;
+export type FloatArrayCommandInputParameter = GenericArrayCommandInputParameter<CWLType.FLOAT, string>;
 export type FileArrayCommandInputParameter = GenericArrayCommandInputParameter<CWLType.FILE, File>;
 export type DirectoryArrayCommandInputParameter = GenericArrayCommandInputParameter<CWLType.DIRECTORY, Directory>;
 
+export type WorkflowInputsData = {
+    [key: string]: boolean | number | string | File | Directory;
+};
 export const parseWorkflowDefinition = (workflow: WorkflowResource): WorkflowResoruceDefinition => {
     const definition = safeLoad(workflow.definition);
     return definition;
@@ -119,7 +128,7 @@ export const getWorkflowInputs = (workflowDefinition: WorkflowResoruceDefinition
         : undefined;
 };
 export const getInputLabel = (input: CommandInputParameter) => {
-    return `${input.label || input.id}${isRequiredInput(input) ? '*' : ''}`;
+    return `${input.label || input.id}`;
 };
 
 export const isRequiredInput = ({ type }: CommandInputParameter) => {
@@ -132,6 +141,18 @@ export const isRequiredInput = ({ type }: CommandInputParameter) => {
     }
     return true;
 };
+
+export const isPrimitiveOfType = (input: GenericCommandInputParameter<any, any>, type: CWLType) =>
+    input.type instanceof Array
+        ? input.type.indexOf(type) > -1
+        : input.type === type;
+
+export const isArrayOfType = (input: GenericCommandInputParameter<any, any>, type: CWLType) =>
+    typeof input.type === 'object' &&
+        input.type.type === 'array'
+        ? input.type.items === type
+        : false;
+
 export const stringifyInputType = ({ type }: CommandInputParameter) => {
     if (typeof type === 'string') {
         return type;