@openmrs/esm-react-utils 3.4.1-pre.139 → 3.4.1-pre.151

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-react-utils",
-  "version": "3.4.1-pre.139",
+  "version": "3.4.1-pre.151",
   "license": "MPL-2.0",
   "description": "React utilities for OpenMRS.",
   "browser": "dist/openmrs-esm-react-utils.js",
@@ -55,11 +55,11 @@
     "react-i18next": "11.x"
   },
   "devDependencies": {
-    "@openmrs/esm-api": "^3.4.1-pre.139",
-    "@openmrs/esm-config": "^3.4.1-pre.139",
-    "@openmrs/esm-error-handling": "^3.4.1-pre.139",
-    "@openmrs/esm-extensions": "^3.4.1-pre.139",
-    "@openmrs/esm-globals": "^3.4.1-pre.139",
+    "@openmrs/esm-api": "^3.4.1-pre.151",
+    "@openmrs/esm-config": "^3.4.1-pre.151",
+    "@openmrs/esm-error-handling": "^3.4.1-pre.151",
+    "@openmrs/esm-extensions": "^3.4.1-pre.151",
+    "@openmrs/esm-globals": "^3.4.1-pre.151",
     "dayjs": "^1.10.8",
     "i18next": "^19.6.0",
     "react": "^16.13.1",
@@ -68,5 +68,5 @@
     "rxjs": "^6.5.3",
     "unistore": "^3.5.2"
   },
-  "gitHead": "59cfc00c57bdc9900cd915b2dfc6676c9c13f318"
+  "gitHead": "f8709e7ec5c11e10682ef7e2f1463c4d343c22e5"
 }

package/src/ExtensionSlot.tsx

@@ -40,12 +40,25 @@ function isShallowEqual(prevDeps: any, nextDeps: any) {
 }
 
 export interface ExtensionSlotBaseProps {
+  name: string;
+  /** @deprecated Use `name` */
+  extensionSlotName?: string;
+  select?: (extensions: Array<ConnectedExtension>) => Array<ConnectedExtension>;
+  state?: Record<string, any>;
+}
+
+export interface OldExtensionSlotBaseProps {
+  name?: string;
+  /** @deprecated Use `name` */
   extensionSlotName: string;
   select?: (extensions: Array<ConnectedExtension>) => Array<ConnectedExtension>;
   state?: Record<string, any>;
 }
 
-export type ExtensionSlotProps = ExtensionSlotBaseProps &
+export type ExtensionSlotProps = (
+  | OldExtensionSlotBaseProps
+  | ExtensionSlotBaseProps
+) &
   React.HTMLAttributes<HTMLDivElement>;
 
 function defaultSelect(extensions: Array<ConnectedExtension>) {
@@ -53,6 +66,7 @@ function defaultSelect(extensions: Array<ConnectedExtension>) {
 }
 
 export const ExtensionSlot: React.FC<ExtensionSlotProps> = ({
+  name: goodName,
   extensionSlotName,
   select = defaultSelect,
   children,
@@ -60,9 +74,9 @@ export const ExtensionSlot: React.FC<ExtensionSlotProps> = ({
   style,
   ...divProps
 }: ExtensionSlotProps) => {
+  const name = (goodName ?? extensionSlotName) as string;
   const slotRef = useRef(null);
-  const { extensions, extensionSlotModuleName } =
-    useExtensionSlot(extensionSlotName);
+  const { extensions, extensionSlotModuleName } = useExtensionSlot(name);
   const stateRef = useRef(state);
 
   if (!isShallowEqual(stateRef.current, state)) {
@@ -71,7 +85,7 @@ export const ExtensionSlot: React.FC<ExtensionSlotProps> = ({
 
   const content = useMemo(
     () =>
-      extensionSlotName &&
+      name &&
       select(extensions).map((extension) => (
         <ComponentContext.Provider
           key={extension.id}
@@ -79,7 +93,7 @@ export const ExtensionSlot: React.FC<ExtensionSlotProps> = ({
             moduleName: extensionSlotModuleName, // moduleName is not used by the receiving Extension
             extension: {
               extensionId: extension.id,
-              extensionSlotName,
+              extensionSlotName: name,
               extensionSlotModuleName,
             },
           }}
@@ -87,13 +101,13 @@ export const ExtensionSlot: React.FC<ExtensionSlotProps> = ({
           {children ?? <Extension state={stateRef.current} />}
         </ComponentContext.Provider>
       )),
-    [select, extensions, extensionSlotName, stateRef.current]
+    [select, extensions, name, stateRef.current]
   );
 
   return (
     <div
       ref={slotRef}
-      data-extension-slot-name={extensionSlotName}
+      data-extension-slot-name={name}
       data-extension-slot-module-name={extensionSlotModuleName}
       style={{ ...style, position: "relative" }}
       {...divProps}

package/src/UserHasAccess.tsx

@@ -3,7 +3,7 @@ import { getCurrentUser, LoggedInUser, userHasAccess } from "@openmrs/esm-api";
 import React, { useEffect, useState } from "react";
 
 export interface UserHasAccessProps {
-  privilege: string;
+  privilege: string | string[];
   fallback?: React.ReactNode;
 }
 

package/src/useConfig.test.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { render, cleanup, screen, waitFor } from "@testing-library/react";
+import { render, cleanup, screen, waitFor, act } from "@testing-library/react";
 import {
   defineConfigSchema,
   temporaryConfigStore,
@@ -26,7 +26,6 @@ function clearConfig() {
 
 describe(`useConfig in root context`, () => {
   afterEach(clearConfig);
-  afterEach(cleanup);
 
   it(`can return config as a react hook`, async () => {
     defineConfigSchema("foo-module", {
@@ -103,9 +102,11 @@ describe(`useConfig in root context`, () => {
       expect(screen.findByText("The first thing")).toBeTruthy()
     );
 
-    temporaryConfigStore.setState({
-      config: { "foo-module": { thing: "A new thing" } },
-    });
+    act(() =>
+      temporaryConfigStore.setState({
+        config: { "foo-module": { thing: "A new thing" } },
+      })
+    );
 
     await waitFor(() => expect(screen.findByText("A new thing")).toBeTruthy());
   });
@@ -273,7 +274,7 @@ describe(`useConfig in an extension`, () => {
     );
 
     const newConfig = { "ext-module": { thing: "A new thing" } };
-    temporaryConfigStore.setState({ config: newConfig });
+    act(() => temporaryConfigStore.setState({ config: newConfig }));
 
     await waitFor(() => expect(screen.findByText("A new thing")).toBeTruthy());
 
@@ -290,7 +291,7 @@ describe(`useConfig in an extension`, () => {
         },
       },
     };
-    temporaryConfigStore.setState({ config: newConfig2 });
+    act(() => temporaryConfigStore.setState({ config: newConfig2 }));
 
     await waitFor(() =>
       expect(screen.findByText("Yet another thing")).toBeTruthy()