@mbehenri/openmrs-esm-opentms-meet-app 1.0.1 → 1.0.2

package/src/index.ts

@@ -4,22 +4,13 @@
  * connects the app shell to the React application(s) that make up this
  * microfrontend.
  */
-import {
-  getAsyncLifecycle,
-  defineConfigSchema,
-  getSyncLifecycle,
-} from "@openmrs/esm-framework";
-import { configSchema } from "./config-schema";
-import Root from "./root.component";
-import DemandTabExt from "./Extensions/DemandTabExt";
-import AppointmentTabExt from "./Extensions/AppointmentTabExt";
-import MeetIframeExt from "./Extensions/MeetIframeExt";
-import { ValidateDemandFormExt } from "./Extensions/ValidateDemandFormExt";
+import { getAsyncLifecycle, defineConfigSchema, getSyncLifecycle } from '@openmrs/esm-framework';
+import { configSchema } from './config-schema';
 
-const moduleName = "@openmrs/esm-opencare-app";
+const moduleName = '@mbehenri/openmrs-esm-opentms-meet-app';
 
 const options = {
-  featureName: "opencare",
+  featureName: 'opentms',
   moduleName,
 };
 
@@ -28,12 +19,7 @@ const options = {
  * are JSON files in the directory `../translations` (which you should
  * see in the directory structure).
  */
-export const importTranslation = require.context(
-  "../translations",
-  false,
-  /.json$/,
-  "lazy"
-);
+export const importTranslation = require.context('../translations', false, /.json$/, 'lazy');
 
 /**
  * This function performs any setup that should happen at microfrontend
@@ -56,15 +42,9 @@ export function startupApp() {
   options
 ); */
 
-export const root = getSyncLifecycle(Root, options);
+export const root = getAsyncLifecycle(() => import('./root.component'), options);
 
-export const demandtab = getSyncLifecycle(DemandTabExt, options);
-
-export const appointmenttab = getSyncLifecycle(AppointmentTabExt, options);
-
-export const meetiframe = getSyncLifecycle(MeetIframeExt, options);
-
-export const validatedemandform = getSyncLifecycle(
-  ValidateDemandFormExt,
-  options
-);
+export const demandtab = getAsyncLifecycle(() => import('./extensions/DemandTabExt'), options);
+export const appointmenttab = getAsyncLifecycle(() => import('./extensions/AppointmentTabExt'), options);
+export const meetiframe = getAsyncLifecycle(() => import('./extensions/MeetIframeExt'), options);
+export const validatedemandform = getAsyncLifecycle(() => import('./extensions/ValidateDemandFormExt'), options);

package/src/pages/home/home.component.tsx

@@ -1,5 +1,5 @@
-import React from "react";
+import React from 'react';
 
 export function Home() {
-  return <h3> Welcome to opencare app </h3>;
+  return <h3> Welcome to opentms app </h3>;
 }

package/src/root.component.tsx

@@ -8,38 +8,27 @@
  *   https://openmrs.github.io/openmrs-esm-core/#/main/config
  */
 
-import React, { useEffect } from "react";
-import { BrowserRouter, Route, Routes } from "react-router-dom";
-import { Home } from "./pages/home/home.component";
-import { useConfig } from "@openmrs/esm-framework";
-import env from "./repositories/env";
+import React, { useEffect } from 'react';
+// import { BrowserRouter, Route, Routes } from 'react-router-dom';
+import { Home } from './pages/home/home.component';
+import { useConfig } from '@openmrs/esm-framework';
+import env from './repositories/env';
 // import { useTranslation } from "react-i18next";
 //import styles from "./root.scss";
 
 const Root: React.FC = () => {
-  // const { t } = useTranslation();
-  //const basename = window.getOpenmrsSpaBase() + "home/opencare";
-  const basename = window.getOpenmrsSpaBase() + "opencare";
-
   //recupération de la configuration
   const conf = useConfig();
 
   // update env variable
   useEffect(() => {
-    env.API_SECURE = conf["API_SECURE"];
-    env.API_BASE_URL = conf["API_BASE_URL"];
+    env.API_SECURE = conf['API_SECURE'];
+    env.API_BASE_URL = conf['API_BASE_URL'];
     // eslint-disable-next-line @typescript-eslint/no-empty-function
     return () => {};
   }, [conf]);
 
-  return (
-    <BrowserRouter basename={basename}>
-      <Routes>
-        {/* Route de la page d'acceuil */}
-        <Route path="/home" element={<Home />} />
-      </Routes>
-    </BrowserRouter>
-  );
+  return <Home />;
 };
 
 export default Root;

package/src/root.scss

@@ -1,15 +1,15 @@
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
+@use '@carbon/layout';
+@use '@carbon/type';
 
 .container {
-  padding: spacing.$spacing-07;
+  padding: layout.$spacing-07;
 }
 
 .welcome {
   @include type.type-style('heading-04');
-  margin: spacing.$spacing-05 0; 
+  margin: layout.$spacing-05 0;
 }
 
 .explainer {
-  margin-bottom: 2rem;
+  margin-bottom: layout.$spacing-07;
 }

package/src/root.test.tsx

@@ -21,11 +21,11 @@
  * Kent C. Dodds is the inventor of `@testing-library`:
  *   https://testing-library.com/docs/guiding-principles
  */
-import React from "react";
-import { render, screen } from "@testing-library/react";
-import { useConfig } from "@openmrs/esm-framework";
-import { type Config } from "./config-schema";
-import Root from "./root.component";
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import { useConfig } from '@openmrs/esm-framework';
+import { type Config } from './config-schema';
+import Root from './root.component';
 
 /**
  * This is an idiomatic way of dealing with mocked files. Note that
@@ -34,18 +34,13 @@ import Root from "./root.component";
  * mock file. This line just tells TypeScript that the object is, in
  * fact, a mock, and so will have methods like `mockReturnValue`.
  */
-const mockUseConfig = useConfig as jest.Mock;
+const mockUseConfig = jest.mocked(useConfig<Config>);
 
-it("renders a landing page for the opencare app", () => {
-  const config: Config = {
-    API_SECURE: "Admin123",
-    API_BASE_URL: "admin",
-  };
+it('renders a landing page for the opentms app', () => {
+  const config: Config = { API_BASE_URL: 'http://localhost:8080', API_SECURE: '*******************' };
   mockUseConfig.mockReturnValue(config);
 
   render(<Root />);
 
-  expect(
-    screen.getByRole("heading", { name: /welcome to the o3 opencare app/i })
-  ).toBeInTheDocument();
+  expect(screen.getByRole('heading', { name: /Welcome to opentms app/i })).toBeInTheDocument();
 });

package/src/routes.json

@@ -7,22 +7,17 @@
   "extensions": [
     {
       "component": "demandtab",
-      "name": "opencare-demand-tab",
-      "slot": "homepage-widgets-slot"
+      "name": "opentms-demand-tab",
+      "slot": "service-queues-dashboard-slot"
     },
     {
       "component": "appointmenttab",
-      "name": "opencare-appointment-tab",
+      "name": "opentms-appointment-tab",
       "slot": "patient-chart-appointments-dashboard-slot"
     },
-    {
-      "component": "root",
-      "name": "opencare-dashboard",
-      "slot": "opencare-dashboard-slot"
-    },
     {
       "component": "meetiframe",
-      "name": "opencare-meet-iframe",
+      "name": "opentms-meet-iframe",
       "meta": {
         "title": {
           "key": "meetWorkspace",
@@ -32,13 +27,13 @@
     },
     {
       "component": "validatedemandform",
-      "name": "opencare-validate-demand-form"
+      "name": "opentms-validate-demand-form"
     }
   ],
   "pages": [
     {
       "component": "root",
-      "route": "opencare"
+      "route": "root"
     }
   ]
 }

package/{i18next-parser.config.js → tools/i18next-parser.config.js}

@@ -1,14 +1,14 @@
 module.exports = {
-  contextSeparator: "_",
+  contextSeparator: '_',
   // Key separator used in your translation keys
 
   createOldCatalogs: false,
   // Save the \_old files
 
-  defaultNamespace: "translations",
+  defaultNamespace: 'translations',
   // Default namespace used in your i18next config
 
-  defaultValue: "",
+  defaultValue: '',
   // Default value to give to empty keys
   // You may also specify a function accepting the locale, namespace, and key as arguments
 
@@ -18,43 +18,43 @@ module.exports = {
   keepRemoved: false,
   // Keep keys from the catalog that are no longer in code
 
-  keySeparator: ".",
+  keySeparator: '.',
   // Key separator used in your translation keys
   // If you want to use plain english keys, separators such as `.` and `:` will conflict. You might want to set `keySeparator: false` and `namespaceSeparator: false`. That way, `t('Status: Loading...')` will not think that there are a namespace and three separator dots for instance.
 
   // see below for more details
   lexers: {
-    hbs: ["HandlebarsLexer"],
-    handlebars: ["HandlebarsLexer"],
+    hbs: ['HandlebarsLexer'],
+    handlebars: ['HandlebarsLexer'],
 
-    htm: ["HTMLLexer"],
-    html: ["HTMLLexer"],
+    htm: ['HTMLLexer'],
+    html: ['HTMLLexer'],
 
-    mjs: ["JavascriptLexer"],
-    js: ["JavascriptLexer"], // if you're writing jsx inside .js files, change this to JsxLexer
-    ts: ["JavascriptLexer"],
-    jsx: ["JsxLexer"],
-    tsx: ["JsxLexer"],
+    mjs: ['JavascriptLexer'],
+    js: ['JavascriptLexer'], // if you're writing jsx inside .js files, change this to JsxLexer
+    ts: ['JavascriptLexer'],
+    jsx: ['JsxLexer'],
+    tsx: ['JsxLexer'],
 
-    default: ["JavascriptLexer"],
+    default: ['JavascriptLexer'],
   },
 
-  lineEnding: "auto",
+  lineEnding: 'auto',
   // Control the line ending. See options at https://github.com/ryanve/eol
 
-  locales: ["en"],
+  locales: ['en'],
   // An array of the locales in your applications
 
-  namespaceSeparator: ":",
+  namespaceSeparator: ':',
   // Namespace separator used in your translation keys
   // If you want to use plain english keys, separators such as `.` and `:` will conflict. You might want to set `keySeparator: false` and `namespaceSeparator: false`. That way, `t('Status: Loading...')` will not think that there are a namespace and three separator dots for instance.
 
-  output: "$NAMESPACE/$LOCALE.json",
+  output: '$NAMESPACE/$LOCALE.json',
   // Supports $LOCALE and $NAMESPACE injection
   // Supports JSON (.json) and YAML (.yml) file formats
   // Where to write the locale files relative to process.cwd()
 
-  pluralSeparator: "_",
+  pluralSeparator: '_',
   // Plural separator used in your translation keys
   // If you want to use plain english keys, separators such as `_` might conflict. You might want to set `pluralSeparator` to a different string that does not occur in your keys.
 

package/tools/setup-tests.ts

@@ -0,0 +1 @@
+import '@testing-library/jest-dom';

package/tools/update-openmrs-deps.mjs

@@ -0,0 +1,43 @@
+import { execSync } from 'node:child_process';
+
+try {
+  // NB for other places use '@openmrs/*@next'; here we want to ignore patient-common-lib
+  execSync(`yarn up --fixed '@openmrs/*@next' 'openmrs@next'`, {
+    stdio: ['ignore', 'inherit', 'inherit'],
+    windowsHide: true,
+  });
+} catch (error) {
+  console.error(`Error while updating dependencies: ${error.message ?? error}`);
+  process.exit(1);
+}
+
+try {
+  execSync(`yarn dedupe`, {
+    stdio: ['ignore', 'inherit', 'inherit'],
+    windowsHide: true,
+  });
+} catch (error) {
+  console.error(`Error while deduplicating dependencies: ${error.message ?? error}`);
+  process.exit(1);
+}
+
+try {
+  execSync(`git diff-index --quiet HEAD --`, {
+    stdio: 'ignore',
+    windowsHide: true,
+  });
+  process.exit(0);
+} catch (error) {
+  // git diff-index --quite HEAD --
+  // exits with status 1 if there are changes; we only need to run yarn verify if there are changes
+}
+
+try {
+  execSync(`yarn verify`, {
+    stdio: ['ignore', 'inherit', 'inherit'],
+    windowsHide: true,
+  });
+} catch (error) {
+  console.error(`Error while running yarn verify: ${error.message ?? error}. Updates require manual intervention.`);
+  process.exit(1);
+}

package/translations/am.json

@@ -0,0 +1,24 @@
+{
+  "casualGreeting": "hey",
+  "configSystem": "የማዋቀር ስርዓት",
+  "configSystemExplainer": "ከዚህ በታች የሚታየው ሰላምታ የሚመራው በማዋቀር ስርዓቱ ነው። የማዋቀር ባህሪያቱን ለመቀየር በአሳሹ ውስጥ ያለውን የስፓነር አዶ ጠቅ ያድርጉ የአስፈፃሚ መሳሪያዎች ፓነልን ለመሳብ። በመቀጠል በ <4>የፍለጋ ውቅረት</4> ግቤት ውስጥ <2>አብነት</2>ን ይተይቡ። ይህ ለዚህ ሞጁል ተዛማጅ የሆኑትን ብቻ ለማሳየት የማዋቀሪያ ባህሪያትን ማጣራት አለበት. በUI ውስጥ የሚንፀባረቁትን ለውጦች ለማየት የእነዚህን ንብረቶች እሴቶች መለወጥ እና <6>አስቀምጥ</6>ን ጠቅ ማድረግ ይችላሉ",
+  "connect": "ተገናኝ",
+  "connectExplainer": "ከማህበረሰቡ ጋር ይገናኙ",
+  "dataFetching": "ውሂብ ማምጣት",
+  "designDocs": "የንድፍ መመሪያ",
+  "designDocsExplainer": "የ O3 ንድፍ ሰነድ ያንብቡ",
+  "explainer": "የሚከተሉት ምሳሌዎች የ O3 ማዕቀፍ አንዳንድ ቁልፍ ባህሪያትን ያሳያሉ",
+  "extensionExplainer": "አንዳንድ ባለቀለም ሳጥኖች እዚህ አሉ። በአንድ ማስገቢያ ውስጥ እንደ ቅጥያ ስለተያያዙ፣ አስተዳዳሪው ውቅረትን ተጠቅሞ የሚታዩትን ሳጥኖች መለወጥ ይችላል። እነዚህ ሳጥኖች በዚህ ሞጁል ውስጥ ይገለጻሉ, ነገር ግን በተለየ ሞጁል ውስጥ ቢሆኑም እንኳ ከዚህ ማስገቢያ ጋር ማያያዝ ይችላሉ",
+  "extensionSystem": "የኤክስቴንሽን ስርዓት",
+  "formalGreeting": "ሀሎ",
+  "frontendDocs": "የፊት-መጨረሻ መመሪያ",
+  "getPatient": "የተሰየመ ታካሚ ያግኙ",
+  "getStarted": "እንጀምር",
+  "getStartedExplainer": "ከዚህ አብነት የፊት ለፊት ሞጁል ይፍጠሩ",
+  "learnExplainer": "የ O3 ማዕቀፍን እንዴት መጠቀም እንደሚችሉ ይወቁ",
+  "loading": "በመጫን ላይ",
+  "patientGetterExplainer": "በሽተኛውን ከኤፒአይ ለማውጣት ከታች ያለውን አዝራር ጠቅ ያድርጉ",
+  "resources": "መርጃዎች",
+  "usefulLinks": "ከዚህ በታች ወደ ጠቃሚ ሀብቶች አንዳንድ አገናኞች አሉ",
+  "welcomeText": "ወደ O3 አብነት መተግበሪያ እንኳን በደህና መጡ"
+}

package/translations/en.json

@@ -1 +1,24 @@
-{}
+{
+  "casualGreeting": "hey",
+  "configSystem": "Configuration system",
+  "configSystemExplainer": "The greeting shown below is driven by the configuration system. To change the configuration properties, click the spanner icon in the navbar to pull up the Implementer Tools panel. Then, type <2>template</2> into the <4>Search configuration</4> input. This should filter the configuration properties to show only those that are relevant to this module. You can change the values of these properties and click <6>Save</6> to see the changes reflected in the UI",
+  "connect": "Connect",
+  "connectExplainer": "Get in touch with the community",
+  "dataFetching": "Data fetching",
+  "designDocs": "Design docs",
+  "designDocsExplainer": "Read the O3 design documentation",
+  "explainer": "The following examples demonstrate some key features of the O3 framework",
+  "extensionExplainer": "Here are some colored boxes. Because they are attached as extensions within a slot, an admin can change what boxes are shown using configuration. These boxes happen to be defined in this module, but they could attach to this slot even if they were in a different module",
+  "extensionSystem": "Extension system",
+  "formalGreeting": "hello",
+  "frontendDocs": "Frontend docs",
+  "getPatient": "Get a patient named",
+  "getStarted": "Get started",
+  "getStartedExplainer": "Create a frontend module from this template",
+  "learnExplainer": "Learn how to use the O3 framework",
+  "loading": "Loading",
+  "patientGetterExplainer": "Try clicking the button below to fetch a patient from the backend",
+  "resources": "Resources",
+  "usefulLinks": "Below are some links to useful resources",
+  "welcomeText": "Welcome to the O3 Template app"
+}

package/tsconfig.json

@@ -15,7 +15,7 @@
       "es2016.array.include",
       "es2018",
       "es2020",
-      "es2022"
+      "es2022",
     ],
     "resolveJsonModule": true,
     "noEmit": true,

package/webpack.config.js

@@ -1 +1 @@
-module.exports = require("openmrs/default-webpack-config");
+module.exports = require('openmrs/default-webpack-config');