From b251e4e02cdbbfe03432f46f11a0f1ab245d9312 Mon Sep 17 00:00:00 2001 From: Pawel Kowalczyk Date: Thu, 18 Oct 2018 11:52:39 +0200 Subject: [PATCH] cr changes Feature #14318 Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk --- src/store/collections/collection-create-actions.ts | 4 ++-- src/store/projects/project-create-actions.ts | 6 +++++- src/store/run-process-panel/run-process-panel-actions.ts | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/store/collections/collection-create-actions.ts b/src/store/collections/collection-create-actions.ts index c42b4ef40c..05249b458f 100644 --- 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 741ebfbe40..92994d6559 100644 --- 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 0256573758..2fd4b042ae 100644 --- 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(), @@ -60,7 +60,7 @@ export const runProcess = async (dispatch: Dispatch, 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, -- 2.30.2