@openmrs/esm-framework 3.1.15-pre.757 → 3.1.15-pre.759

package/mock.tsx

@@ -203,14 +203,7 @@ export const ExtensionSlot = ({ children }) => <>{children}</>;
 
 export const Extension = jest.fn().mockImplementation((props: any) => <slot />);
 
-export const getExtensionStore = () =>
-  getGlobalStore("extensions", { slots: {} });
-
-export const getExtensionInternalStore = () =>
-  getGlobalStore("extensions-internal", {
-    slots: {},
-    extensions: {},
-  });
+export const extensionStore = getGlobalStore("extensions", { slots: {} });
 
 /* esm-react-utils */
 
@@ -241,11 +234,10 @@ export const createUseStore = (store: Store<any>) => (actions) => {
   return { ...state, ...actions };
 };
 
-export const useExtensionInternalStore = createUseStore(
-  getExtensionInternalStore()
-);
-
-export const useExtensionStore = createUseStore(getExtensionStore());
+export const useExtensionStore = (actions) => {
+  const state = extensionStore.getState();
+  return { ...state, ...actions };
+};
 
 export const useStore = (store: Store<any>, actions) => {
   const state = store.getState();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-framework",
-  "version": "3.1.15-pre.757",
+  "version": "3.1.15-pre.759",
   "license": "MPL-2.0",
   "browser": "dist/openmrs-esm-framework.js",
   "main": "src/index.ts",
@@ -35,18 +35,18 @@
     "access": "public"
   },
   "dependencies": {
-    "@openmrs/esm-api": "^3.1.15-pre.757",
-    "@openmrs/esm-breadcrumbs": "^3.1.15-pre.757",
-    "@openmrs/esm-config": "^3.1.15-pre.757",
-    "@openmrs/esm-error-handling": "^3.1.15-pre.757",
-    "@openmrs/esm-extensions": "^3.1.15-pre.757",
-    "@openmrs/esm-globals": "^3.1.15-pre.757",
-    "@openmrs/esm-offline": "^3.1.15-pre.757",
-    "@openmrs/esm-react-utils": "^3.1.15-pre.757",
-    "@openmrs/esm-state": "^3.1.15-pre.757",
-    "@openmrs/esm-styleguide": "^3.1.15-pre.757",
-    "@openmrs/esm-utils": "^3.1.15-pre.757",
+    "@openmrs/esm-api": "^3.1.15-pre.759",
+    "@openmrs/esm-breadcrumbs": "^3.1.15-pre.759",
+    "@openmrs/esm-config": "^3.1.15-pre.759",
+    "@openmrs/esm-error-handling": "^3.1.15-pre.759",
+    "@openmrs/esm-extensions": "^3.1.15-pre.759",
+    "@openmrs/esm-globals": "^3.1.15-pre.759",
+    "@openmrs/esm-offline": "^3.1.15-pre.759",
+    "@openmrs/esm-react-utils": "^3.1.15-pre.759",
+    "@openmrs/esm-state": "^3.1.15-pre.759",
+    "@openmrs/esm-styleguide": "^3.1.15-pre.759",
+    "@openmrs/esm-utils": "^3.1.15-pre.759",
     "dayjs": "^1.10.7"
   },
-  "gitHead": "9b005ddcbb5f1f0412081c7c85b5afbe4477b17e"
+  "gitHead": "e1e595a6bffe08babf45116b5c0ebbd7950ee871"
 }

package/src/integration-tests/extension-config.test.tsx

