cr changes

Feature #14318

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>

diff --git a/src/store/collections/collection-create-actions.ts b/src/store/collections/collection-create-actions.ts
index c42b4ef40cdaf4407ec4a1bd0ef541f133c9257c..05249b458fcdb1e01f872c2a7350e3e804992ef5 100644 (file)
--- a/src/store/collections/collection-create-actions.ts
+++ b/src/store/collections/collection-create-actions.ts
@@ -11,7 +11,7 @@ import { getCommonResourceServiceError, CommonResourceServiceError } from "~/ser
 import { uploadCollectionFiles } from './collection-upload-actions';
 import { fileUploaderActions } from '~/store/file-uploader/file-uploader-actions';
 import { progressIndicatorActions } from "~/store/progress-indicator/progress-indicator-actions";
-import { isItemNotInProject, isProjectRoute } from '~/store/projects/project-create-actions';
+import { isNotProjectItem } from '~/store/projects/project-create-actions';
 
 export interface CollectionCreateFormDialogData {
     ownerUuid: string;
@@ -23,7 +23,7 @@ export const COLLECTION_CREATE_FORM_NAME = "collectionCreateFormName";
 
 export const openCollectionCreateDialog = (ownerUuid: string) =>
     (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
-        if (isItemNotInProject || !isProjectRoute) {
+        if (isNotProjectItem) {
             const userUuid = getState().auth.user!.uuid;
             dispatch(initialize(COLLECTION_CREATE_FORM_NAME, { userUuid }));
         } else {

diff --git a/src/store/projects/project-create-actions.ts b/src/store/projects/project-create-actions.ts
index 741ebfbe401d7442b909290869ca0c4863817a6c..92994d6559be80b97002367c405f5e7c496b1ca2 100644 (file)
--- a/src/store/projects/project-create-actions.ts
+++ b/src/store/projects/project-create-actions.ts
@@ -38,9 +38,13 @@ export const isItemNotInProject = (properties: Properties) => {
     }
 };
 
+export const isNotProjectItem = () => {
+    return isItemNotInProject || !isProjectRoute;
+};
+
 export const openProjectCreateDialog = (ownerUuid: string) =>
     (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
-        if (isItemNotInProject || !isProjectRoute) {
+        if (isNotProjectItem) {
             const userUuid = getState().auth.user!.uuid;
             dispatch(initialize(PROJECT_CREATE_FORM_NAME, { userUuid }));
         } else {

diff --git a/src/store/run-process-panel/run-process-panel-actions.ts b/src/store/run-process-panel/run-process-panel-actions.ts
index 0256573758d578a4b9b2881763d22022601c70cc..2fd4b042ae2337178a440746985821303f0c275f 100644 (file)
--- a/src/store/run-process-panel/run-process-panel-actions.ts
+++ b/src/store/run-process-panel/run-process-panel-actions.ts
@@ -15,7 +15,7 @@ import { createWorkflowMounts } from '~/models/process';
 import { ContainerRequestState } from '~/models/container-request';
 import { navigateToProcess } from '../navigation/navigation-action';
 import { RunProcessAdvancedFormData, RUN_PROCESS_ADVANCED_FORM } from '~/views/run-process-panel/run-process-advanced-form';
-import { isItemNotInProject, isProjectRoute } from '~/store/projects/project-create-actions';
+import { isNotProjectItem } from '~/store/projects/project-create-actions';
 
 export const runProcessPanelActions = unionize({
     SET_PROCESS_OWNER_UUID: ofType<string>(),
@@ -60,7 +60,7 @@ export const runProcess = async (dispatch: Dispatch<any>, getState: () => RootSt
     const { processOwnerUuid, selectedWorkflow } = state.runProcessPanel;
     if (selectedWorkflow) {
         const newProcessData = {
-            ownerUuid: isItemNotInProject || !isProjectRoute ? userUuid : processOwnerUuid,
+            ownerUuid: isNotProjectItem ? userUuid : processOwnerUuid,
             name: basicForm.name,
             description: basicForm.description,
             state: ContainerRequestState.COMMITTED,