fix(webapps): add translation handler

- Fix translation loading problem on the batch operation page. - Execute new handler on all translation keys. - Add search pill comparison operators as proper translate strings. - Add null-conditional operator to avoid errors related to #4351
camunda · Jun 20, 2024 · 0a662c6 · 0a662c6
1 parent 154e42a
commit 0a662c6
Show file tree

Hide file tree

Showing 14 changed files with 143 additions and 120 deletions.
diff --git a/webapps/frontend/camunda-commons-ui/lib/widgets/search/cam-widget-search.js b/webapps/frontend/camunda-commons-ui/lib/widgets/search/cam-widget-search.js
@@ -141,31 +141,27 @@ module.exports = [
           $scope.translations[key] = $translate.instant(value);
         });
 
-        const initTypes = () => {
-          $scope.types.map(function(el) {
-            el.id.value = $translate.instant(el.id.value);
-            if (el.operators) {
-              el.operators = el.operators.map(function(op) {
-                op.value = $translate.instant(op.value);
-                return op;
-              });
-            }
-
-            if (el.options && typeof el.options[0] === 'object') {
-              el.mappedOptions = el.options.map(({key, value}) => {
-                return {
-                  key: key,
-                  value: $translate.instant(value)
-                };
-              });
+        $scope.types.map(function(el) {
+          el.id.value = $translate.instant(el.id.value);
+          if (el.operators) {
+            el.operators = el.operators.map(function(op) {
+              op.value = $translate.instant(op.value);
+              return op;
+            });
+          }
 
-              el.options = el.mappedOptions.map(({value}) => value);
-            }
-            return el;
-          });
-        };
+          if (el.options && typeof el.options[0] === 'object') {
+            el.mappedOptions = el.options.map(({key, value}) => {
+              return {
+                key: key,
+                value: $translate.instant(value)
+              };
+            });
 
-        if ($scope.types) initTypes();
+            el.options = el.mappedOptions.map(({value}) => value);
+          }
+          return el;
+        });
 
         angular.forEach($scope.operators, function(operatorGroupedByType) {
           angular.forEach(operatorGroupedByType, function(operator) {
@@ -735,7 +731,7 @@ module.exports = [
 
             if (
               $scope.matchAny &&
-              !$location.search().hasOwnProperty(searchId + 'OrQuery')// eslint-disable-line
+              !$location.search().hasOwnProperty(searchId + 'OrQuery') // eslint-disable-line
             ) {
               newLocation = $location.url() + '&' + searchId + 'OrQuery';
             } else if (!$scope.matchAny) {
@@ -775,11 +771,11 @@ module.exports = [
         $scope.$on('$locationChangeSuccess', function() {
           $scope.matchAny = $location
             .search()
-            .hasOwnProperty(searchId + 'OrQuery');// eslint-disable-line
+            .hasOwnProperty(searchId + 'OrQuery'); // eslint-disable-line
 
           if (
             !IGNORE_URL_UPDATE &&
-            $location.search().hasOwnProperty(searchId + 'Query')// eslint-disable-line
+            $location.search().hasOwnProperty(searchId + 'Query') // eslint-disable-line
           ) {
             // make new array of searches from the url
             var searches = getSearchesFromURL();
@@ -825,11 +821,9 @@ module.exports = [
             $scope.searches[i].type.values = types;
           }
         };
-
         $scope.$watch(
           'types',
           function() {
-            initTypes();
             //in case if array of types changed - update dropdown values
             $scope.searchTypes = $scope.types.map(function(el) {
               return el.id;

diff --git a/webapps/frontend/public/app/admin/locales/en.json b/webapps/frontend/public/app/admin/locales/en.json
@@ -676,6 +676,10 @@
     "USER_MEMBERSHIP_TENANT_SELECT_TENANTS": "Select Tenants",
     "USER_MEMBERSHIP_TENANT_TENANT_ID": "Tenant ID",
     "USER_MEMBERSHIP_TENANT_TENANT_NAME": "Tenant Name",
-    "VALUE": "Value"
+    "VALUE": "Value",
+    "SEARCH_LESS_THAN": "<",
+    "SEARCH_LESS_THAN_EQUALS": "<=",
+    "SEARCH_GREATER_THAN": ">",
+    "SEARCH_GREATER_THAN_EQUALS": ">="
   }
 }
diff --git a/webapps/frontend/public/app/cockpit/locales/en.json b/webapps/frontend/public/app/cockpit/locales/en.json
@@ -2554,6 +2554,10 @@
     "VARIABLE_UPLOAD_PROGRESS": "Upload progress: {{progress}}%",
     "VARIABLE_UPLOAD_SELECT_FILE": "Select a file containing the binary content for the variable",
     "VARIABLE_UPLOAD_UPLOAD": "Upload",
-    "WITHOUT_DUE_DATE": "Without Due Date"
+    "WITHOUT_DUE_DATE": "Without Due Date",
+    "SEARCH_LESS_THAN": "<",
+    "SEARCH_LESS_THAN_EQUALS": "<=",
+    "SEARCH_GREATER_THAN": ">",
+    "SEARCH_GREATER_THAN_EQUALS": ">="
   }
 }
diff --git a/webapps/frontend/public/app/tasklist/locales/en.json b/webapps/frontend/public/app/tasklist/locales/en.json
@@ -513,6 +513,10 @@
     "name": "Name",
     "owner": "Owner",
     "parentTask": "Parent task",
-    "priority": "Priority"
+    "priority": "Priority",
+    "SEARCH_LESS_THAN": "<",
+    "SEARCH_LESS_THAN_EQUALS": "<=",
+    "SEARCH_GREATER_THAN": ">",
+    "SEARCH_GREATER_THAN_EQUALS": ">="
   }
 }
diff --git a/webapps/frontend/public/app/welcome/locales/en.json b/webapps/frontend/public/app/welcome/locales/en.json
@@ -182,6 +182,10 @@
     "TOGGLE_NAVIGATION": "Toggle navigation",
     "UPDATE": "Update",
     "USERNAME": "Username",
-    "USERNAME_FOR_AUTHENTICATION": "Username for authentication: {{username}}"
+    "USERNAME_FOR_AUTHENTICATION": "Username for authentication: {{username}}",
+    "SEARCH_LESS_THAN": "<",
+    "SEARCH_LESS_THAN_EQUALS": "<=",
+    "SEARCH_GREATER_THAN": ">",
+    "SEARCH_GREATER_THAN_EQUALS": ">="
   }
 }
diff --git a/webapps/frontend/ui/cockpit/client/scripts/batches/config/batch-search-config.json b/webapps/frontend/ui/cockpit/client/scripts/batches/config/batch-search-config.json
@@ -59,19 +59,19 @@
       },
       {
         "key": "gt",
-        "value": ">"
+        "value": "SEARCH_GREATER_THAN"
       },
       {
         "key": "gteq",
-        "value": ">="
+        "value": "SEARCH_GREATER_THAN_EQUALS"
       },
       {
         "key": "lt",
-        "value": "<"
+        "value": "SEARCH_LESS_THAN"
       },
       {
         "key": "lteq",
-        "value": "<="
+        "value": "SEARCH_LESS_THAN_EQUALS"
       },
       {
         "key": "like",
@@ -89,19 +89,19 @@
       },
       {
         "key": "gt",
-        "value": ">"
+        "value": "SEARCH_GREATER_THAN"
       },
       {
         "key": "gteq",
-        "value": ">="
+        "value": "SEARCH_GREATER_THAN_EQUALS"
       },
       {
         "key": "lt",
-        "value": "<"
+        "value": "SEARCH_LESS_THAN"
       },
       {
         "key": "lteq",
-        "value": "<="
+        "value": "SEARCH_LESS_THAN_EQUALS"
       },
       {
         "key": "like",
@@ -119,19 +119,19 @@
       },
       {
         "key": "gt",
-        "value": ">"
+        "value": "SEARCH_GREATER_THAN"
       },
       {
         "key": "gteq",
-        "value": ">="
+        "value": "SEARCH_GREATER_THAN_EQUALS"
       },
       {
         "key": "lt",
-        "value": "<"
+        "value": "SEARCH_LESS_THAN"
       },
       {
         "key": "lteq",
-        "value": "<="
+        "value": "SEARCH_LESS_THAN_EQUALS"
       }
     ],
     "boolean": [

diff --git a/...d/ui/cockpit/plugins/base/app/views/processDefinition/process-instance-search-config.json b/...d/ui/cockpit/plugins/base/app/views/processDefinition/process-instance-search-config.json
@@ -60,19 +60,19 @@
         },
         {
           "key": "gt",
-          "value": ">"
+          "value": "SEARCH_GREATER_THAN"
         },
         {
           "key": "gteq",
-          "value": ">="
+          "value": "SEARCH_GREATER_THAN_EQUALS"
         },
         {
           "key": "lt",
-          "value": "<"
+          "value": "SEARCH_LESS_THAN"
         },
         {
           "key": "lteq",
-          "value": "<="
+          "value": "SEARCH_LESS_THAN_EQUALS"
         },
         {
           "key": "like",
@@ -100,19 +100,19 @@
       },
       {
         "key": "gt",
-        "value": ">"
+        "value": "SEARCH_GREATER_THAN"
       },
       {
         "key": "gteq",
-        "value": ">="
+        "value": "SEARCH_GREATER_THAN_EQUALS"
       },
       {
         "key": "lt",
-        "value": "<"
+        "value": "SEARCH_LESS_THAN"
       },
       {
         "key": "lteq",
-        "value": "<="
+        "value": "SEARCH_LESS_THAN_EQUALS"
       },
       {
         "key": "like",
@@ -130,19 +130,19 @@
       },
       {
         "key": "gt",
-        "value": ">"
+        "value": "SEARCH_GREATER_THAN"
       },
       {
         "key": "gteq",
-        "value": ">="
+        "value": "SEARCH_GREATER_THAN_EQUALS"
       },
       {
         "key": "lt",
-        "value": "<"
+        "value": "SEARCH_LESS_THAN"
       },
       {
         "key": "lteq",
-        "value": "<="
+        "value": "SEARCH_LESS_THAN_EQUALS"
       },
       {
         "key": "like",
@@ -160,19 +160,19 @@
       },
       {
         "key": "gt",
-        "value": ">"
+        "value": "SEARCH_GREATER_THAN"
       },
       {
         "key": "gteq",
-        "value": ">="
+        "value": "SEARCH_GREATER_THAN_EQUALS"
       },
       {
         "key": "lt",
-        "value": "<"
+        "value": "SEARCH_LESS_THAN"
       },
       {
         "key": "lteq",
-        "value": "<="
+        "value": "SEARCH_LESS_THAN_EQUALS"
       }
     ],
     "boolean":    [

diff --git a/.../cockpit/plugins/base/app/views/processInstance/variable-instances-tab-search-config.json b/.../cockpit/plugins/base/app/views/processInstance/variable-instances-tab-search-config.json
@@ -46,19 +46,19 @@
         },
         {
           "key": "gt",
-          "value": ">"
+          "value": "SEARCH_GREATER_THAN"
         },
         {
           "key": "gteq",
-          "value": ">="
+          "value": "SEARCH_GREATER_THAN_EQUALS"
         },
         {
           "key": "lt",
-          "value": "<"
+          "value": "SEARCH_LESS_THAN"
         },
         {
           "key": "lteq",
-          "value": "<="
+          "value": "SEARCH_LESS_THAN_EQUALS"
         },
         {
           "key": "like",
@@ -79,19 +79,19 @@
       },
       {
         "key": "gt",
-        "value": ">"
+        "value": "SEARCH_GREATER_THAN"
       },
       {
         "key": "gteq",
-        "value": ">="
+        "value": "SEARCH_GREATER_THAN_EQUALS"
       },
       {
         "key": "lt",
-        "value": "<"
+        "value": "SEARCH_LESS_THAN"
       },
       {
         "key": "lteq",
-        "value": "<="
+        "value": "SEARCH_LESS_THAN_EQUALS"
       },
       {
         "key": "like",
@@ -109,19 +109,19 @@
       },
       {
         "key": "gt",
-        "value": ">"
+        "value": "SEARCH_GREATER_THAN"
       },
       {
         "key": "gteq",
-        "value": ">="
+        "value": "SEARCH_GREATER_THAN_EQUALS"
       },
       {
         "key": "lt",
-        "value": "<"
+        "value": "SEARCH_LESS_THAN"
       },
       {
         "key": "lteq",
-        "value": "<="
+        "value": "SEARCH_LESS_THAN_EQUALS"
       },
       {
         "key": "like",
@@ -139,19 +139,19 @@
       },
       {
         "key": "gt",
-        "value": ">"
+        "value": "SEARCH_GREATER_THAN"
       },
       {
         "key": "gteq",
-        "value": ">="
+        "value": "SEARCH_GREATER_THAN_EQUALS"
       },
       {
         "key": "lt",
-        "value": "<"
+        "value": "SEARCH_LESS_THAN"
       },
       {
         "key": "lteq",
-        "value": "<="
+        "value": "SEARCH_LESS_THAN_EQUALS"
       }
     ],
     "boolean":    [