@openmrs/esm-cohort-builder-app 3.0.1-pre.87 → 4.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-cohort-builder-app",
-  "version": "3.0.1-pre.87",
+  "version": "4.0.0",
   "license": "MPL-2.0",
   "description": "A microfrontend for OpenMRS cohorts",
   "browser": "dist/openmrs-esm-cohort-builder-app.js",
@@ -14,11 +14,16 @@
     "lint": "eslint src --ext js,jsx,ts,tsx",
     "prettier": "prettier --write \"src/**/*.{ts,tsx}\"",
     "typescript": "tsc",
-    "test": "jest --config jest.config.json --verbose",
+    "test": "jest --config jest.config.js --verbose",
+    "test-e2e": "playwright test",
     "verify": "concurrently 'yarn:lint' 'yarn:test' 'yarn:typescript'",
     "coverage": "yarn test -- --coverage",
     "prepare": "husky install"
   },
+  "files": [
+    "dist",
+    "src"
+  ],
   "husky": {
     "hooks": {
       "pre-commit": "pretty-quick --staged && yarn verify"
@@ -43,47 +48,58 @@
     "url": "https://github.com/openmrs/openmrs-esm-cohortbuilder/issues"
   },
   "peerDependencies": {
-    "@carbon/react": "1.x",
-    "@openmrs/esm-framework": "next",
-    "dayjs": "^1.11.3",
+    "@openmrs/esm-framework": "*",
     "react": "18.x",
     "react-dom": "18.x",
     "react-i18next": "11.x"
   },
   "devDependencies": {
+    "@carbon/react": "1.21.0",
+    "@openmrs/esm-framework": "next",
     "@openmrs/esm-patient-common-lib": "next",
-    "@swc/cli": "^0.1.57",
-    "@swc/core": "^1.3.14",
-    "@swc/jest": "^0.2.22",
-    "@testing-library/dom": "^7.31.2",
-    "@testing-library/jest-dom": "^5.13.0",
-    "@testing-library/react": "^13.3.0",
+    "@openmrs/esm-styleguide": "next",
+    "@playwright/test": "1.44.0",
+    "@swc/cli": "^0.1.61",
+    "@swc/core": "^1.3.34",
+    "@swc/jest": "^0.2.24",
+    "@testing-library/dom": "^8.20.0",
+    "@testing-library/jest-dom": "^5.16.5",
+    "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^14.4.3",
-    "@types/jest": "^28.1.7",
-    "@types/react-dom": "^16.9.14",
-    "@types/webpack-env": "^1.16.0",
-    "@typescript-eslint/eslint-plugin": "^5.29.0",
-    "@typescript-eslint/parser": "^5.14.0",
-    "concurrently": "^6.2.0",
-    "css-loader": "^6.7.1",
-    "eslint": "^8.18.0",
-    "eslint-config-prettier": "^8.3.0",
+    "@types/jest": "^29.4.0",
+    "@types/react": "^18.0.27",
+    "@types/react-dom": "^18.0.10",
+    "@types/webpack-env": "^1.18.0",
+    "@typescript-eslint/eslint-plugin": "^5.51.0",
+    "@typescript-eslint/parser": "^5.51.0",
+    "concurrently": "^7.6.0",
+    "css-loader": "^6.7.3",
+    "dayjs": "^1.11.7",
+    "eslint": "^8.33.0",
+    "eslint-config-prettier": "^8.6.0",
     "eslint-config-ts-react-important-stuff": "^3.0.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-prettier": "^3.4.0",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-unused-imports": "^2.0.0",
-    "husky": "^6.0.0",
+    "husky": "^8.0.3",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "^28.1.3",
-    "jest-cli": "^28.1.3",
-    "jest-environment-jsdom": "^28.1.3",
+    "jest": "^29.4.2",
+    "jest-cli": "^29.4.2",
+    "jest-environment-jsdom": "^29.4.2",
     "openmrs": "next",
-    "prettier": "^2.3.0",
-    "pretty-quick": "^3.1.0",
+    "prettier": "^2.8.4",
+    "pretty-quick": "^3.1.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-i18next": "^11.18.4",
-    "typescript": "^4.3.2"
+    "react-i18next": "^12.1.5",
+    "swc-loader": "^0.2.3",
+    "typescript": "^4.9.5",
+    "webpack": "^5.75.0",
+    "webpack-cli": "^5.0.1"
   },
-  "dependencies": {}
-}
+  "packageManager": "yarn@4.2.2",
+  "dependencies": {
+    "classnames": "^2.3.2",
+    "dotenv": "^16.3.1"
+  }
+}

package/src/cohort-builder-admin-link.component.tsx

