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

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
@@ -49,22 +35,16 @@ export function startupApp() {
  * This named export tells the app shell that the default export of `root.component.tsx`
  * should be rendered when the route matches `root`. The full route
  * will be `openmrsSpaBase() + 'root'`, which is usually
- * `/openmrs/spa/opencare`.
+ * `/openmrs/spa/opentms`.
  */
 /* export const root = getSyncLifecycle(
   Root,
   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/repositories/opentms/index.ts

@@ -0,0 +1,10 @@
+import { type TypeRepository } from '../TypeRepository';
+import ProdOpentmsRepository from './prodRepository';
+import OpentmsRepository from './repository';
+
+export function getOpentmsRepository(t: TypeRepository = 'fake'): OpentmsRepository {
+  if (t === 'fake') {
+    return new OpentmsRepository();
+  }
+  return new ProdOpentmsRepository();
+}

package/src/repositories/{Opencare → opentms}/prodRepository.ts

@@ -1,31 +1,25 @@
-import { BadResponse } from "../errors";
-import env from "../env";
-import OpencareRepository from "./repository";
+import { BadResponse } from '../errors';
+import env from '../env';
+import OpentmsRepository from './repository';
 
-class ProdOpencareRepository extends OpencareRepository {
+class ProdOpentmsRepository extends OpentmsRepository {
   async getDemands(): Promise<Array<any>> {
     let myHeaders = new Headers();
-    myHeaders.append("Accept", "application/json,");
-    myHeaders.append("Content-Type", "application/json");
+    myHeaders.append('Accept', 'application/json,');
+    myHeaders.append('Content-Type', 'application/json');
     //myHeaders.append("Authorization", `Basic ${TALK_BASE64}`);
 
     let requestOptions = {
-      method: "GET",
+      method: 'GET',
       headers: myHeaders,
     };
-    const demandProgressStatus = "2";
-    return await fetch(
-      `${env.API_BASE_URL}/demand?status=${demandProgressStatus}`,
-      requestOptions
-    )
+    const demandProgressStatus = '2';
+    return await fetch(`${env.API_BASE_URL}/demand?status=${demandProgressStatus}`, requestOptions)
       .then((response) => {
         if (response.ok) {
           return response.json();
         }
-        throw new BadResponse(
-          `Impossible de recupérer les démandes (${response.status})`,
-          "Opencare"
-        );
+        throw new BadResponse(`Impossible de recupérer les démandes (${response.status})`, 'Opentms');
       })
       .then(({ results }) => {
         const res: Array<any> = results;
@@ -33,34 +27,26 @@ class ProdOpencareRepository extends OpencareRepository {
       });
   }
 
-  async getAppointments(
-    patientUuid: string,
-    doctor?: string
-  ): Promise<Array<any>> {
+  async getAppointments(patientUuid: string, doctor?: string): Promise<Array<any>> {
     let myHeaders = new Headers();
-    myHeaders.append("Accept", "application/json,");
-    myHeaders.append("Content-Type", "application/json");
+    myHeaders.append('Accept', 'application/json,');
+    myHeaders.append('Content-Type', 'application/json');
     //myHeaders.append("Authorization", `Basic ${TALK_BASE64}`);
 
     let requestOptions = {
-      method: "GET",
+      method: 'GET',
       headers: myHeaders,
     };
 
     return await fetch(
-      `${env.API_BASE_URL}/patient/${patientUuid}/appointment${
-        doctor ? `?doctor=${doctor}` : ""
-      }`,
-      requestOptions
+      `${env.API_BASE_URL}/patient/${patientUuid}/appointment${doctor ? `?doctor=${doctor}` : ''}`,
+      requestOptions,
     )
       .then((response) => {
         if (response.ok) {
           return response.json();
         }
-        throw new BadResponse(
-          `Impossible de recupérer les rencontres (${response.status})`,
-          "Opencare"
-        );
+        throw new BadResponse(`Impossible de recupérer les rencontres (${response.status})`, 'Opentms');
       })
       .then(({ results }) => {
         const res: Array<any> = results;
@@ -68,11 +54,11 @@ class ProdOpencareRepository extends OpencareRepository {
           return {
             uuid: appointment.uuid,
             startDateTime: appointment.startDateTime,
-            location: "",
+            location: '',
             service: appointment.service,
             status: appointment.statusProgress,
-            appointmentKind: "Scheduled",
-            comments: "",
+            appointmentKind: 'Scheduled',
+            comments: '',
             linkRoom: appointment.linkRoom,
             patientUuid,
           };
@@ -82,25 +68,19 @@ class ProdOpencareRepository extends OpencareRepository {
 
   async rejectDemand(demand_id: string): Promise<void> {
     let myHeaders = new Headers();
-    myHeaders.append("Accept", "application/json,");
-    myHeaders.append("Content-Type", "application/json");
+    myHeaders.append('Accept', 'application/json,');
+    myHeaders.append('Content-Type', 'application/json');
     //myHeaders.append("Authorization", `Basic ${TALK_BASE64}`);
 
     let requestOptions = {
-      method: "PUT",
+      method: 'PUT',
       headers: myHeaders,
     };
-    await fetch(
-      `${env.API_BASE_URL}/demand/${demand_id}/reject`,
-      requestOptions
-    ).then((response) => {
+    await fetch(`${env.API_BASE_URL}/demand/${demand_id}/reject`, requestOptions).then((response) => {
       if (response.ok) {
         return response.json();
       }
-      throw new BadResponse(
-        `Impossible de rejeter la demande (${response.status})`,
-        "Opencare"
-      );
+      throw new BadResponse(`Impossible de rejeter la demande (${response.status})`, 'Opentms');
     });
   }
 
@@ -108,11 +88,11 @@ class ProdOpencareRepository extends OpencareRepository {
     demand_id: string,
     doctor_id: string,
     startDate: Date = new Date(),
-    duration = 30
+    duration = 30,
   ): Promise<void> {
     const myHeaders = new Headers();
-    myHeaders.append("Accept", "application/json,");
-    myHeaders.append("Content-Type", "application/json");
+    myHeaders.append('Accept', 'application/json,');
+    myHeaders.append('Content-Type', 'application/json');
 
     const raw = JSON.stringify({
       doctor_id: doctor_id,
@@ -121,33 +101,27 @@ class ProdOpencareRepository extends OpencareRepository {
     });
 
     const requestOptions = {
-      method: "POST",
+      method: 'POST',
       headers: myHeaders,
       body: raw,
     };
 
-    await fetch(
-      `${env.API_BASE_URL}/demand/${demand_id}/validate`,
-      requestOptions
-    ).then((response) => {
+    await fetch(`${env.API_BASE_URL}/demand/${demand_id}/validate`, requestOptions).then((response) => {
       if (response.ok) {
         return response.json();
       }
-      throw new BadResponse(
-        `Impossible de valider la demande (${response.status})`,
-        "Opencare"
-      );
+      throw new BadResponse(`Impossible de valider la demande (${response.status})`, 'Opentms');
     });
   }
 
   async getProviders(): Promise<Array<any>> {
     let myHeaders = new Headers();
-    myHeaders.append("Accept", "application/json,");
-    myHeaders.append("Content-Type", "application/json");
+    myHeaders.append('Accept', 'application/json,');
+    myHeaders.append('Content-Type', 'application/json');
     //myHeaders.append("Authorization", `Basic ${TALK_BASE64}`);
 
     let requestOptions = {
-      method: "GET",
+      method: 'GET',
       headers: myHeaders,
     };
 
@@ -156,10 +130,7 @@ class ProdOpencareRepository extends OpencareRepository {
         if (response.ok) {
           return response.json();
         }
-        throw new BadResponse(
-          `Impossible de recupérer les rencontres (${response.status})`,
-          "Opencare"
-        );
+        throw new BadResponse(`Impossible de recupérer les rencontres (${response.status})`, 'Opentms');
       })
       .then(({ results }) => {
         const res: Array<any> = results;
@@ -173,4 +144,4 @@ class ProdOpencareRepository extends OpencareRepository {
   }
 }
 
-export default ProdOpencareRepository;
+export default ProdOpentmsRepository;

package/src/repositories/{Opencare → opentms}/repository.ts

@@ -1,14 +1,11 @@
 /* eslint-disable @typescript-eslint/no-empty-function */
 
-class OpencareRepository {
+class OpentmsRepository {
   async getDemands(): Promise<Array<any>> {
     return [];
   }
 
-  async getAppointments(
-    patientUuid: string,
-    doctor?: string
-  ): Promise<Array<any>> {
+  async getAppointments(patientUuid: string, doctor?: string): Promise<Array<any>> {
     return [];
   }
 
@@ -18,7 +15,7 @@ class OpencareRepository {
     demand_id: string,
     doctor_id: string,
     startDate: Date = new Date(),
-    duration = 30
+    duration = 30,
   ): Promise<void> {}
 
   async getProviders(): Promise<Array<any>> {
@@ -27,8 +24,8 @@ class OpencareRepository {
 
   // must be different for production for the duration of the appointment
   async getTokenNextcloud(username: string): Promise<any> {
-    return "TALK_PASSWORD";
+    return 'TALK_PASSWORD';
   }
 }
 
-export default OpencareRepository;
+export default OpentmsRepository;

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/src/services/doctor.ts

@@ -1,6 +1,5 @@
-import { formatDatetime, parseDate } from "@openmrs/esm-framework";
-import { getOpencareRepository } from "../repositories/Opencare";
-import type OpencareRepository from "../repositories/Opencare/repository";
+import { getOpentmsRepository } from '../repositories/opentms';
+import type OpentmsRepository from '../repositories/opentms/repository';
 
 export enum AppointmentTypes {
   UPCOMING = 0,
@@ -11,10 +10,10 @@ export enum AppointmentTypes {
 class DoctorService {
   static instance: DoctorService | null = null;
 
-  opencare_rep: OpencareRepository;
+  Opentms_rep: OpentmsRepository;
 
   constructor() {
-    this.opencare_rep = getOpencareRepository("good");
+    this.Opentms_rep = getOpentmsRepository('good');
   }
 
   /**
@@ -37,7 +36,7 @@ class DoctorService {
    */
   async getDemands(istoday = false): Promise<Array<any>> {
     try {
-      return await this.opencare_rep.getDemands();
+      return await this.Opentms_rep.getDemands();
     } catch (error) {
       /* console.log(error); */
       return null;
@@ -50,7 +49,7 @@ class DoctorService {
    */
   async rejectDemand(demand_id: string): Promise<any> {
     try {
-      await this.opencare_rep.rejectDemand(demand_id);
+      await this.Opentms_rep.rejectDemand(demand_id);
       return true;
     } catch (error) {
       /* console.log(error); */
@@ -66,15 +65,10 @@ class DoctorService {
     demand_id: string,
     doctor_id: string,
     startDate: Date = new Date(),
-    duration = 30
+    duration = 30,
   ): Promise<any> {
     try {
-      await this.opencare_rep.vaidateDemand(
-        demand_id,
-        doctor_id,
-        startDate,
-        duration
-      );
+      await this.Opentms_rep.vaidateDemand(demand_id, doctor_id, startDate, duration);
       return true;
     } catch (error) {
       /* console.log(error); */
@@ -87,19 +81,16 @@ class DoctorService {
    * @param patientUuid patient uuid
    * @returns
    */
-  async getAppointments(
-    patientUuid: string,
-    doctor?: string
-  ): Promise<Map<number, Array<any>>> {
+  async getAppointments(patientUuid: string, doctor?: string): Promise<Map<number, Array<any>>> {
     try {
       const past = [];
       const today = [];
       const upcoming = [];
 
-      const res = await this.opencare_rep.getAppointments(patientUuid, doctor);
+      const res = await this.Opentms_rep.getAppointments(patientUuid, doctor);
       let datenow = new Date();
       res.forEach((appointment, i) => {
-        if (appointment.status != "Cancelled") {
+        if (appointment.status != 'Cancelled') {
           const dateappt = new Date(appointment.startDateTime);
 
           // eslint-disable-next-line no-console
@@ -145,7 +136,7 @@ class DoctorService {
 
   async getProviders(): Promise<Array<any>> {
     try {
-      return await this.opencare_rep.getProviders();
+      return await this.Opentms_rep.getProviders();
     } catch (error) {
       /* console.log(error); */
       return null;
@@ -158,7 +149,7 @@ class DoctorService {
    * @returns
    */
   async getTokenNextcloud(username: string): Promise<string> {
-    return await this.opencare_rep.getTokenNextcloud(username);
+    return await this.Opentms_rep.getTokenNextcloud(username);
   }
 }
 

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';