Skip to content

Commit 41ce27a

Browse files
authored
Revert "feat: O3-310: Add an application-writable config.json file in frontends/ (#629)" (#864)
This reverts commit f52c335.
1 parent f52c335 commit 41ce27a

File tree

11 files changed

+2
-103
lines changed

11 files changed

+2
-103
lines changed

packages/apps/esm-implementer-tools-app/src/backend-dependencies/openmrs-backend-dependencies.ts

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { isVersionSatisfied, openmrsFetch } from '@openmrs/esm-framework';
22
import difference from 'lodash-es/difference';
3-
import { useMemo, useState } from 'react';
43

54
export type ResolvedBackendModuleType = 'missing' | 'version-mismatch' | 'okay';
65

@@ -156,21 +155,3 @@ export async function checkModules(): Promise<Array<ResolvedDependenciesModule>>
156155
export function hasInvalidDependencies(frontendModules: Array<ResolvedDependenciesModule>) {
157156
return frontendModules.some((m) => m.dependencies.some((n) => n.type !== 'okay'));
158157
}
159-
160-
export function useBackendDependencyCheck(moduleName: string) {
161-
const [backendDependencies, setBackendDependencies] = useState<Array<BackendModule>>([]);
162-
163-
useMemo(async () => {
164-
const dependencies = await initInstalledBackendModules();
165-
setBackendDependencies(dependencies);
166-
}, []);
167-
168-
const isPresent = useMemo(() => {
169-
if (backendDependencies) {
170-
return backendDependencies.some((module) => module.uuid === moduleName);
171-
}
172-
return false;
173-
}, [backendDependencies, moduleName]);
174-
175-
return isPresent;
176-
}

packages/apps/esm-implementer-tools-app/src/configuration/configuration.component.tsx

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
import React, { useMemo, useState } from 'react';
22
import { Button, Column, FlexGrid, Row, TextInput, Toggle } from '@carbon/react';
33
import { useTranslation } from 'react-i18next';
4-
import { ChevronDown, ChevronUp, Download, TrashCan, Upload } from '@carbon/react/icons';
4+
import { ChevronDown, ChevronUp, Download, TrashCan } from '@carbon/react/icons';
55
import cloneDeep from 'lodash-es/cloneDeep';
66
import isEmpty from 'lodash-es/isEmpty';
77
import type { Config } from '@openmrs/esm-framework/src/internal';
88
import {
99
getExtensionInternalStore,
1010
implementerToolsConfigStore,
11-
navigate,
12-
showNotification,
13-
showToast,
1411
temporaryConfigStore,
1512
useStore,
1613
useStoreWithActions,
@@ -20,8 +17,6 @@ import { Description } from './interactive-editor/description.component';
2017
import type { ImplementerToolsStore } from '../store';
2118
import { implementerToolsStore } from '../store';
2219
import styles from './configuration.styles.scss';
23-
import { saveConfig } from './configuration.resource';
24-
import { useBackendDependencyCheck } from '../backend-dependencies/openmrs-backend-dependencies';
2520

2621
const JsonEditor = React.lazy(() => import('./json-editor/json-editor.component'));
2722

@@ -67,7 +62,6 @@ export interface ConfigurationProps {}
6762

6863
export const Configuration: React.FC<ConfigurationProps> = () => {
6964
const { t } = useTranslation();
70-
const isSpaModulePresent = useBackendDependencyCheck('spa');
7165
const {
7266
isUIEditorEnabled,
7367
toggleIsUIEditorEnabled,
@@ -164,43 +158,6 @@ export const Configuration: React.FC<ConfigurationProps> = () => {
164158
>
165159
{t('clearConfig', 'Clear Local Config')}
166160
</Button>
167-
{isSpaModulePresent ? (
168-
<Button
169-
kind="primary"
170-
iconDescription="Publish config to server"
171-
renderIcon={(props) => <Upload size={16} {...props} />}
172-
onClick={() => {
173-
saveConfig(tempConfig).then(
174-
(response) => {
175-
if (response.ok && !response.redirected) {
176-
temporaryConfigStore.setState({ config: {} });
177-
showToast({
178-
critical: true,
179-
title: t('savedConfiguration', 'Configuration published'),
180-
kind: 'success',
181-
description: t(
182-
'successfullySavedConfiguration',
183-
'Configuration has been pusblished to the server. It is now live for all users. Your local configuration overrides have been cleared.',
184-
),
185-
});
186-
} else if (response.ok && response.redirected) {
187-
navigate({ to: response.url });
188-
}
189-
},
190-
(error) => {
191-
showNotification({
192-
title: t('errorSavingConfiguration', 'Error saving configuration'),
193-
kind: 'error',
194-
critical: true,
195-
description: error?.message,
196-
});
197-
},
198-
);
199-
}}
200-
>
201-
{t('publishConfig', 'Publish Config')}
202-
</Button>
203-
) : null}
204161
<Button
205162
kind="secondary"
206163
iconDescription="Download config"

packages/apps/esm-implementer-tools-app/src/configuration/configuration.resource.tsx

Lines changed: 0 additions & 11 deletions
This file was deleted.

packages/apps/esm-implementer-tools-app/src/popup/popup.styles.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
bottom: 0;
66
left: 0;
77
width: 100%;
8-
z-index: 99000;
8+
z-index: 100000;
99
background-color: $ui-03;
1010
border-top: 2px solid $ui-05;
1111
color: $color-gray-100;

packages/apps/esm-implementer-tools-app/translations/am.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"edit": "Edit",
1010
"editValueButtonText": "Edit",
1111
"enabled": "Enabled",
12-
"errorSavingConfiguration": "Error saving configuration",
1312
"extensions": "Extensions",
1413
"featureFlag": "Feature Flag",
1514
"featureFlags": "Feature Flags",
@@ -20,11 +19,8 @@
2019
"missing": "Missing",
2120
"moduleName": "Module Name",
2221
"modulesWithMissingDependenciesWarning": "Some modules have unresolved backend dependencies",
23-
"publishConfig": "Publish Config",
2422
"requiredVersion": "Required Version",
2523
"resetToDefaultValueButtonText": "Reset to default",
26-
"savedConfiguration": "Configuration published",
27-
"successfullySavedConfiguration": "Configuration has been pusblished to the server. It is now live for all users. Your local configuration overrides have been cleared.",
2824
"uiEditor": "UI Editor",
2925
"unknownVersion": "unknown",
3026
"value": "Value",

packages/apps/esm-implementer-tools-app/translations/ar.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"edit": "تعديل",
1010
"editValueButtonText": "تعديل",
1111
"enabled": "مفعل",
12-
"errorSavingConfiguration": "Error saving configuration",
1312
"extensions": "الملحقات",
1413
"featureFlag": "علامة الميزة",
1514
"featureFlags": "علامات الميزة",
@@ -20,11 +19,8 @@
2019
"missing": "مفقود",
2120
"moduleName": "اسم الوحدة",
2221
"modulesWithMissingDependenciesWarning": "بعض الوحدات لديها اعتمادات خلفية غير محلولة",
23-
"publishConfig": "Publish Config",
2422
"requiredVersion": "الإصدار المطلوب",
2523
"resetToDefaultValueButtonText": "إعادة تعيين إلى القيمة الافتراضية",
26-
"savedConfiguration": "Configuration published",
27-
"successfullySavedConfiguration": "Configuration has been pusblished to the server. It is now live for all users. Your local configuration overrides have been cleared.",
2824
"uiEditor": "محرر الواجهة",
2925
"unknownVersion": "غير معروف",
3026
"value": "قيمة",

packages/apps/esm-implementer-tools-app/translations/en.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"edit": "Edit",
1010
"editValueButtonText": "Edit",
1111
"enabled": "Enabled",
12-
"errorSavingConfiguration": "Error saving configuration",
1312
"extensions": "Extensions",
1413
"featureFlag": "Feature Flag",
1514
"featureFlags": "Feature Flags",
@@ -20,11 +19,8 @@
2019
"missing": "Missing",
2120
"moduleName": "Module Name",
2221
"modulesWithMissingDependenciesWarning": "Some modules have unresolved backend dependencies",
23-
"publishConfig": "Publish Config",
2422
"requiredVersion": "Required Version",
2523
"resetToDefaultValueButtonText": "Reset to default",
26-
"savedConfiguration": "Saved configuration",
27-
"successfullySavedConfiguration": "Successfully saved configuration",
2824
"uiEditor": "UI Editor",
2925
"unknownVersion": "unknown",
3026
"value": "Value",

packages/apps/esm-implementer-tools-app/translations/es.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"edit": "Editar",
1010
"editValueButtonText": "Editar",
1111
"enabled": "Habilitado",
12-
"errorSavingConfiguration": "Error saving configuration",
1312
"extensions": "Extensiones",
1413
"featureFlag": "Feature Flag",
1514
"featureFlags": "Feature Flags",
@@ -20,11 +19,8 @@
2019
"missing": "Falta",
2120
"moduleName": "Nombre de modulo",
2221
"modulesWithMissingDependenciesWarning": "Some modules have unresolved backend dependencies",
23-
"publishConfig": "Publish Config",
2422
"requiredVersion": "Versión requerida",
2523
"resetToDefaultValueButtonText": "Volver al valor predeterminado",
26-
"savedConfiguration": "Configuration published",
27-
"successfullySavedConfiguration": "Configuration has been pusblished to the server. It is now live for all users. Your local configuration overrides have been cleared.",
2824
"uiEditor": "Editór visual",
2925
"unknownVersion": "desconocida",
3026
"value": "Valor",

packages/apps/esm-implementer-tools-app/translations/fr.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"edit": "Edit",
1010
"editValueButtonText": "Edit",
1111
"enabled": "Enabled",
12-
"errorSavingConfiguration": "Error saving configuration",
1312
"extensions": "Extensions",
1413
"featureFlag": "Feature Flag",
1514
"featureFlags": "Feature Flags",
@@ -20,11 +19,8 @@
2019
"missing": "Missing",
2120
"moduleName": "Module Name",
2221
"modulesWithMissingDependenciesWarning": "Some modules have unresolved backend dependencies",
23-
"publishConfig": "Publish Config",
2422
"requiredVersion": "Required Version",
2523
"resetToDefaultValueButtonText": "Reset to default",
26-
"savedConfiguration": "Configuration published",
27-
"successfullySavedConfiguration": "Configuration has been pusblished to the server. It is now live for all users. Your local configuration overrides have been cleared.",
2824
"uiEditor": "UI Editor",
2925
"unknownVersion": "unknown",
3026
"value": "Value",

packages/apps/esm-implementer-tools-app/translations/he.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"edit": "ערוך",
1010
"editValueButtonText": "ערוך",
1111
"enabled": "Enabled",
12-
"errorSavingConfiguration": "Error saving configuration",
1312
"extensions": "Extensions",
1413
"featureFlag": "Feature Flag",
1514
"featureFlags": "Feature Flags",
@@ -20,11 +19,8 @@
2019
"missing": "חסר",
2120
"moduleName": "שם המודול",
2221
"modulesWithMissingDependenciesWarning": "Some modules have unresolved backend dependencies",
23-
"publishConfig": "Publish Config",
2422
"requiredVersion": "גרסה נדרשת",
2523
"resetToDefaultValueButtonText": "איפוס לברירת מחדל",
26-
"savedConfiguration": "Configuration published",
27-
"successfullySavedConfiguration": "Configuration has been pusblished to the server. It is now live for all users. Your local configuration overrides have been cleared.",
2824
"uiEditor": "עורך ממשק משתמש",
2925
"unknownVersion": "לא ידוע",
3026
"value": "ערך",

0 commit comments

Comments
 (0)