18219: Unifies collection/project create/update properties handling actions.
authorLucas Di Pentima <lucas.dipentima@curii.com>
Fri, 17 Dec 2021 21:46:12 +0000 (18:46 -0300)
committerLucas Di Pentima <lucas.dipentima@curii.com>
Fri, 17 Dec 2021 22:40:03 +0000 (19:40 -0300)
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima@curii.com>

13 files changed:
src/store/collections/collection-create-actions.ts
src/store/collections/collection-update-actions.ts
src/store/projects/project-create-actions.ts
src/store/projects/project-update-actions.ts
src/store/resources/resources-actions.ts
src/views-components/collection-properties/create-collection-properties-form.tsx
src/views-components/collection-properties/create-collection-properties-list.tsx
src/views-components/collection-properties/update-collection-properties-form.tsx
src/views-components/collection-properties/update-collection-properties-list.tsx
src/views-components/project-properties/create-project-properties-form.tsx
src/views-components/project-properties/create-project-properties-list.tsx
src/views-components/project-properties/update-project-properties-form.tsx
src/views-components/project-properties/update-project-properties-list.tsx

index 22202b15985427fc04dfa52554039ee532fcb6c2..17fecc1e15b740681b8759d84dd7e01dc5bb0a0f 100644 (file)
@@ -3,7 +3,14 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { Dispatch } from "redux";
-import { reset, startSubmit, stopSubmit, initialize, FormErrors, change, formValueSelector } from 'redux-form';
+import {
+    reset,
+    startSubmit,
+    stopSubmit,
+    initialize,
+    FormErrors,
+    formValueSelector
+} from 'redux-form';
 import { RootState } from 'store/store';
 import { getUserUuid } from "common/getuser";
 import { dialogActions } from "store/dialog/dialog-actions";
@@ -15,8 +22,6 @@ import { progressIndicatorActions } from "store/progress-indicator/progress-indi
 import { isProjectOrRunProcessRoute } from 'store/projects/project-create-actions';
 import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions';
 import { CollectionResource } from "models/collection";
-import { ResourcePropertiesFormData } from "views-components/resource-properties-form/resource-properties-form";
-import { addProperty, deleteProperty } from "lib/resource-properties";
 
 export interface CollectionCreateFormDialogData {
     ownerUuid: string;
@@ -78,23 +83,3 @@ export const createCollection = (data: CollectionCreateFormDialogData) =>
             dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_CREATE_FORM_NAME));
         }
     };
-
-export const addPropertyToCreateCollectionForm = (data: ResourcePropertiesFormData) =>
-    (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
-        const properties = { ...COLLECTION_CREATE_FORM_SELECTOR(getState(), 'properties') };
-        const key = data.keyID || data.key;
-        const value =  data.valueID || data.value;
-        dispatch(change(
-            COLLECTION_CREATE_FORM_NAME,
-            'properties',
-            addProperty(properties, key, value)));
-    };
-
-export const removePropertyFromCreateCollectionForm = (key: string, value: string) =>
-    (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
-        const properties = { ...COLLECTION_CREATE_FORM_SELECTOR(getState(), 'properties') };
-        dispatch(change(
-            COLLECTION_CREATE_FORM_NAME,
-            'properties',
-            deleteProperty(properties, key, value)));
-    };
index 0096bc4828c1642926c3f00c0a4fa3b604a22935..2caaf88a23db6de2ae8552c75cc7889d10790576 100644 (file)
@@ -4,7 +4,6 @@
 
 import { Dispatch } from "redux";
 import {
-    change,
     FormErrors,
     formValueSelector,
     initialize,
@@ -23,8 +22,6 @@ import { updateResources } from "../resources/resources-actions";
 import { loadDetailsPanel } from "../details-panel/details-panel-action";
 import { getResource } from "store/resources/resources";
 import { CollectionProperties } from "./collection-create-actions";
-import { ResourcePropertiesFormData } from "views-components/resource-properties-form/resource-properties-form";
-import { addProperty, deleteProperty } from "lib/resource-properties";
 
 export interface CollectionUpdateFormDialogData {
     uuid: string;
@@ -83,23 +80,3 @@ export const updateCollection = (collection: CollectionUpdateFormDialogData) =>
             }
         );
     };
