Merge branch 'release/2.18.0'

* release/2.18.0: bump version feat: add function to set namespaces chore: update listId chore: spare remaining references to feedback-tool chore: update i18n chore: update i18n chore: delete property chore: update i18n chore: update appconfig chore: install feedback-component chore: spare code related to feedback-tool fix. conflict error executing migrations because shortName is required - In 2.40 shortName is required in post constant endpoint
EyeSeeTea · May 28, 2024 · f99317b · f99317b
2 parents d28c1ac + f477899
commit f99317b
Show file tree

Hide file tree

Showing 19 changed files with 1,271 additions and 178 deletions.
diff --git a/i18n/en.pot b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-04-16T06:03:13.568Z\n"
-"PO-Revision-Date: 2024-04-16T06:03:13.568Z\n"
+"POT-Creation-Date: 2024-05-08T09:54:22.766Z\n"
+"PO-Revision-Date: 2024-05-08T09:54:22.767Z\n"
 
 msgid ""
 "THIS NEW RELEASE INCLUDES SHARING SETTINGS PER INSTANCES. FOR THIS VERSION "

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "metadata-synchronization",
     "description": "Advanced metadata & data synchronization utility",
-    "version": "2.17.1",
+    "version": "2.18.1",
     "license": "GPL-3.0",
     "author": "EyeSeeTea team",
     "homepage": ".",
@@ -11,14 +11,15 @@
     },
     "dependencies": {
         "@dhis2/app-runtime": "3.2.3",
-        "@dhis2/d2-i18n": "1.1.0",
         "@dhis2/d2-i18n-extract": "1.0.8",
         "@dhis2/d2-i18n-generate": "1.2.0",
+        "@dhis2/d2-i18n": "1.1.0",
         "@dhis2/d2-ui-core": "7.3.3",
         "@dhis2/d2-ui-forms": "7.3.3",
         "@dhis2/ui": "7.4.1",
         "@eyeseetea/d2-api": "1.13.1",
         "@eyeseetea/d2-ui-components": "2.6.8",
+        "@eyeseetea/feedback-component": "0.1.2",
         "@material-ui/core": "4.12.3",
         "@material-ui/icons": "4.11.2",
         "@material-ui/lab": "4.0.0-alpha.60",
@@ -30,8 +31,8 @@
         "cmd-ts": "0.7.0",
         "cronstrue": "1.119.0",
         "cryptr": "4.0.2",
-        "d2": "31.10.0",
         "d2-manifest": "1.0.0",
+        "d2": "31.10.0",
         "file-saver": "2.0.5",
         "fluture": "14.0.0",
         "font-awesome": "4.7.0",
@@ -44,9 +45,8 @@
         "monaco-editor": "0.29.1",
         "nano-memoize": "1.2.1",
         "node-schedule": "2.0.0",
-        "purify-ts": "1.1.0",
         "purify-ts-extra-codec": "0.6.0",
-        "react": "17.0.2",
+        "purify-ts": "1.1.0",
         "react-dom": "17.0.2",
         "react-dropzone": "11.4.2",
         "react-json-view": "1.21.3",
@@ -56,6 +56,7 @@
         "react-scripts": "4.0.3",
         "react-virtualized-auto-sizer": "1.0.6",
         "react-window": "1.8.6",
+        "react": "17.0.2",
         "rehype-raw": "^6.1.1",
         "rehype-sanitize": "^5.0.1",
         "semver": "7.3.5",

diff --git a/public/app-config.template.json b/public/app-config.template.json
diff --git a/public/feedback-tool/feedback-dhis2.min.js b/public/feedback-tool/feedback-dhis2.min.js
diff --git a/public/feedback-tool/feedback-github.min.js b/public/feedback-tool/feedback-github.min.js
diff --git a/public/feedback-tool/feedback.min.css b/public/feedback-tool/feedback.min.css
diff --git a/public/feedback-tool/feedback.min.js b/public/feedback-tool/feedback.min.js
diff --git a/public/feedback-tool/i18n/en.properties b/public/feedback-tool/i18n/en.properties
diff --git a/public/feedback-tool/i18n/es.properties b/public/feedback-tool/i18n/es.properties
diff --git a/public/feedback-tool/icons.png b/public/feedback-tool/icons.png
diff --git a/public/feedback-tool/spinner.gif b/public/feedback-tool/spinner.gif
diff --git a/public/index.html b/public/index.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <html lang="en" dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico?v=4">
+    <head>
+        <meta charset="utf-8" />
+        <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico?v=4" />
 
-    <link type="text/css" rel="stylesheet" href="%PUBLIC_URL%/includes/material-design-icons/material-icons.css"/>
-    <link type="text/css" rel="stylesheet" href="%PUBLIC_URL%/includes/roboto-font.css"/>
+        <link type="text/css" rel="stylesheet" href="%PUBLIC_URL%/includes/material-design-icons/material-icons.css" />
+        <link type="text/css" rel="stylesheet" href="%PUBLIC_URL%/includes/roboto-font.css" />
 
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="theme-color" content="#000000">
-    <!--
+        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+        <meta name="theme-color" content="#000000" />
+        <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
       Only files inside the `public` folder can be referenced from the HTML.
@@ -18,21 +18,12 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>MetaData Synchronization</title>
-
-    <script src="//code.jquery.com/jquery-latest.min.js"></script>
-    <script src="%PUBLIC_URL%/feedback-tool/feedback.min.js"></script>
-    <script src="%PUBLIC_URL%/feedback-tool/feedback-github.min.js"></script>
-    <script src="%PUBLIC_URL%/feedback-tool/feedback-dhis2.min.js"></script>
-
-    <link rel="stylesheet" href="%PUBLIC_URL%/feedback-tool/feedback.min.css" />
-  </head>
-  <body>
-    <noscript>
-      You need to enable JavaScript to run this app.
-    </noscript>
-    <div id="root"></div>
-    <!--
+        <title>MetaData Synchronization</title>
+    </head>
+    <body>
+        <noscript> You need to enable JavaScript to run this app. </noscript>
+        <div id="root"></div>
+        <!--
       This HTML file is a template.
       If you open it directly in the browser, you will see an empty page.
 
@@ -41,6 +32,5 @@
 
       To begin the development, run `npm start` or `yarn start`.
       To create a production bundle, use `npm run build` or `yarn build`.
-    -->
-  </body>
+    --></body>
 </html>