@@ -0,0 +1,27 @@
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { Layer, ClickableTile } from "@carbon/react";
+import { ArrowRight } from "@carbon/react/icons";
+
+const CohortBuilderAdminLink: React.FC = () => {
+  const { t } = useTranslation();
+  return (
+    <Layer>
+      <ClickableTile
+        href={`${window.spaBase}/cohort-builder`}
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        <div>
+          <div className="heading">{t("manageCohorts", "Manage Cohorts")}</div>
+          <div className="content">{t("cohortBuilder", "Cohort Builder")}</div>
+        </div>
+        <div className="iconWrapper">
+          <ArrowRight size={16} />
+        </div>
+      </ClickableTile>
+    </Layer>
+  );
+};
+
+export default CohortBuilderAdminLink;

package/src/cohort-builder.resources.ts

@@ -1,4 +1,8 @@
-import { openmrsFetch, FetchResponse } from "@openmrs/esm-framework";
+import {
+  openmrsFetch,
+  FetchResponse,
+  restBaseUrl,
+} from "@openmrs/esm-framework";
 import useSWRImmutable from "swr/immutable";
 
 import { Patient, SearchParams, DropdownValue, Response } from "./types";
@@ -13,7 +17,7 @@ interface SearchResults {
 
 export const search = async (searchParams: SearchParams) => {
   const searchResults: FetchResponse<SearchResults> = await openmrsFetch(
-    "/ws/rest/v1/reportingrest/adhocquery?v=full",
+    `${restBaseUrl}/reportingrest/adhocquery?v=full`,
     {
       method: "POST",
       headers: { "Content-Type": "application/json" },
@@ -29,7 +33,7 @@ export const search = async (searchParams: SearchParams) => {
 export const useLocations = () => {
   const { data, error } = useSWRImmutable<{
     data: { results: Response[] };
-  }>("/ws/rest/v1/location", openmrsFetch);
+  }>(`${restBaseUrl}/location`, openmrsFetch);
 
   const locations: DropdownValue[] = [];
   data?.data.results.map((location: Response, index: number) => {
@@ -49,7 +53,7 @@ export const useLocations = () => {
 
 export const getDataSet = async (queryID: string) => {
   const results: FetchResponse<SearchResults> = await openmrsFetch(
-    `/ws/rest/v1/reportingrest/dataSet/${queryID}`,
+    `${restBaseUrl}/reportingrest/dataSet/${queryID}`,
     {
       method: "GET",
     }
@@ -67,7 +71,7 @@ export const getDataSet = async (queryID: string) => {
 
 export const getCohortMembers = async (cohortId: string) => {
   const results: FetchResponse<SearchResults> = await openmrsFetch(
-    `/ws/rest/v1/cohort/${cohortId}/member?v=full`,
+    `${restBaseUrl}/cohort/${cohortId}/member?v=full`,
     {
       method: "GET",
     }

package/src/cohort-builder.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-
+import classNames from "classnames";
 import { Tab, Tabs, TabList, TabPanels, TabPanel } from "@carbon/react";
 import { showToast, useLayoutType } from "@openmrs/esm-framework";
 import { useTranslation } from "react-i18next";
@@ -169,12 +169,16 @@ const CohortBuilder: React.FC = () => {
 
   return (
     <div
-      className={`omrs-main-content ${styles.mainContainer} ${styles.cohortBuilder}`}
+      className={classNames(
+        "omrs-main-content",
+        styles.mainContainer,
+        styles.cohortBuilder
+      )}
     >
       <div
-        className={
+        className={classNames(
           isLayoutTablet ? styles.tabletContainer : styles.desktopContainer
-        }
+        )}
       >
         <p className={styles.title}>{t("cohortBuilder", "Cohort Builder")}</p>
         <div className={styles.tabContainer}>
@@ -183,9 +187,10 @@ const CohortBuilder: React.FC = () => {
           </p>
           <div className={styles.tab}>
             <Tabs
-              className={`${styles.verticalTabs} ${
-                isLayoutTablet ? styles.tabletTab : styles.desktopTab
-              }`}
+              className={classNames(styles.verticalTabs, {
+                [styles.tabletTab]: isLayoutTablet,
+                [styles.desktopTab]: !isLayoutTablet,
+              })}
             >
               <TabList aria-label="navigation">
                 {tabs.map((tab: TabItem, index: number) => (

package/src/components/empty-data/empty-data.component.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-import { Tile } from "@carbon/react";
+import { Layer, Tile } from "@carbon/react";
 import { EmptyDataIllustration } from "@openmrs/esm-patient-common-lib/src/empty-state/index";
 
 import styles from "./empty-data.style.scss";
@@ -11,12 +11,14 @@ export interface EmptyDataProps {
 
 const EmptyData: React.FC<EmptyDataProps> = (props) => {
   return (
-    <Tile className={styles.tile}>
-      <EmptyDataIllustration />
-      <p className={styles.content}>
-        There are no {props.displayText.toLowerCase()} to display
-      </p>
-    </Tile>
+    <Layer>
+      <Tile className={styles.tile}>
+        <EmptyDataIllustration />
+        <p className={styles.content}>
+          There are no {props.displayText.toLowerCase()} to display
+        </p>
+      </Tile>
+    </Layer>
   );
 };
 

package/src/components/empty-data/empty-data.style.scss

@@ -1,5 +1,4 @@
 @use '@carbon/styles/scss/spacing';
-// @use '@carbon/colors';
 @use '@carbon/styles/scss/type';
 @import '~@openmrs/esm-styleguide/src/vars';
 

package/src/components/saved-cohorts/saved-cohorts.component.tsx

@@ -131,7 +131,7 @@ const SavedCohorts: React.FC<SavedCohortsProps> = ({ onViewCohort }) => {
           totalItems={cohorts.length}
         />
       )}
-      {!cohorts.length && <EmptyData displayText="cohorts" />}
+      {!cohorts.length && <EmptyData displayText={t("cohorts", "cohorts")} />}
     </div>
   );
 };

package/src/components/saved-cohorts/saved-cohorts.resources.ts

@@ -1,4 +1,8 @@
-import { FetchResponse, openmrsFetch } from "@openmrs/esm-framework";
+import {
+  FetchResponse,
+  openmrsFetch,
+  restBaseUrl,
+} from "@openmrs/esm-framework";
 
 import { Cohort, DefinitionDataRow } from "../../types";
 
@@ -7,7 +11,7 @@ import { Cohort, DefinitionDataRow } from "../../types";
  */
 export async function getCohorts(): Promise<DefinitionDataRow[]> {
   const response: FetchResponse<{ results: Cohort[] }> = await openmrsFetch(
-    "/ws/rest/v1/cohort?v=full",
+    `${restBaseUrl}/cohort?v=full`,
     {
       method: "GET",
     }
@@ -30,7 +34,7 @@ export async function getCohorts(): Promise<DefinitionDataRow[]> {
 
 export const onDeleteCohort = async (cohort: string) => {
   const result: FetchResponse = await openmrsFetch(
-    `/ws/rest/v1/cohort/${cohort}`,
+    `${restBaseUrl}/cohort/${cohort}`,
     {
       method: "DELETE",
     }

package/src/components/saved-queries/saved-queries.component.tsx

@@ -131,7 +131,7 @@ const SavedQueries: React.FC<SavedQueriesProps> = ({ onViewQuery }) => {
           totalItems={queries.length}
         />
       )}
-      {!queries.length && <EmptyData displayText="queries" />}
+      {!queries.length && <EmptyData displayText={t("queries", "queries")} />}
     </div>
   );
 };

package/src/components/saved-queries/saved-queries.resources.ts

@@ -1,4 +1,8 @@
-import { FetchResponse, openmrsFetch } from "@openmrs/esm-framework";
+import {
+  FetchResponse,
+  openmrsFetch,
+  restBaseUrl,
+} from "@openmrs/esm-framework";
 
 import { Response, DefinitionDataRow } from "../../types";
 
@@ -7,7 +11,7 @@ import { Response, DefinitionDataRow } from "../../types";
  */
 export async function getQueries(): Promise<DefinitionDataRow[]> {
   const response: FetchResponse<{ results: Response[] }> = await openmrsFetch(
-    "/ws/rest/v1/reportingrest/dataSetDefinition?v=full",
+    `${restBaseUrl}/reportingrest/dataSetDefinition?v=full`,
     {
       method: "GET",
     }
@@ -30,7 +34,7 @@ export async function getQueries(): Promise<DefinitionDataRow[]> {
 
 export const deleteDataSet = async (queryID: string) => {
   const dataset: FetchResponse = await openmrsFetch(
-    `/ws/rest/v1/reportingrest/adhocdataset/${queryID}?purge=true`,
+    `${restBaseUrl}/reportingrest/adhocdataset/${queryID}?purge=true`,
     {
       method: "DELETE",
     }

package/src/components/search-by-concepts/search-concept/search-concept.resource.ts

@@ -1,4 +1,8 @@
-import { FetchResponse, openmrsFetch } from "@openmrs/esm-framework";
+import {
+  FetchResponse,
+  openmrsFetch,
+  restBaseUrl,
+} from "@openmrs/esm-framework";
 
 import { Concept, DataType } from "../../../types";
 
@@ -22,7 +26,7 @@ interface Description {
  */
 export async function getConcepts(conceptName: String): Promise<Concept[]> {
   const searchResult: FetchResponse<{ results: ConceptResponse[] }> =
-    await openmrsFetch(`/ws/rest/v1/concept?v=full&q=${conceptName}`, {
+    await openmrsFetch(`${restBaseUrl}/concept?v=full&q=${conceptName}`, {
       method: "GET",
     });
 

package/src/components/search-by-demographics/search-by-demographics.component.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-
+import classNames from "classnames";
 import {
   DatePicker,
   DatePickerInput,
@@ -84,7 +84,7 @@ const SearchByDemographics: React.FC<SearchByProps> = ({ onSubmit }) => {
   return (
     <>
       <Column>
-        <p className={`${styles.text} ${styles.genderTitle}`}>
+        <p className={classNames(styles.text, styles.genderTitle)}>
           {t("gender", "Gender")}
         </p>
         <div className={styles.genderContainer}>

package/src/components/search-by-demographics/search-by-demographics.style.scss

@@ -1,9 +1,8 @@
+@use '@carbon/styles/scss/spacing';
 @import "~@openmrs/esm-styleguide/src/vars";
-@import "~carbon-components/src/globals/scss/vars";
-@import "~carbon-components/src/globals/scss/mixins";
 
 .contentSwitcher {
-  height: $spacing-08;
+  height: spacing.$spacing-08;
 }
 
 .column {

package/src/components/search-by-drug-orders/search-by-drug-orders.resources.ts

@@ -1,6 +1,6 @@
 import { useMemo } from "react";
 
-import { openmrsFetch } from "@openmrs/esm-framework";
+import { openmrsFetch, restBaseUrl } from "@openmrs/esm-framework";
 import useSWRImmutable from "swr/immutable";
 
 import { DropdownValue, Response } from "../../types";
@@ -11,7 +11,7 @@ import { DropdownValue, Response } from "../../types";
 export function useDrugs() {
   const { data, error } = useSWRImmutable<{
     data: { results: Response[] };
-  }>("/ws/rest/v1/drug", openmrsFetch);
+  }>(`${restBaseUrl}/drug`, openmrsFetch);
 
   const results = useMemo(() => {
     const drugs: DropdownValue[] = [];
@@ -38,7 +38,7 @@ export function useDrugs() {
 export function useCareSettings() {
   const { data, error } = useSWRImmutable<{
     data: { results: Response[] };
-  }>("/ws/rest/v1/caresetting", openmrsFetch);
+  }>(`${restBaseUrl}/caresetting`, openmrsFetch);
 
   const results = useMemo(() => {
     const careSettings: DropdownValue[] = [];

package/src/components/search-by-encounters/search-by-encounters.resources.ts

@@ -1,4 +1,4 @@
-import { openmrsFetch } from "@openmrs/esm-framework";
+import { openmrsFetch, restBaseUrl } from "@openmrs/esm-framework";
 import useSWRImmutable from "swr/immutable";
 
 import { DropdownValue, Response } from "../../types";
@@ -9,7 +9,7 @@ import { DropdownValue, Response } from "../../types";
 export const useForms = () => {
   const { data, error } = useSWRImmutable<{
     data: { results: Response[] };
-  }>("/ws/rest/v1/form", openmrsFetch);
+  }>(`${restBaseUrl}/form`, openmrsFetch);
 
   const forms: DropdownValue[] = [];
   data?.data.results.map((form: Response, index: number) => {
@@ -33,7 +33,7 @@ export const useForms = () => {
 export const useEncounterTypes = () => {
   const { data, error } = useSWRImmutable<{
     data: { results: Response[] };
-  }>("/ws/rest/v1/encountertype", openmrsFetch);
+  }>(`${restBaseUrl}/encountertype`, openmrsFetch);
 
   const encounterTypes: DropdownValue[] = [];
   data?.data.results.map((encounterType: Response, index: number) => {

package/src/components/search-by-enrollments/search-by-enrollments.resources.ts

@@ -1,4 +1,4 @@
-import { openmrsFetch } from "@openmrs/esm-framework";
+import { openmrsFetch, restBaseUrl } from "@openmrs/esm-framework";
 import useSWRImmutable from "swr/immutable";
 
 import { DropdownValue, Response } from "../../types";
@@ -13,7 +13,7 @@ interface ProgramsResponse extends Response {
 export function usePrograms() {
   const { data, error } = useSWRImmutable<{
     data: { results: ProgramsResponse[] };
-  }>("/ws/rest/v1/program", openmrsFetch);
+  }>(`${restBaseUrl}/program`, openmrsFetch);
 
   const programs: DropdownValue[] = [];
   data?.data.results.map((program: ProgramsResponse, index: number) => {

package/src/components/search-by-person-attributes/search-by-person-attributes.resource.ts

@@ -1,4 +1,4 @@
-import { openmrsFetch } from "@openmrs/esm-framework";
+import { openmrsFetch, restBaseUrl } from "@openmrs/esm-framework";
 import useSWRImmutable from "swr/immutable";
 
 import { DropdownValue, Response } from "../../types";
@@ -9,7 +9,7 @@ import { DropdownValue, Response } from "../../types";
 export function usePersonAttributes() {
   const { data, error } = useSWRImmutable<{
     data: { results: Response[] };
-  }>("/ws/rest/v1/personattributetype", openmrsFetch);
+  }>(`${restBaseUrl}/personattributetype`, openmrsFetch);
 
   const personAttributes: DropdownValue[] = [];
   data?.data.results.map((personAttribute: Response, index: number) => {

package/src/components/search-history/search-history-options/search-history-options.resources.ts

@@ -1,4 +1,8 @@
-import { FetchResponse, openmrsFetch } from "@openmrs/esm-framework";
+import {
+  FetchResponse,
+  openmrsFetch,
+  restBaseUrl,
+} from "@openmrs/esm-framework";
 
 import { Cohort, Query } from "../../../types";
 
@@ -9,7 +13,7 @@ import { Cohort, Query } from "../../../types";
 export async function createCohort(
   cohort: Cohort
 ): Promise<FetchResponse<Cohort>> {
-  return await openmrsFetch("/ws/rest/v1/cohort", {
+  return await openmrsFetch(`${restBaseUrl}/cohort`, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
     body: cohort,
@@ -21,7 +25,7 @@ export async function createCohort(
  * @param query
  */
 export async function createQuery(query: Query): Promise<FetchResponse<Query>> {
-  return await openmrsFetch("/ws/rest/v1/reportingrest/adhocdataset", {
+  return await openmrsFetch(`${restBaseUrl}/reportingrest/adhocdataset`, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
     body: query,

package/src/components/search-history/search-history.component.tsx

@@ -146,7 +146,7 @@ const SearchHistory: React.FC<SearchHistoryProps> = ({
           totalItems={searchResults.length}
         />
       )}
-      {!searchResults.length && <EmptyData displayText="history" />}
+      {!searchResults.length && <EmptyData displayText={t("data", "data")} />}
       <ComposedModal
         size={"sm"}
         open={isClearHistoryModalVisible}

package/src/components/search-history/search-history.test.tsx

@@ -86,7 +86,7 @@ describe("Test the search history component", () => {
     );
 
     expect(
-      screen.getByText("There are no history to display")
+      screen.getByText("There are no data to display")
     ).toBeInTheDocument();
   });
 

package/src/components/search-results-table/search-results-table.component.tsx

@@ -97,7 +97,7 @@ const SearchResultsTable: React.FC<SearchResultsTableProps> = ({
           totalItems={patients.length}
         />
       )}
-      {!patients.length && <EmptyData displayText="data" />}
+      {!patients.length && <EmptyData displayText={t("data", "data")} />}
     </div>
   );
 };

package/src/index.ts

@@ -1,36 +1,27 @@
-import { getAsyncLifecycle } from "@openmrs/esm-framework";
+import { getSyncLifecycle } from "@openmrs/esm-framework";
 
-const importTranslation = require.context(
+import cohortBuilderComponent from "./cohort-builder";
+import cohortBuilderAdminPageCardLinkComponent from "./cohort-builder-admin-link.component";
+
+const moduleName = "@openmrs/esm-cohort-builder";
+
+const options = {
+  featureName: "cohort-builder",
+  moduleName,
+};
+
+export const importTranslation = require.context(
   "../translations",
   false,
   /.json$/,
   "lazy"
 );
 
-const backendDependencies = {
-  fhir2: "^1.2.0",
-  "webservices.rest": "^2.2.0",
-  reportingrest: "^1.0.0",
-  reporting: "^1.0.0",
-};
-
-function setupOpenMRS() {
-  const moduleName = "@openmrs/esm-cohort-builder";
+export function startupApp() {}
 
-  const options = {
-    featureName: "cohort-builder",
-    moduleName,
-  };
+export const cohortBuilder = getSyncLifecycle(cohortBuilderComponent, options);
 
-  return {
-    pages: [
-      {
-        load: getAsyncLifecycle(() => import("./cohort-builder"), options),
-        route: "cohort-builder",
-      },
-    ],
-    extensions: [],
-  };
-}
-
-export { backendDependencies, importTranslation, setupOpenMRS };
+export const cohortBuilderAdminPageCardLink = getSyncLifecycle(
+  cohortBuilderAdminPageCardLinkComponent,
+  options
+);

package/src/routes.json

@@ -0,0 +1,26 @@
+{
+  "$schema": "https://json.openmrs.org/routes.schema.json",
+  "backendDependencies": {
+    "fhir2": ">=1.2",
+    "webservices.rest": "^2.2.0",
+    "reportingrest": "^1.0.0",
+    "reporting": "^1.0.0"
+  },
+  "pages": [
+    {
+      "component": "cohortBuilder",
+      "route": "cohort-builder",
+      "online": true,
+      "offline": true
+    }
+  ],
+  "extensions": [
+    {
+      "name": "system-administration-cohort-builder-card-link",
+      "slot": "system-admin-page-card-link-slot",
+      "component": "cohortBuilderAdminPageCardLink",
+      "online": true,
+      "offline": true
+    }
+  ]
+}

package/.editorconfig

@@ -1,12 +0,0 @@
-root = true
-
-[*]
-indent_style = space
-indent_size = 2
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-end_of_line = lf
-
-[*.md]
-trim_trailing_whitespace = false

package/.eslintignore

@@ -1 +0,0 @@
-**/*.d.tsx

package/.eslintrc

@@ -1,28 +0,0 @@
-{
-  "parser": "@typescript-eslint/parser",
-  "plugins": ["@typescript-eslint", "import", "unused-imports"],
-  "rules": {
-    "unused-imports/no-unused-imports": "error",
-    "react-hooks/exhaustive-deps": 0,
-    "import/order":[
-      "error",
-      {
-        "groups": ["builtin", "external", "internal"],
-        "pathGroups":[{
-          "pattern": "react",
-          "group": "external",
-          "position": "before"
-        }],
-        "pathGroupsExcludedImportTypes": ["react"],
-        "newlines-between": "always",
-        "alphabetize": {
-          "order": "asc",
-          "caseInsensitive":true
-        }
-      }
-    ],
-    "@typescript-eslint/no-explicit-any":  "error",
-    "@typescript-eslint/no-unused-vars":  "error"
-  },
-  "extends": ["ts-react-important-stuff", "plugin:prettier/recommended"]
-}

package/.github/workflows/codeql-analysis.yml

@@ -1,72 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ "main" ]
-  schedule:
-    - cron: '17 9 * * 5'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'javascript' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
-        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        
-        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-        # queries: security-extended,security-and-quality
-
-        
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-
-    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
-    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
-
-    # - run: |
-    #   echo "Run, Build Application using script"
-    #   ./location_of_script_within_repo/buildscript.sh
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2

package/.github/workflows/node.js.yml

@@ -1,95 +0,0 @@
-name: Node.js CI
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-  release:
-    types:
-      - created
-
-env:
-  ESM_NAME: "@openmrs/esm-cohort-builder-app"
-  JS_NAME: "openmrs-esm-cohort-builder-app.js"
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js
-        uses: actions/setup-node@v1
-        with:
-          node-version: "16.x"
-      - run: yarn
-      - run: yarn lint
-      - run: yarn coverage
-      - run: yarn typescript
-      - run: yarn build
-      - name: Upload Artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: dist
-          path: |
-            dist
-
-  pre_release:
-    runs-on: ubuntu-latest
-
-    needs: build
-
-    if: ${{ github.event_name == 'push' }}
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Download Artifacts
-        uses: actions/download-artifact@v2
-      - name: Use Node.js
-        uses: actions/setup-node@v1
-        with:
-          node-version: "18"
-          registry-url: "https://registry.npmjs.org"
-      - run: yarn install --immuatable
-      - run: yarn version --new-version "$(node -e "console.log(require('semver').inc(require('./package.json').version, 'patch'))")-pre.${{ github.run_number }}" --no-git-tag-version
-      - run: yarn build
-      - run: yarn publish --access public --tag next
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
-
-  release:
-    runs-on: ubuntu-latest
-
-    needs: build
-
-    if: ${{ github.event_name == 'release' }}
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Download Artifacts
-        uses: actions/download-artifact@v2
-      - name: Use Node.js
-        uses: actions/setup-node@v1
-        with:
-          node-version: "16.x"
-          registry-url: 'https://registry.npmjs.org'
-      - run: yarn
-      - run: yarn publish --access public
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
-
-  deploy:
-    runs-on: ubuntu-latest
-
-    needs: pre_release
-
-    if: ${{ github.event_name == 'push' }}
-
-    steps:
-      - name: Trigger RefApp Build
-        uses: fjogeleit/http-request-action@master
-        with:
-          url: https://ci.openmrs.org/rest/api/latest/queue/REFAPP-D3X
-          method: "POST"
-          customHeaders: '{ "Authorization": "Bearer ${{ secrets.BAMBOO_TOKEN }}" }'

package/.husky/pre-commit

@@ -1,6 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-set -e  # die on error
-
-npx pretty-quick --staged

package/.husky/pre-push

@@ -1,6 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-set -e  # die on error
-
-yarn verify

package/.prettierignore

@@ -1,14 +0,0 @@
-# directories
-.husky/
-dist/
-node_modules/
-
-# dotfiles and generated
-.*
-yarn.lock
-
-# by file type
-**/*.css
-**/*.scss
-**/*.md
-**/*.json

package/__mocks__/react-i18next.js

@@ -1,57 +0,0 @@
-/** At present, this entire mock is boilerplate. */
-
-const React = require("react");
-
-const reactI18next = require("react-i18next");
-
-const hasChildren = (node) =>
-  node && (node.children || (node.props && node.props.children));
-
-const getChildren = (node) =>
-  node && node.children ? node.children : node.props && node.props.children;
-
-const renderNodes = (reactNodes) => {
-  if (typeof reactNodes === "string") {
-    return reactNodes;
-  }
-
-  return Object.keys(reactNodes).map((key, i) => {
-    const child = reactNodes[key];
-    const isElement = React.isValidElement(child);
-
-    if (typeof child === "string") {
-      return child;
-    }
-    if (hasChildren(child)) {
-      const inner = renderNodes(getChildren(child));
-      return React.cloneElement(child, { ...child.props, key: i }, inner);
-    }
-    if (typeof child === "object" && !isElement) {
-      return Object.keys(child).reduce(
-        (str, childKey) => `${str}${child[childKey]}`,
-        ""
-      );
-    }
-
-    return child;
-  });
-};
-
-const useMock = [(k) => k, {}];
-useMock.t = (k, o) => (o && o.defaultValue) || (typeof o === "string" ? o : k);
-useMock.i18n = {};
-
-module.exports = {
-  // this mock makes sure any components using the translate HoC receive the t function as a prop
-  Trans: ({ children }) => renderNodes(children),
-  Translation: ({ children }) => children((k) => k, { i18n: {} }),
-  useTranslation: () => useMock,
-
-  // mock if needed
-  I18nextProvider: reactI18next.I18nextProvider,
-  initReactI18next: reactI18next.initReactI18next,
-  setDefaults: reactI18next.setDefaults,
-  getDefaults: reactI18next.getDefaults,
-  setI18n: reactI18next.setI18n,
-  getI18n: reactI18next.getI18n,
-};

package/jest.config.json

@@ -1,21 +0,0 @@
-
-
-{
-  "transform": {
-    "^.+\\.tsx?$": "@swc/jest"
-  },
-  "transformIgnorePatterns": ["/node_modules/(?!@openmrs)"],
-  "moduleNameMapper": {
-    "\\.(s?css)$": "identity-obj-proxy",
-    "@openmrs/esm-framework": "@openmrs/esm-framework/mock",
-    "^lodash-es/(.*)$": "lodash/$1",
-    "^uuid$": "<rootDir>/node_modules/uuid/dist/index.js"
-  },
-  "setupFilesAfterEnv": [
-    "<rootDir>/src/setup-tests.ts"
-  ],
-  "testEnvironment": "jsdom",
-  "testEnvironmentOptions": {
-    "url": "http://localhost/"
-  }
-}

package/translations/en.json

@@ -1,119 +0,0 @@
-{
-  "searchResults": "Search Results",
-  "searchHistory": "Search History",
-  "clearHistory": "Clear Search History",
-  "concepts": "Concepts",
-  "demographics": "Demographics",
-  "encounters": "Encounters",
-  "enrollments": "Enrollments",
-  "drugOrder": "Drug Order",
-  "composition":  "Composition",
-  "savedDefinitions": "Saved Definitions",
-  "reset": "Reset",
-  "search": "Search",
-  "loading": "Loading",
-  "dateRange": "Date Range",
-  "searchByConcepts": "Search By Concepts",
-  "whatObservations": "What observations",
-  "whatValues": "What values",
-  "lastDays": "and / or days",
-  "previousPage": "Previous page",
-  "nextPage": "Next page",
-  "itemsPerPage:": "Items per page:",
-  "clearSearch": "Clear search",
-  "searchConcepts": "Search Concepts",
-  "noSearchItems": "There are no search items",
-  "whoseAnswer": "Patients with observations whose answer is ",
-  "name": "Name",
-  "age": "Age",
-  "ageBetween": "Age between",
-  "gender": "Gender",
-  "openmrsId": "OpenMRS ID",
-  "numberIsNotValid": "Number is not valid",
-  "startDate": "Start date",
-  "endDate": "End date",
-  "query": "Query",
-  "results": "Results",
-  "haveObservations": "Patients who have these observations",
-  "haveNoObservations": "Patients who do not have these observations",
-  "any": "Any",
-  "none": "None",
-  "earliest": "Earliest",
-  "recent": "Most Recent",
-  "lowest": "Lowest",
-  "highest": "Highest",
-  "average": "Average",
-  "withinTheLast": "Within the last",
-  "valueIn": "Enter a value in ",
-  "searchItemDeleteError": "Error deleting the search item",
-  "cohortCreateSuccess": "Successfully created the cohort",
-  "cohortCreateError": "Error creating the cohort",
-  "delete": "Delete",
-  "deleteFromHistory": "Delete from history",
-  "save": "Save",
-  "view": "View",
-  "clear": "Clear",
-  "cancel": "Cancel",
-  "saveCohort": "Save Cohort",
-  "saveQuery": "Save Query",
-  "downloadResults": "Download Results",
-  "saveName": "Enter a name",
-  "saveDescription": "Enter a description",
-  "clearHistoryMsg": "Are you sure you want to clear the search history?",
-  "deleteHistoryItem": "Are you sure you want to delete {{searchItemName}} from the search history?",
-  "searchIsCompleted": "Search is completed with {{numOfResults}} result(s)",
-  "cohortBuilder": "Cohort Builder",
-  "searchCriteria": "Search Criteria",
-  "all": "All",
-  "males": "Male",
-  "females": "Female",
-  "dead": "Dead",
-  "alive": "Alive",
-  "minAgeIsNotValid": "The age must be greater than 0",
-  "maxAgeIsNotValid": "The age must be less than 200",
-  "between": "Between",
-  "and": "and",
-  "birthDate": "Birth date",
-  "selectedAttributeValues": "Enter Comma Delimited Values",
-  "selectAttribute": "Select a person attribute",
-  "location": "Location",
-  "personAttributes": "Person Attributes",
-  "selectEncounterTypes": "Select encounter types",
-  "selectForms": "Select forms",
-  "selectLocations": "Select locations",
-  "atLeast": "at least many",
-  "upto": "upto this many",
-  "from": "From",
-  "to": "to",
-  "anyEncounter": "Any Encounter",
-  "mostRecentEncounter": "Most Recent Encounter",
-  "earliestEncounter": "Earliest Encounter",
-  "selectMethod": "Select a method",
-  "selectPrograms": "Select programs",
-  "enrolledBetween": "Enrolled between",
-  "completedBetween": "Completed between",
-  "success": "Success",
-  "cohortIsDeleted": "the cohort is deleted",
-  "queryIsDeleted": "the query is deleted",
-  "querySavingError": "Error saving the query",
-  "cohortViewError": "Error viewing the cohort",
-  "cohortDeleteError": "Error deleting the cohort",
-  "queryDeleteError": "Error deleting the query",
-  "deleteItem": "Are you sure you want to delete {{itemName}}?",
-  "id": "id",
-  "searchCohorts": "Search Cohorts",
-  "searchCompleted": "Search is completed",
-  "savedCohortDescription": "You can only search for Cohort Definitions that you have saved using a Name.",
-  "savedQueryDescription": "You can only search for Query Definitions that you have saved using a Name.",
-  "somethingWentWrong": "Something went wrong",
-  "selectDrugs": "Select drugs",
-  "selectCareSettings": "Select a care setting",
-  "using": "Using between",
-  "used": "Used between",
-  "searchQueries": "Search Queries",
-  "description": "Description",
-  "compositionExplanationOne": "This query combines multiple cohorts using the logical operators:- AND,OR and NOT.",
-  "compositionExplanationTwo": "To use this query you need to already have query results in your search history. Those existing query results can then be combined to yield the results of the composition query.",
-  "compositionExplanationThree": "Example: if the search history #1 is a cohort of patients who are males, and if the search history #2 is a cohort of patients with ages between 23 and 35 years; then '1 AND 2' will result in a cohort of patients who are males with ages between 23 and 35 years.",
-  "invalidComposition": "Composition is not valid"
-}

package/tsconfig.json

@@ -1,23 +0,0 @@
-{
-  "compilerOptions": {
-    "esModuleInterop": true,
-    "module": "esnext",
-    "allowSyntheticDefaultImports": true,
-    "jsx": "react",
-    "skipLibCheck": true,
-    "moduleResolution": "node",
-    "lib": [
-      "dom",
-      "es5",
-      "scripthost",
-      "es2015",
-      "es2015.promise",
-      "es2016.array.include",
-      "es2018",
-      "es2020"
-    ],
-    "resolveJsonModule": true,
-    "noEmit": true,
-    "target": "esnext"
-  }
-}

package/webpack.config.js

@@ -1,4 +0,0 @@
-const config = (module.exports = require("openmrs/default-webpack-config"));
-config.scriptRuleConfig.exclude =
-  /(node_modules(?![/\\]@openmrs\/esm-patient-common-lib))/;
-module.exports = config;