-
-export const addPropertyToUpdateCollectionForm = (data: ResourcePropertiesFormData) =>
-    (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
-        const properties = { ...COLLECTION_UPDATE_FORM_SELECTOR(getState(), 'properties') };
-        const key = data.keyID || data.key;
-        const value =  data.valueID || data.value;
-        dispatch(change(
-            COLLECTION_UPDATE_FORM_NAME,
-            'properties',
-            addProperty(properties, key, value)));
-    };
-
-export const removePropertyFromUpdateCollectionForm = (key: string, value: string) =>
-    (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
-        const properties = { ...COLLECTION_UPDATE_FORM_SELECTOR(getState(), 'properties') };
-        dispatch(change(
-            COLLECTION_UPDATE_FORM_NAME,
-            'properties',
-            deleteProperty(properties, key, value)));
-    };
index 352759fa6234f070e77f1e49340db767f8da63f0..c7d17c51465ddec7f944960983b466449aa3a52f 100644 (file)
@@ -3,7 +3,14 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { Dispatch } from "redux";
-import { reset, startSubmit, stopSubmit, initialize, FormErrors, formValueSelector, change } from 'redux-form';
+import {
+    reset,
+    startSubmit,
+    stopSubmit,
+    initialize,
+    FormErrors,
+    formValueSelector
+} from 'redux-form';
 import { RootState } from 'store/store';
 import { getUserUuid } from "common/getuser";
 import { dialogActions } from "store/dialog/dialog-actions";
@@ -11,9 +18,7 @@ import { getCommonResourceServiceError, CommonResourceServiceError } from 'servi
 import { ProjectResource } from 'models/project';
 import { ServiceRepository } from 'services/services';
 import { matchProjectRoute, matchRunProcessRoute } from 'routes/routes';
-import { ResourcePropertiesFormData } from 'views-components/resource-properties-form/resource-properties-form';
 import { RouterState } from "react-router-redux";
-import { addProperty, deleteProperty } from "lib/resource-properties";
 
 export interface ProjectCreateFormDialogData {
     ownerUuid: string;
@@ -66,23 +71,3 @@ export const createProject = (project: Partial<ProjectResource>) =>
             return undefined;
         }
     };
-
-export const addPropertyToCreateProjectForm = (data: ResourcePropertiesFormData) =>
-    (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
-        const properties = { ...PROJECT_CREATE_FORM_SELECTOR(getState(), 'properties') };
-        const key = data.keyID || data.key;
-        const value =  data.valueID || data.value;
-        dispatch(change(
-            PROJECT_CREATE_FORM_NAME,
-            'properties',
-            addProperty(properties, key, value)));
-    };
-
-export const removePropertyFromCreateProjectForm = (key: string, value: string) =>
-    (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
-        const properties = { ...PROJECT_CREATE_FORM_SELECTOR(getState(), 'properties') };
-        dispatch(change(
-            PROJECT_CREATE_FORM_NAME,
-            'properties',
-            deleteProperty(properties, key, value)));
-    };
index e5fc34d8ebe6f3ecc7f5824a0534105e72b42ba0..36f66ccf8ed09633895a829117f08cd87295757b 100644 (file)
@@ -4,7 +4,6 @@
 
 import { Dispatch } from "redux";
 import {
-    change,
     FormErrors,
     formValueSelector,
     initialize,
@@ -22,8 +21,6 @@ import { ServiceRepository } from "services/services";
 import { projectPanelActions } from 'store/project-panel/project-panel-action';
 import { GroupClass } from "models/group";
 import { Participant } from "views-components/sharing-dialog/participant-select";
-import { ResourcePropertiesFormData } from "views-components/resource-properties-form/resource-properties-form";
-import { addProperty, deleteProperty } from "lib/resource-properties";
 import { ProjectProperties } from "./project-create-actions";
 
 export interface ProjectUpdateFormDialogData {
@@ -68,23 +65,3 @@ export const updateProject = (project: ProjectUpdateFormDialogData) =>
             return ;
         }
     };
-
-export const addPropertyToUpdateProjectForm = (data: ResourcePropertiesFormData) =>
-    (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
-        const properties = { ...PROJECT_UPDATE_FORM_SELECTOR(getState(), 'properties') };
-        const key = data.keyID || data.key;
-        const value =  data.valueID || data.value;
-        dispatch(change(
-            PROJECT_UPDATE_FORM_NAME,
-            'properties',
-            addProperty(properties, key, value)));
-    };
-
-export const removePropertyFromUpdateProjectForm = (key: string, value: string) =>
-    (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
-        const properties = { ...PROJECT_UPDATE_FORM_SELECTOR(getState(), 'properties') };
-        dispatch(change(
-            PROJECT_UPDATE_FORM_NAME,
-            'properties',
-            deleteProperty(properties, key, value)));
-    };
index 8e6d16f928aed6d54e2f807861a81c6bfb732c1d..1d1355a8ae457e5ba6fb95e87cc357589d4210a6 100644 (file)
@@ -12,6 +12,8 @@ import { addProperty, deleteProperty } from 'lib/resource-properties';
 import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions';
 import { getResource } from './resources';
 import { TagProperty } from 'models/tag';
