Merge pull request #214 from EyeSeeTea/development

Release 3.10.1
EyeSeeTea · Mar 24, 2021 · d00e956 · d00e956
2 parents 412ee72 + 7ff0c97
commit d00e956
Show file tree

Hide file tree

Showing 10 changed files with 266 additions and 62 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: 2021-02-11T10:42:48.164Z\n"
-"PO-Revision-Date: 2021-02-11T10:42:48.164Z\n"
+"POT-Creation-Date: 2021-02-17T09:48:30.489Z\n"
+"PO-Revision-Date: 2021-02-17T09:48:30.489Z\n"
 
 msgid "Data values - Create/update"
 msgstr ""
@@ -82,6 +82,23 @@ msgstr ""
 msgid "Access to Settings and Themes"
 msgstr ""
 
+msgid "Access Permissions confirmation"
+msgstr ""
+
+msgid ""
+"This option gives access to all users. The current list of allowed users "
+"and user groups will be deleted. Do you want to proceed?"
+msgstr ""
+
+msgid "Accept"
+msgstr ""
+
+msgid "Cancel"
+msgstr ""
+
+msgid "All users allowed"
+msgstr ""
+
 msgid "Select Organisation Units on template generation"
 msgstr ""
 
@@ -109,6 +126,9 @@ msgstr ""
 msgid "Years"
 msgstr ""
 
+msgid "Accessible to all users"
+msgstr ""
+
 msgid "Accessible to {{users}} users and {{userGroups}} user groups"
 msgstr ""
 
@@ -386,9 +406,6 @@ msgid ""
 "You can still download them and send them to your administrator."
 msgstr ""
 
-msgid "Cancel"
-msgstr ""
-
 msgid "Proceed"
 msgstr ""
 

diff --git a/i18n/es.po b/i18n/es.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Bulk Load App\n"
-"POT-Creation-Date: 2021-02-11T10:42:48.164Z\n"
+"POT-Creation-Date: 2021-02-17T09:48:30.489Z\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,13 +76,31 @@ msgstr "Programa"
 msgid "Access to Template Generation"
 msgstr "Acceso a la generación de plantillas"
 
-#, fuzzy
 msgid "Access to Import Data"
-msgstr "Acceso a la generación de plantillas"
+msgstr "Acceso a la importación de datos"
 
 msgid "Access to Settings and Themes"
 msgstr "Acceso al área de configuración y a los temas"
 
+msgid "Access Permissions confirmation"
+msgstr "Confirme los permisos de accesso"
+
+msgid ""
+"This option gives access to all users. The current list of allowed users and "
+"user groups will be deleted. Do you want to proceed?"
+msgstr ""
+"Esta opción da acceso a todos los usuarios. La lista actual de usuarios y "
+"grupos de usuario con acceso se borrará. ¿Quiere continuar?"
+
+msgid "Accept"
+msgstr "Aceptar"
+
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgid "All users allowed"
+msgstr "Permitir todos los usuarios"
+
 msgid "Select Organisation Units on template generation"
 msgstr "Mostrar unidades organizativas durante la generación de la plantilla"
 
@@ -112,6 +130,9 @@ msgstr "Meses"
 msgid "Years"
 msgstr "Años"
 
+msgid "Accessible to all users"
+msgstr "Accesible a todos los usuarios"
+
 msgid "Accessible to {{users}} users and {{userGroups}} user groups"
 msgstr ""
 "Accesible a los usuarios {{users}} y los grupos de usuarios {{userGroups}}"
@@ -355,6 +376,8 @@ msgstr ""
 msgid ""
 "Please get in touch with the admin if you need access to these sections."
 msgstr ""
+"Por favor, póngase en contacto con el administrador si necesita acceder a "
+"cualquiera de estas secciones"
 
 msgid "You need to select at least one element to export"
 msgstr "Seleccione al menos un elemento a exportar"
@@ -402,9 +425,6 @@ msgstr ""
 "seran ignorados durante la importación. Por favor, descarguese estos datos y "
 "envieselos a su administrador o gestor de DHIS2"
 
-msgid "Cancel"
-msgstr "Cancelar"
-
 msgid "Proceed"
 msgstr "Continuar"
 

diff --git a/i18n/fr.po b/i18n/fr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Bulk Load App\n"
-"POT-Creation-Date: 2021-02-11T10:42:48.164Z\n"
+"POT-Creation-Date: 2021-02-17T09:48:30.489Z\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,13 +76,29 @@ msgstr "Programme"
 msgid "Access to Template Generation"
 msgstr "Accès à la génération de modèles"
 
-#, fuzzy
 msgid "Access to Import Data"
-msgstr "Accès à la génération de modèles"
+msgstr "Accès à l'import de données"
 
 msgid "Access to Settings and Themes"
 msgstr "Accès aux Paramètres et aux Thèmes"
 
+msgid "Access Permissions confirmation"
+msgstr ""
+
+msgid ""
+"This option gives access to all users. The current list of allowed users and "
+"user groups will be deleted. Do you want to proceed?"
+msgstr ""
+
+msgid "Accept"
+msgstr ""
+
+msgid "Cancel"
+msgstr "Annuler"
+
+msgid "All users allowed"
+msgstr ""
+
 msgid "Select Organisation Units on template generation"
 msgstr "Sélectionnez les unités d'organisation lors de la génération du modèle"
 