@@ -2,9 +2,12 @@ import React from "react";
 import {
   attach,
   registerExtension,
-  updateInternalExtensionStore,
+  registerExtensionSlot,
+  updateExtensionStore,
+  ExtensionStore,
 } from "../../../esm-extensions";
 import {
+  Extension,
   ExtensionSlot,
   getSyncLifecycle,
   openmrsComponentDecorator,
@@ -15,7 +18,7 @@ import { render, screen, waitFor } from "@testing-library/react";
 
 describe("Interaction between configuration and extension systems", () => {
   beforeEach(() => {
-    updateInternalExtensionStore(() => ({ slots: {}, extensions: {} }));
+    updateExtensionStore(() => ({ slots: {}, extensions: {} }));
   });
 
   test("Config should add, order, and remove extensions within slots", async () => {
@@ -23,6 +26,7 @@ describe("Interaction between configuration and extension systems", () => {
     registerSimpleExtension("Wilma", "esm-flintstone");
     registerSimpleExtension("Barney", "esm-rubble");
     registerSimpleExtension("Betty", "esm-rubble");
+    registerExtensionSlot("esm-flintstone", "A slot");
     attach("A slot", "Fred");
     attach("A slot", "Wilma");
     defineConfigSchema("esm-flintstone", {});
@@ -54,6 +58,8 @@ describe("Interaction between configuration and extension systems", () => {
 
   test("Extensions should recieve config from module and from 'configure' key", async () => {
     registerSimpleExtension("Wilma", "esm-flintstone", true);
+    registerExtensionSlot("esm-flintstone", "Flintstone slot");
+    registerExtensionSlot("esm-flintstone", "Future slot");
     defineConfigSchema("esm-flintstone", {
       town: { _type: Type.String, _default: "Bedrock" },
     });
@@ -99,6 +105,7 @@ describe("Interaction between configuration and extension systems", () => {
 
   test("Should be possible to attach the same extension twice with different configurations", async () => {
     registerSimpleExtension("pet", "esm-characters", true);
+    registerExtensionSlot("esm-flintstone", "Flintstone slot");
     defineConfigSchema("esm-characters", {
       name: { _type: Type.String, _default: "(no-name)" },
     });
@@ -154,8 +161,7 @@ function registerSimpleExtension(
       </div>
     );
   };
-  registerExtension({
-    name,
+  registerExtension(name, {
     moduleName,
     load: getSyncLifecycle(
       takesConfig ? ConfigurableComponent : SimpleComponent,

package/docs/interfaces/AssignedExtension.md

@@ -1,63 +0,0 @@
-[@openmrs/esm-framework](../API.md) / AssignedExtension
-
-# Interface: AssignedExtension
-
-## Table of contents
-
-### Properties
-
-- [id](AssignedExtension.md#id)
-- [meta](AssignedExtension.md#meta)
-- [name](AssignedExtension.md#name)
-- [offline](AssignedExtension.md#offline)
-- [online](AssignedExtension.md#online)
-
-## Properties
-
-### id
-
-• **id**: `string`
-
-#### Defined in
-
-[packages/framework/esm-extensions/src/store.ts:71](https://github.com/openmrs/openmrs-esm-core/blob/master/packages/framework/esm-extensions/src/store.ts#L71)
-
-___
-
-### meta
-
-• **meta**: [`ExtensionMeta`](ExtensionMeta.md)
-
-#### Defined in
-
-[packages/framework/esm-extensions/src/store.ts:73](https://github.com/openmrs/openmrs-esm-core/blob/master/packages/framework/esm-extensions/src/store.ts#L73)
-
-___
-
-### name
-
-• **name**: `string`
-
-#### Defined in
-
-[packages/framework/esm-extensions/src/store.ts:72](https://github.com/openmrs/openmrs-esm-core/blob/master/packages/framework/esm-extensions/src/store.ts#L72)
-
-___
-
-### offline
-
-• `Optional` **offline**: `boolean` \| `object`
-
-#### Defined in
-
-[packages/framework/esm-extensions/src/store.ts:75](https://github.com/openmrs/openmrs-esm-core/blob/master/packages/framework/esm-extensions/src/store.ts#L75)
-
-___
-
-### online
-
-• `Optional` **online**: `boolean` \| `object`
-
-#### Defined in
-
-[packages/framework/esm-extensions/src/store.ts:74](https://github.com/openmrs/openmrs-esm-core/blob/master/packages/framework/esm-extensions/src/store.ts#L74)

package/docs/interfaces/ExtensionInternalStore.md

@@ -1,34 +0,0 @@
-[@openmrs/esm-framework](../API.md) / ExtensionInternalStore
-
-# Interface: ExtensionInternalStore
-
-## Table of contents
-
-### Properties
-
-- [extensions](ExtensionInternalStore.md#extensions)
-- [slots](ExtensionInternalStore.md#slots)
-
-## Properties
-
-### extensions
-
-• **extensions**: `Record`<`string`, [`ExtensionInfo`](ExtensionInfo.md)\>
-
-Extensions indexed by name
-
-#### Defined in
-
-[packages/framework/esm-extensions/src/store.ts:39](https://github.com/openmrs/openmrs-esm-core/blob/master/packages/framework/esm-extensions/src/store.ts#L39)
-
-___
-
-### slots
-
-• **slots**: `Record`<`string`, [`ExtensionSlotInfo`](ExtensionSlotInfo.md)\>
-
-Slots indexed by name
-
-#### Defined in
-
-[packages/framework/esm-extensions/src/store.ts:37](https://github.com/openmrs/openmrs-esm-core/blob/master/packages/framework/esm-extensions/src/store.ts#L37)

package/docs/interfaces/ExtensionSlotState.md

@@ -1,30 +0,0 @@
-[@openmrs/esm-framework](../API.md) / ExtensionSlotState
-
-# Interface: ExtensionSlotState
-
-## Table of contents
-
-### Properties
-
-- [assignedExtensions](ExtensionSlotState.md#assignedextensions)
-- [moduleName](ExtensionSlotState.md#modulename)
-
-## Properties
-
-### assignedExtensions
-
-• **assignedExtensions**: [`AssignedExtension`](AssignedExtension.md)[]
-
-#### Defined in
-
-[packages/framework/esm-extensions/src/store.ts:67](https://github.com/openmrs/openmrs-esm-core/blob/master/packages/framework/esm-extensions/src/store.ts#L67)
-
-___
-
-### moduleName
-
-• **moduleName**: `string`
-
-#### Defined in
-
-[packages/framework/esm-extensions/src/store.ts:66](https://github.com/openmrs/openmrs-esm-core/blob/master/packages/framework/esm-extensions/src/store.ts#L66)