+import { change, formValueSelector } from 'redux-form';
+import { ResourcePropertiesFormData } from 'views-components/resource-properties-form/resource-properties-form';
 
 export const resourcesActions = unionize({
     SET_RESOURCES: ofType<Resource[]>(),
@@ -93,3 +95,23 @@ export const createResourceProperty = (data: TagProperty) =>
             dispatch(snackbarActions.OPEN_SNACKBAR({ message: errorMsg, hideDuration: 2000, kind: SnackbarKind.ERROR }));
         }
     };
+
+export const addPropertyToResourceForm = (data: ResourcePropertiesFormData, formName: string) =>
+    (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+        const properties = { ...formValueSelector(formName)(getState(), 'properties') };
+        const key = data.keyID || data.key;
+        const value =  data.valueID || data.value;
+        dispatch(change(
+            formName,
+            'properties',
+            addProperty(properties, key, value)));
+    };
+
+export const removePropertyFromResourceForm = (key: string, value: string, formName: string) =>
+    (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+        const properties = { ...formValueSelector(formName)(getState(), 'properties') };
+        dispatch(change(
+            formName,
+            'properties',
+            deleteProperty(properties, key, value)));
+    };
index 8e3f8eb8e2b37b0ea7095f78c7df60a8d3e55a1d..ab389ddcc4c5731fd0c2c6c3c5c8746b66293e37 100644 (file)
@@ -6,12 +6,13 @@ import { reduxForm, reset } from 'redux-form';
 import { withStyles } from '@material-ui/core';
 import {
     COLLECTION_CREATE_PROPERTIES_FORM_NAME,
-    addPropertyToCreateCollectionForm
+    COLLECTION_CREATE_FORM_NAME
 } from 'store/collections/collection-create-actions';
 import {
     ResourcePropertiesForm,
     ResourcePropertiesFormData
 } from 'views-components/resource-properties-form/resource-properties-form';