@@ -112,6 +128,9 @@ msgstr "Mois"
 msgid "Years"
 msgstr "Années"
 
+msgid "Accessible to all users"
+msgstr "Accessible aux utilisateurs {{users}}"
+
 msgid "Accessible to {{users}} users and {{userGroups}} user groups"
 msgstr ""
 "Accessible aux utilisateurs {{users}} et aux groupes d'utilisateurs "
@@ -377,7 +396,7 @@ msgid "Couldn't generate template"
 msgstr ""
 
 msgid "Download template"
-msgstr "Modèle téléchargez"
+msgstr "Télécharger modèle"
 
 msgid "Reading file..."
 msgstr "Lecture du fichier en cours ..."
@@ -408,9 +427,6 @@ msgstr ""
 "valide qui seront ignorées lors de l'importation.\n"
 "Vous pouvez toujours les télécharger et les envoyer à votre administrateur."
 
-msgid "Cancel"
-msgstr "Annuler"
-
 msgid "Proceed"
 msgstr "Procéder"
 

diff --git a/i18n/pt.po b/i18n/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2021-02-11T10:42:48.164Z\n"
+"POT-Creation-Date: 2021-02-17T09:48:30.489Z\n"
 "PO-Revision-Date: 2020-06-11T08:45:45.996Z\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -75,13 +75,29 @@ msgstr "Programa"
 msgid "Access to Template Generation"
 msgstr "Acesso à geração de planilhas"
 
-#, fuzzy
 msgid "Access to Import Data"
-msgstr "Acesso à geração de planilhas"
+msgstr ""
 
 msgid "Access to Settings and Themes"
 msgstr "Acesso a configurações e temas"
 
+msgid "Access Permissions confirmation"
+msgstr ""
+
+msgid ""
+"This option gives access to all users. The current list of allowed users and "
+"user groups will be deleted. Do you want to proceed?"
+msgstr ""
+
+msgid "Accept"
+msgstr ""
+
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgid "All users allowed"
+msgstr ""
+
 msgid "Select Organisation Units on template generation"
 msgstr "Selecione unidades organizacionais na geração de planilhas"
 
@@ -110,6 +126,9 @@ msgstr "Meses"
 msgid "Years"
 msgstr "Anos"
 
+msgid "Accessible to all users"
+msgstr "Acessível aos usuários {{users}}"
+
 msgid "Accessible to {{users}} users and {{userGroups}} user groups"
 msgstr ""
 "Acessível aos usuários {{users}} e os grupos de usuários {{userGroups}}"
@@ -399,9 +418,6 @@ msgstr ""
 "que serão ignorados durante a importação.\n"
 "Você debe baixá-los e enviá-los ao administrador do DHIS2"
 
-msgid "Cancel"
-msgstr "Cancelar"
-
 msgid "Proceed"
 msgstr "Continuar"
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "bulk-load",
     "description": "Bulk importing made easy",
-    "version": "3.10.0",
+    "version": "3.10.1",
     "license": "GPL-3.0",
     "author": "EyeSeeTea team",
     "homepage": ".",
@@ -62,12 +62,13 @@
         "update-po": "yarn extract-pot && for pofile in i18n/*.po; do msgmerge --backup=off -U $pofile i18n/en.pot; done",
         "manifest": "d2-manifest package.json build/manifest.webapp",
         "cy:verify": "cypress verify",
+        "check-uncommited": "test -z \"$(git status -uno --porcelain)\"",
         "cy:e2e:open": "CYPRESS_E2E=true cypress open",
         "cy:e2e:run": "CYPRESS_E2E=true cypress run --browser chrome"
     },
     "husky": {
         "hooks": {
-            "pre-push": "yarn prettify && yarn lint && yarn update-po && yarn test",
+            "pre-push": "yarn update-po && yarn check-uncommited && yarn prettify && yarn check-uncommited && yarn lint && yarn test",
             "post-merge": "./.githooks/dep-check"
         }
     },

diff --git a/src/data/ExcelPopulateRepository.ts b/src/data/ExcelPopulateRepository.ts
@@ -461,7 +461,8 @@ function _getFormulaWithValidation(workbook: XLSX.Workbook, sheet: SheetWithVali
 function getValue(cell: Cell): ExcelValue | undefined {
     const value = cell.value();
 
-    if (typeof value === "object" && value.constructor.name === "RichText") {
+    //@ts-ignore This should be improved on xlsx-populate
+    if (typeof value === "object" && _.isFunction(value.text)) {
         // @ts-ignore This should be improved on xlsx-populate
         const result = value.text();
 

diff --git a/src/domain/usecases/ImportTemplateUseCase.ts b/src/domain/usecases/ImportTemplateUseCase.ts
@@ -262,7 +262,7 @@ const compareDataPackages = (
                 .as(duplicateToleranceUnit) > duplicateTolerance;
         if (isWithToleranceRange) return false;
 
-        if (base.id === compare.id) return false;
+        if (base.id && base.id === compare.id) return false;
 
         const exclusions = duplicateExclusion[dataForm.id] ?? [];
         const filter = (values: DataPackageDataValue[]) => {