OCLOMRS-1094: Use concept url when removing concept from collection

openmrs · Mar 22, 2022 · 0458c09 · 0458c09
1 parent 0de0c31
commit 0458c09
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/src/apps/concepts/components/ConceptsActionMenu.tsx b/src/apps/concepts/components/ConceptsActionMenu.tsx
@@ -34,7 +34,7 @@ const addConceptsToDictionaryMenu = (
 };
 
 const removeConceptsFromDictionaryMenu = (
-  removeConceptsFromDictionary: (conceptVersionUrls: string[]) => void,
+  removeConceptsFromDictionary: (conceptUrls: string[]) => void,
   row: APIConcept,
   toggleMenu: (
     index: number,
@@ -46,7 +46,7 @@ const removeConceptsFromDictionaryMenu = (
     <MenuItem
       onClick={() => {
         if (removeConceptsFromDictionary)
-          removeConceptsFromDictionary([row.version_url]);
+          removeConceptsFromDictionary([row.url]);
         toggleMenu(index);
       }}
     >
@@ -105,7 +105,7 @@ const removeMenu = (
     event?: React.MouseEvent<HTMLButtonElement, MouseEvent> | undefined
   ) => void,
   linkedSource: string | undefined,
-  removeConceptsFromDictionary: (conceptVersionUrls: string[]) => void
+  removeConceptsFromDictionary: (conceptUrls: string[]) => void
 ) => {
   return !showRemoveFromDictionaryMenuItem(row, buttons.edit, linkedSource)
     ? null
@@ -144,7 +144,7 @@ interface ConceptsActionMenuProps {
   ) => void;
   menu: { index: number; anchor: null | HTMLElement };
   canModifyConcept: (concept: APIConcept) => boolean;
-  removeConceptsFromDictionary: (conceptVersionUrls: string[]) => void;
+  removeConceptsFromDictionary: (conceptUrls: string[]) => void;
   addConceptsToDictionary: Function;
   linkedSource: string | undefined;
   linkedDictionary: string | undefined;

diff --git a/src/apps/concepts/components/ConceptsTable.tsx b/src/apps/concepts/components/ConceptsTable.tsx
@@ -20,7 +20,7 @@ interface Props extends QueryParams {
   buttons?: { [key: string]: boolean };
   addConceptsToDictionary: Function;
   dictionaryToAddTo?: string;
-  removeConceptsFromDictionary: (conceptVersionUrls: string[]) => void;
+  removeConceptsFromDictionary: (conceptUrls: string[]) => void;
   linkedDictionary?: string;
   linkedSource?: string;
   canModifyConcept: (concept: APIConcept) => boolean;

diff --git a/src/apps/concepts/components/ConceptsTableRow.tsx b/src/apps/concepts/components/ConceptsTableRow.tsx
@@ -199,7 +199,7 @@ const actionCell = (
     event?: React.MouseEvent<HTMLButtonElement, MouseEvent> | undefined
   ) => void,
   menu: { index: number; anchor: null | HTMLElement },
-  removeConceptsFromDictionary: (conceptVersionUrls: string[]) => void,
+  removeConceptsFromDictionary: (conceptUrls: string[]) => void,
   addConceptsToDictionary: Function,
 
   linkedSource: string | undefined,
@@ -246,7 +246,7 @@ interface ConceptsTableRowProps {
     event?: React.MouseEvent<HTMLButtonElement, MouseEvent> | undefined
   ) => void;
   menu: { index: number; anchor: null | HTMLElement };
-  removeConceptsFromDictionary: (conceptVersionUrls: string[]) => void;
+  removeConceptsFromDictionary: (conceptUrls: string[]) => void;
   addConceptsToDictionary: Function;
   dictionaryToAddTo?: string;
   isItemSelected: boolean;

diff --git a/src/apps/concepts/pages/ViewConceptsPage.tsx b/src/apps/concepts/pages/ViewConceptsPage.tsx
@@ -366,8 +366,8 @@ const ViewConceptsPage: React.FC<Props> = ({
               canModifyConcept={(concept: APIConcept) =>
                 canModifyConcept(concept.url, profile, usersOrgs)
               }
-              removeConceptsFromDictionary={(conceptVersionUrls: string[]) =>
-                removeConceptsFromDictionary(containerUrl, conceptVersionUrls)
+              removeConceptsFromDictionary={(conceptUrls: string[]) =>
+                removeConceptsFromDictionary(containerUrl, conceptUrls)
               }
             />
           </Grid>

diff --git a/src/apps/concepts/redux/actions.ts b/src/apps/concepts/redux/actions.ts
@@ -200,7 +200,7 @@ export const upsertConceptAndMappingsAction = (
             // we don't remove the toConceptUrls because we can't be sure no other mapping depends on them
             // that would break the OCL module importer
             // ...state.concepts.mappings.map(mapping => mapping.url), todo ensure the cascade is working and delete this if so
-            concept.version_url
+            concept.url
           ].filter(reference => reference) as string[];
           await dispatch(
             removeReferencesFromDictionary(linkedDictionary, referencesToRemove)

diff --git a/src/apps/concepts/redux/reducer.ts b/src/apps/concepts/redux/reducer.ts
@@ -69,7 +69,7 @@ export const reducer = createReducer<ConceptsState>(initialState, {
     }: { actionIndex: number; payload: {}; meta: [string, string[]] }
   ) => {
     state.concepts.items = state.concepts.items.filter(
-      (concept: APIConcept) => !meta[1].includes(concept.version_url)
+      (concept: APIConcept) => !meta[1].includes(concept.url)
     );
   },
   [LOGOUT_ACTION]: () => {