+import { addPropertyToResourceForm } from 'store/resources/resources-actions';
 
 const Form = withStyles(
     ({ spacing }) => (
@@ -26,7 +27,7 @@ const Form = withStyles(
 export const CreateCollectionPropertiesForm = reduxForm<ResourcePropertiesFormData>({
     form: COLLECTION_CREATE_PROPERTIES_FORM_NAME,
     onSubmit: (data, dispatch) => {
-        dispatch(addPropertyToCreateCollectionForm(data));
+        dispatch(addPropertyToResourceForm(data, COLLECTION_CREATE_FORM_NAME));
         dispatch(reset(COLLECTION_CREATE_PROPERTIES_FORM_NAME));
     }
 })(Form);
\ No newline at end of file
index 9784b55e1bda6c4112e185ea0e0940444cd605b4..b6e02cb6d09d9858440ae54ed2584011b2d52471 100644 (file)
@@ -12,12 +12,13 @@ import {
 } from '@material-ui/core';
 import { RootState } from 'store/store';
 import {
-    removePropertyFromCreateCollectionForm,
     COLLECTION_CREATE_FORM_SELECTOR,
-    CollectionProperties
+    CollectionProperties,
+    COLLECTION_CREATE_FORM_NAME
 } from 'store/collections/collection-create-actions';
 import { ArvadosTheme } from 'common/custom-theme';
 import { getPropertyChip } from '../resource-properties-form/property-chip';
+import { removePropertyFromResourceForm } from 'store/resources/resources-actions';
 
 type CssRules = 'tag';
 
@@ -42,7 +43,7 @@ const mapStateToProps = (state: RootState): CreateCollectionPropertiesListDataPr
 };
 
 const mapDispatchToProps = (dispatch: Dispatch): CreateCollectionPropertiesListActionProps => ({
-    handleDelete: (key: string, value: string) => dispatch<any>(removePropertyFromCreateCollectionForm(key, value))
+    handleDelete: (key: string, value: string) => dispatch<any>(removePropertyFromResourceForm(key, value, COLLECTION_CREATE_FORM_NAME))
 });
 
 type CreateCollectionPropertiesListProps = CreateCollectionPropertiesListDataProps &
index dc00de30f32683cf3ea2b8d4d9cbae232f24537f..13a29ad4b679a9561af978fe01bb947770cb335c 100644 (file)
@@ -5,13 +5,13 @@
 import { reduxForm, reset } from 'redux-form';
 import { withStyles } from '@material-ui/core';
 import {
-    addPropertyToUpdateCollectionForm,
     COLLECTION_UPDATE_PROPERTIES_FORM_NAME
 } from 'store/collections/collection-update-actions';
 import {
     ResourcePropertiesForm,
     ResourcePropertiesFormData
 } from 'views-components/resource-properties-form/resource-properties-form';
+import { addPropertyToResourceForm } from 'store/resources/resources-actions';
 
 const Form = withStyles(
     ({ spacing }) => (
@@ -26,7 +26,7 @@ const Form = withStyles(
 export const UpdateCollectionPropertiesForm = reduxForm<ResourcePropertiesFormData>({
     form: COLLECTION_UPDATE_PROPERTIES_FORM_NAME,
     onSubmit: (data, dispatch) => {
-        dispatch(addPropertyToUpdateCollectionForm(data));
+        dispatch(addPropertyToResourceForm(data, COLLECTION_UPDATE_PROPERTIES_FORM_NAME));
         dispatch(reset(COLLECTION_UPDATE_PROPERTIES_FORM_NAME));
     }
 })(Form);
\ No newline at end of file
index 26cf5e70cf28f0395fccfa47476d0a01d7e36622..792786f2eb36a0cd1cd8bd8c4aeaf232dad0c477 100644 (file)
@@ -12,12 +12,13 @@ import {
 } from '@material-ui/core';
 import { RootState } from 'store/store';
 import {
-    removePropertyFromUpdateCollectionForm,
     COLLECTION_UPDATE_FORM_SELECTOR,
+    COLLECTION_UPDATE_FORM_NAME,
 } from 'store/collections/collection-update-actions';
 import { ArvadosTheme } from 'common/custom-theme';
 import { getPropertyChip } from '../resource-properties-form/property-chip';
 import { CollectionProperties } from 'store/collections/collection-create-actions';
+import { removePropertyFromResourceForm } from 'store/resources/resources-actions';
 
 type CssRules = 'tag';
 
@@ -42,7 +43,7 @@ const mapStateToProps = (state: RootState): UpdateCollectionPropertiesListDataPr
 };
 
 const mapDispatchToProps = (dispatch: Dispatch): UpdateCollectionPropertiesListActionProps => ({
-    handleDelete: (key: string, value: string) => dispatch<any>(removePropertyFromUpdateCollectionForm(key, value))
+    handleDelete: (key: string, value: string) => dispatch<any>(removePropertyFromResourceForm(key, value, COLLECTION_UPDATE_FORM_NAME))
 });
 
 type UpdateCollectionPropertiesListProps = UpdateCollectionPropertiesListDataProps &
index c49d738a53d503658114b22acc39c6f7247371aa..aa9965b55e4ea452cd71cb72779a834267bbed24 100644 (file)
@@ -6,12 +6,13 @@ import { reduxForm, reset } from 'redux-form';
 import { withStyles } from '@material-ui/core';
 import {
     PROJECT_CREATE_PROPERTIES_FORM_NAME,
-    addPropertyToCreateProjectForm
+    PROJECT_CREATE_FORM_NAME
 } from 'store/projects/project-create-actions';
 import {
     ResourcePropertiesForm,
     ResourcePropertiesFormData
 } from 'views-components/resource-properties-form/resource-properties-form';
+import { addPropertyToResourceForm } from 'store/resources/resources-actions';
 
 const Form = withStyles(
     ({ spacing }) => (
@@ -26,7 +27,7 @@ const Form = withStyles(
 export const CreateProjectPropertiesForm = reduxForm<ResourcePropertiesFormData>({
     form: PROJECT_CREATE_PROPERTIES_FORM_NAME,
     onSubmit: (data, dispatch) => {
-        dispatch(addPropertyToCreateProjectForm(data));
+        dispatch(addPropertyToResourceForm(data, PROJECT_CREATE_FORM_NAME));
         dispatch(reset(PROJECT_CREATE_PROPERTIES_FORM_NAME));
     }
 })(Form);
\ No newline at end of file
index 8a61dcf75b7a43a11457050d859110da3f343f6e..ac7dc6fddd39d4255865faa6ebb3a853379ce60b 100644 (file)
@@ -11,9 +11,14 @@ import {
     WithStyles,
 } from '@material-ui/core';
 import { RootState } from 'store/store';
-import { removePropertyFromCreateProjectForm, PROJECT_CREATE_FORM_SELECTOR, ProjectProperties } from 'store/projects/project-create-actions';
+import {
+    PROJECT_CREATE_FORM_SELECTOR,
+    ProjectProperties,
+    PROJECT_CREATE_FORM_NAME
+} from 'store/projects/project-create-actions';
 import { ArvadosTheme } from 'common/custom-theme';
 import { getPropertyChip } from '../resource-properties-form/property-chip';
+import { removePropertyFromResourceForm } from 'store/resources/resources-actions';
 
 type CssRules = 'tag';
 
@@ -38,7 +43,7 @@ const mapStateToProps = (state: RootState): CreateProjectPropertiesListDataProps
 };
 
 const mapDispatchToProps = (dispatch: Dispatch): CreateProjectPropertiesListActionProps => ({
-    handleDelete: (key: string, value: string) => dispatch<any>(removePropertyFromCreateProjectForm(key, value))
+    handleDelete: (key: string, value: string) => dispatch<any>(removePropertyFromResourceForm(key, value, PROJECT_CREATE_FORM_NAME))
 });
 
 type CreateProjectPropertiesListProps = CreateProjectPropertiesListDataProps &
index e6e78e341ad7f7e2c85835e9a25667a9e648ca17..e6151229660e8573dee6854282d25d671efa4382 100644 (file)
@@ -6,12 +6,13 @@ import { reduxForm, reset } from 'redux-form';
 import { withStyles } from '@material-ui/core';
 import {
     PROJECT_UPDATE_PROPERTIES_FORM_NAME,
-    addPropertyToUpdateProjectForm
+    PROJECT_UPDATE_FORM_NAME
 } from 'store/projects/project-update-actions';
 import {
     ResourcePropertiesForm,
     ResourcePropertiesFormData
 } from 'views-components/resource-properties-form/resource-properties-form';
+import { addPropertyToResourceForm } from 'store/resources/resources-actions';
 
 const Form = withStyles(
     ({ spacing }) => (
@@ -26,7 +27,7 @@ const Form = withStyles(
 export const UpdateProjectPropertiesForm = reduxForm<ResourcePropertiesFormData>({
     form: PROJECT_UPDATE_PROPERTIES_FORM_NAME,
     onSubmit: (data, dispatch) => {
-        dispatch(addPropertyToUpdateProjectForm(data));
+        dispatch(addPropertyToResourceForm(data, PROJECT_UPDATE_FORM_NAME));
         dispatch(reset(PROJECT_UPDATE_PROPERTIES_FORM_NAME));
     }
 })(Form);
\ No newline at end of file
index 5572af732af0c05ebfaa1eef2f7d48c2430e87c2..5ac22b92ddaa49f48e7033a015fd9f064bc94dd9 100644 (file)
@@ -12,12 +12,13 @@ import {
 } from '@material-ui/core';
 import { RootState } from 'store/store';
 import {
-    removePropertyFromUpdateProjectForm,
     PROJECT_UPDATE_FORM_SELECTOR,
+    PROJECT_UPDATE_FORM_NAME,
 } from 'store/projects/project-update-actions';
 import { ArvadosTheme } from 'common/custom-theme';
 import { getPropertyChip } from '../resource-properties-form/property-chip';
 import { ProjectProperties } from 'store/projects/project-create-actions';
+import { removePropertyFromResourceForm } from 'store/resources/resources-actions';
 
 type CssRules = 'tag';
 
@@ -42,7 +43,7 @@ const mapStateToProps = (state: RootState): UpdateProjectPropertiesListDataProps
 };
 
 const mapDispatchToProps = (dispatch: Dispatch): UpdateProjectPropertiesListActionProps => ({
-    handleDelete: (key: string, value: string) => dispatch<any>(removePropertyFromUpdateProjectForm(key, value))
+    handleDelete: (key: string, value: string) => dispatch<any>(removePropertyFromResourceForm(key, value, PROJECT_UPDATE_FORM_NAME))
 });
 
 type UpdateProjectPropertiesListProps = UpdateProjectPropertiesListDataProps &