Merge branch '17308-property-editor-fixes'

[arvados.git] / src / store / workflow-panel / workflow-panel-actions.ts

diff --git a/src/store/workflow-panel/workflow-panel-actions.ts b/src/store/workflow-panel/workflow-panel-actions.ts
index 3f91c102624244b6cf507a55e6b17ef4e31637a5..4cfcd8b9445e448741d27abb43ae77c47b3d3c6f 100644 (file)
--- a/src/store/workflow-panel/workflow-panel-actions.ts
+++ b/src/store/workflow-panel/workflow-panel-actions.ts
@@ -9,7 +9,7 @@ import { bindDataExplorerActions } from '~/store/data-explorer/data-explorer-act
 import { propertiesActions } from '~/store/properties/properties-actions';
 import { getProperty } from '~/store/properties/properties';
 import { navigateToRunProcess } from '~/store/navigation/navigation-action';
-import { goToStep, runProcessPanelActions, loadPresets, DEFAULT_ADVANCED_FORM_VALUES } from '~/store/run-process-panel/run-process-panel-actions';
+import { goToStep, runProcessPanelActions, loadPresets, getWorkflowRunnerSettings } from '~/store/run-process-panel/run-process-panel-actions';
 import { snackbarActions } from '~/store/snackbar/snackbar-actions';
 import { initialize } from 'redux-form';
 import { RUN_PROCESS_ADVANCED_FORM } from '~/views/run-process-panel/run-process-advanced-form';
@@ -43,18 +43,18 @@ export const openRunProcess = (uuid: string) =>
             dispatch(runProcessPanelActions.SET_STEP_CHANGED(true));
             dispatch(runProcessPanelActions.SET_SELECTED_WORKFLOW(workflow));
             dispatch<any>(loadPresets(workflow.uuid));
-            dispatch(initialize(RUN_PROCESS_ADVANCED_FORM, DEFAULT_ADVANCED_FORM_VALUES));
+            dispatch(initialize(RUN_PROCESS_ADVANCED_FORM, getWorkflowRunnerSettings(workflow)));
         } else {
             dispatch<any>(snackbarActions.OPEN_SNACKBAR({ message: `You can't run this process` }));
         }
     };
 
 export const getPublicUserUuid = (state: RootState) => {
-    const prefix = getProperty<string>(UUID_PREFIX_PROPERTY_NAME)(state.properties);
+    const prefix = state.auth.localCluster;
     return `${prefix}-tpzed-anonymouspublic`;
 };
 export const getPublicGroupUuid = (state: RootState) => {
-    const prefix = getProperty<string>(UUID_PREFIX_PROPERTY_NAME)(state.properties);
+    const prefix = state.auth.localCluster;
     return `${prefix}-j7d0g-anonymouspublic`;
 };