X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/02109725d788c1092c0b4023cee41ea901ed1a58..0bc3340cdc59ede7a02552bcc9f22890f0ef4f91:/src/store/projects/project-create-actions.ts

diff --git a/src/store/projects/project-create-actions.ts b/src/store/projects/project-create-actions.ts
index 92994d65..ddcd233f 100644
--- a/src/store/projects/project-create-actions.ts
+++ b/src/store/projects/project-create-actions.ts
@@ -3,53 +3,55 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { Dispatch } from "redux";
-import { reset, startSubmit, stopSubmit, initialize } from 'redux-form';
+import { reset, startSubmit, stopSubmit, initialize, FormErrors, formValueSelector, change } from 'redux-form';
 import { RootState } from '~/store/store';
 import { dialogActions } from "~/store/dialog/dialog-actions";
 import { getCommonResourceServiceError, CommonResourceServiceError } from '~/services/common-service/common-resource-service';
 import { ProjectResource } from '~/models/project';
 import { ServiceRepository } from '~/services/services';
-import { matchProjectRoute } from '~/routes/routes';
+import { matchProjectRoute, matchRunProcessRoute } from '~/routes/routes';
+import { ResourcePropertiesFormData } from '~/views-components/resource-properties-form/resource-properties-form';
 
 export interface ProjectCreateFormDialogData {
     ownerUuid: string;
     name: string;
     description: string;
+    properties: ProjectProperties;
+}
+
+export interface ProjectProperties {
+    [key: string]: string;
 }
 
 export const PROJECT_CREATE_FORM_NAME = 'projectCreateFormName';
+export const PROJECT_CREATE_PROPERTIES_FORM_NAME = 'projectCreatePropertiesFormName';
+export const PROJECT_CREATE_FORM_SELECTOR = formValueSelector(PROJECT_CREATE_FORM_NAME);
 
-export const isProjectRoute = ({ router }: RootState) => {
+export const isProjectOrRunProcessRoute = ({ router }: RootState) => {
     const pathname = router.location ? router.location.pathname : '';
-    const match = matchProjectRoute(pathname);
-    return !!match;
+    const matchProject = matchProjectRoute(pathname);
+    const matchRunProcess = matchRunProcessRoute(pathname);
+    return Boolean(matchProject || matchRunProcess);
 };
 
-interface Properties {
-    breadcrumbs: Array<{ uuid: string, label: string }>;
-}
-
-export const isItemNotInProject = (properties: Properties) => {
+export const isItemNotInProject = (properties: any) => {
     if (properties.breadcrumbs) {
-        const isItemSharedWithMe = properties.breadcrumbs[0].label !== 'Projects';
-        return isItemSharedWithMe;
+        return Boolean(properties.breadcrumbs[0].label !== 'Projects');
     } else {
-        return false;
+        return ;
     }
 };
 
-export const isNotProjectItem = () => {
-    return isItemNotInProject || !isProjectRoute;
-};
-
 export const openProjectCreateDialog = (ownerUuid: string) =>
     (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
-        if (isNotProjectItem) {
+        const router = getState();
+        const properties = getState().properties;
+        if (isItemNotInProject(properties) || !isProjectOrRunProcessRoute(router)) {
             const userUuid = getState().auth.user!.uuid;
             dispatch(initialize(PROJECT_CREATE_FORM_NAME, { userUuid }));
         } else {
             dispatch(initialize(PROJECT_CREATE_FORM_NAME, { ownerUuid }));
-        }        
+        }
         dispatch(dialogActions.OPEN_DIALOG({ id: PROJECT_CREATE_FORM_NAME, data: {} }));
     };
 
@@ -64,8 +66,22 @@ export const createProject = (project: Partial<ProjectResource>) =>
         } catch (e) {
             const error = getCommonResourceServiceError(e);
             if (error === CommonResourceServiceError.UNIQUE_VIOLATION) {
-                dispatch(stopSubmit(PROJECT_CREATE_FORM_NAME, { name: 'Project with the same name already exists.' }));
+                dispatch(stopSubmit(PROJECT_CREATE_FORM_NAME, { name: 'Project with the same name already exists.' } as FormErrors));
             }
             return undefined;
         }
     };
+
+export const addPropertyToCreateProjectForm = (data: ResourcePropertiesFormData) =>
+    (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+        const properties = { ...PROJECT_CREATE_FORM_SELECTOR(getState(), 'properties') };
+        properties[data.key] = data.value;
+        dispatch(change(PROJECT_CREATE_FORM_NAME, 'properties', properties ));
+    };
+
+export const removePropertyFromCreateProjectForm = (key: string) =>
+    (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+        const properties = { ...PROJECT_CREATE_FORM_SELECTOR(getState(), 'properties') };
+        delete properties[key];
+        dispatch(change(PROJECT_CREATE_FORM_NAME, 'properties', properties ));
+    };
\ No newline at end of file