@openmrs/esm-extensions 6.0.3-pre.2638 → 6.0.3-pre.2646

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-extensions",
-  "version": "6.0.3-pre.2638",
+  "version": "6.0.3-pre.2646",
   "license": "MPL-2.0",
   "description": "Coordinates extensions and extension points in the OpenMRS Frontend",
   "browser": "dist/openmrs-esm-extensions.js",
@@ -47,12 +47,12 @@
     "single-spa": "6.x"
   },
   "devDependencies": {
-    "@openmrs/esm-api": "6.0.3-pre.2638",
-    "@openmrs/esm-config": "6.0.3-pre.2638",
-    "@openmrs/esm-expression-evaluator": "6.0.3-pre.2638",
-    "@openmrs/esm-feature-flags": "6.0.3-pre.2638",
-    "@openmrs/esm-state": "6.0.3-pre.2638",
-    "@openmrs/esm-utils": "6.0.3-pre.2638",
+    "@openmrs/esm-api": "6.0.3-pre.2646",
+    "@openmrs/esm-config": "6.0.3-pre.2646",
+    "@openmrs/esm-expression-evaluator": "6.0.3-pre.2646",
+    "@openmrs/esm-feature-flags": "6.0.3-pre.2646",
+    "@openmrs/esm-state": "6.0.3-pre.2646",
+    "@openmrs/esm-utils": "6.0.3-pre.2646",
     "single-spa": "^6.0.1"
   },
   "dependencies": {

package/src/workspaces.ts

@@ -82,15 +82,33 @@ export function registerWorkspace(workspace: RegisterWorkspaceOptions) {
  * @internal
  */
 export function registerWorkspaceGroup(workspaceGroup: WorkspaceGroupRegistration) {
-  workspaceGroupStore.setState((state) => ({
-    workspaceGroups: {
-      ...state.workspaceGroups,
-      [workspaceGroup.name]: {
-        name: workspaceGroup.name,
-        members: workspaceGroup.members,
-      },
-    },
-  }));
+  workspaceGroupStore.setState((state) => {
+    const group = state.workspaceGroups[workspaceGroup.name];
+    if (group) {
+      // This condition occurs when a workspace with a `groups` property is registered before
+      // the corresponding workspace group. In such cases, the workspace group is registered
+      // by the `attachWorkspaceToGroup` function.
+      return {
+        workspaceGroups: {
+          ...state.workspaceGroups,
+          [workspaceGroup.name]: {
+            ...group,
+            members: Array.from(new Set([...group.members, ...workspaceGroup.members])),
+          },
+        },
+      };
+    } else {
+      return {
+        workspaceGroups: {
+          ...state.workspaceGroups,
+          [workspaceGroup.name]: {
+            name: workspaceGroup.name,
+            members: workspaceGroup.members,
+          },
+        },
+      };
+    }
+  });
 }
 
 const workspaceExtensionWarningsIssued = new Set();
@@ -155,37 +173,3 @@ function getTitleFromExtension(ext: ExtensionRegistration) {
   }
   return ext.name;
 }
-
-function createNewWorkspaceGroupInfo(groupName: string): WorkspaceGroupRegistration {
-  return {
-    name: groupName,
-    members: [],
-  };
-}
-
-export function attachWorkspaceToGroup(workspaceName: string, groupName: string) {
-  workspaceGroupStore.setState((state) => {
-    const group = state.workspaceGroups[groupName];
-    if (group) {
-      return {
-        workspaceGroups: {
-          ...state.workspaceGroups,
-          [groupName]: {
-            ...group,
-            members: [...group.members, workspaceName],
-          },
-        },
-      };
-    } else {
-      return {
-        workspaceGroups: {
-          ...state.workspaceGroups,
-          [groupName]: {
-            ...createNewWorkspaceGroupInfo(groupName),
-            members: [workspaceName],
-          },
-        },
-      };
-    }
-  });
-}