Merge pull request #266 from bento-platform/features/conf-extra-prope…

…rties-schema feat: fetch extra_properties types dynamically from Katsu
bento-platform · Aug 17, 2023 · 626f2fd · 626f2fd
2 parents c15c6e1 + 81f7f86
commit 626f2fd
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 6 deletions.
diff --git a/src/components/manager/projects/ProjectJsonSchemaForm.js b/src/components/manager/projects/ProjectJsonSchemaForm.js
@@ -14,6 +14,18 @@ const ajv = new Ajv({
 // Does not actually query over http, the URI is the key to the draft-07 meta-schema
 const validateSchema = ajv.getSchema("http://json-schema.org/draft-07/schema");
 
+const getSchemaTypeOptions = (schemaTypes) => {
+    if (typeof schemaTypes === "object" && schemaTypes !== null) {
+        return Object.entries(schemaTypes).map(([key, value]) => ({
+            key,
+            value: key,
+            text: value.toUpperCase(),
+        }));
+    } else {
+        return [];
+    }
+};
+
 const ProjectJsonSchemaForm = ({ style, schemaTypes, initialValues, setFileContent, fileContent, form }) => {
 
     const onDrop = useCallback((files) => {
@@ -56,9 +68,9 @@ const ProjectJsonSchemaForm = ({ style, schemaTypes, initialValues, setFileConte
                     rules: [{ required: true }],
                 })(
                     <Select>
-                        {schemaTypes.map(option => (
-                            <Select.Option key={option} value={option}>
-                                {option}
+                        {getSchemaTypeOptions(schemaTypes).map((option) => (
+                            <Select.Option key={option.key} value={option.value}>
+                                {option.text}
                             </Select.Option>
                         ))}
                     </Select>,
@@ -110,7 +122,7 @@ const JSON_SCHEMA_FORM_SHAPE = PropTypes.shape({
 
 ProjectJsonSchemaForm.propTypes = {
     style: PropTypes.object,
-    schemaTypes: PropTypes.arrayOf(PropTypes.string).isRequired,
+    schemaTypes: PropTypes.objectOf(PropTypes.string).isRequired,
     initialValues: JSON_SCHEMA_FORM_SHAPE,
     formValues: JSON_SCHEMA_FORM_SHAPE,
     fileContent: PropTypes.object,

diff --git a/src/components/manager/projects/ProjectJsonSchemaModal.js b/src/components/manager/projects/ProjectJsonSchemaModal.js
@@ -7,6 +7,9 @@ import PropTypes from "prop-types";
 
 const ProjectJsonSchemaModal = ({projectId, visible, onOk, onCancel}) => {
     const dispatch = useDispatch();
+    const isFetchingExtraPropertiesSchemaTypes = useSelector((state) =>
+        state.projects.isFetchingExtraPropertiesSchemaTypes);
+    const extraPropertiesSchemaTypes = useSelector((state) => state.projects.extraPropertiesSchemaTypes);
     const isCreatingJsonSchema = useSelector((state) => state.projects.isCreatingJsonSchema);
     const [inputFormFields, setInputFormFields] = useState({});
     const [fileContent, setFileContent] = useState(null);
@@ -46,11 +49,14 @@ const ProjectJsonSchemaModal = ({projectId, visible, onOk, onCancel}) => {
                         icon="plus"
                         type="primary"
                         onClick={handleCreateSubmit}
-                        loading={isCreatingJsonSchema}>Create</Button>,
+                        loading={isCreatingJsonSchema || isFetchingExtraPropertiesSchemaTypes}
+                        disabled={!extraPropertiesSchemaTypes || Object.keys(
+                            extraPropertiesSchemaTypes).length === 0}
+                        >Create</Button>,
             ]}
         >
             <ProjectJsonSchemaForm
-                schemaTypes={["PHENOPACKET", "BIOSAMPLE", "INDIVIDUAL"]}
+                schemaTypes={extraPropertiesSchemaTypes || {}}
                 initialValues={{}}
                 formValues={inputFormFields}
                 onChange={setInputFormFields}

diff --git a/src/modules/auth/actions.js b/src/modules/auth/actions.js
@@ -14,6 +14,7 @@ import { fetchDropBoxTreeOrFail } from "../manager/actions";
 import {
     fetchProjectsWithDatasetsAndTables,
     fetchOverviewSummary,
+    fetchExtraPropertiesSchemaTypes,
 } from "../metadata/actions";
 import { fetchNotifications } from "../notifications/actions";
 import { fetchServicesWithMetadataAndDataTypesAndTablesIfNeeded } from "../services/actions";
@@ -35,6 +36,7 @@ export const fetchServiceDependentData = () => dispatch => Promise.all([
     fetchNotifications,
     fetchOverviewSummary,
     performGetGohanVariantsOverviewIfPossible,
+    fetchExtraPropertiesSchemaTypes,
 ].map(a => dispatch(a())));
 
 export const fetchUserDependentData = (servicesCb) => async (dispatch, getState) => {

diff --git a/src/modules/metadata/actions.js b/src/modules/metadata/actions.js
@@ -31,6 +31,7 @@ export const CREATE_PROJECT = createNetworkActionTypes("CREATE_PROJECT");
 export const DELETE_PROJECT = createNetworkActionTypes("DELETE_PROJECT");
 export const SAVE_PROJECT = createNetworkActionTypes("SAVE_PROJECT");
 
+export const FETCH_EXTRA_PROPERTIES_SCHEMA_TYPES = createNetworkActionTypes("FETCH_EXTRA_PROPERTIES_SCHEMA_TYPES");
 export const CREATE_PROJECT_JSON_SCHEMA = createNetworkActionTypes("CREATE_PROJECT_JSON_SCHEMA");
 export const DELETE_PROJECT_JSON_SCHEMA = createNetworkActionTypes("DELETE_PROJECT_JSON_SCHEMA");
 
@@ -103,6 +104,13 @@ export const createProjectIfPossible = (project, history) => (dispatch, getState
 };
 
 
+export const fetchExtraPropertiesSchemaTypes = networkAction(() => (dispatch, getState) => ({
+    types: FETCH_EXTRA_PROPERTIES_SCHEMA_TYPES,
+    url: `${getState().services.metadataService.url}/api/extra_properties_schema_types`,
+    error: "Error fetching extra properties schema types",
+}));
+
+
 const createProjectJsonSchema = networkAction(projectJsonSchema => (dispatch, getState) => ({
     types: CREATE_PROJECT_JSON_SCHEMA,
     url: `${getState().services.metadataService.url}/api/project_json_schemas`,

diff --git a/src/modules/metadata/reducers.js b/src/modules/metadata/reducers.js
@@ -24,6 +24,8 @@ import {
 
     FETCH_OVERVIEW_SUMMARY,
 
+    FETCH_EXTRA_PROPERTIES_SCHEMA_TYPES,
+
     CREATE_PROJECT_JSON_SCHEMA,
     DELETE_PROJECT_JSON_SCHEMA,
 } from "./actions";
@@ -42,6 +44,8 @@ export const projects = (
         isSavingDataset: false,
         isDeletingDataset: false,
 
+        extraPropertiesSchemaTypes: {},
+        isFetchingExtraPropertiesSchemaTypes: false,
         isCreatingJsonSchema: false,
         isDeletingJsonSchema: false,
 
@@ -203,6 +207,14 @@ export const projects = (
         case DELETE_PROJECT_DATASET.FINISH:
             return {...state, isDeletingDataset: false};
 
+        // FETCH_EXTRA_PROPERTIES_SCHEMA_TYPES
+        case FETCH_EXTRA_PROPERTIES_SCHEMA_TYPES.REQUEST:
+            return {...state, isFetchingExtraPropertiesSchemaTypes: true};
+        case FETCH_EXTRA_PROPERTIES_SCHEMA_TYPES.RECEIVE:
+            return {...state, extraPropertiesSchemaTypes: action.data};
+        case FETCH_EXTRA_PROPERTIES_SCHEMA_TYPES.FINISH:
+            return {...state, isFetchingExtraPropertiesSchemaTypes: false};
+
         // CREATE_PROJECT_JSON_SCHEMA
         case CREATE_PROJECT_JSON_SCHEMA.REQUEST:
             return {...state, isCreatingJsonSchema: true};