[ACS-4985] Added configuration to merge created and modified date fil…

…ters into a single date filter (#3324) * ACS-4985 Prepared configuration for created and modified dates in search * [ACS-4985] Updated search filter configuration for ACA to include the new SearchDateRangeAdvancedTabbed component * [ACS-4985] Added date-fns adapter to alfresco content app * [ACS-4985] Added failing e2e test cases to protractor.excludes.json * [ACS-4985] Removed unused Created Date/Modified Date entries from i18n files after rebase * [ACS-4985] Removed .env-original (file not required) * [ACS-4985] Updated protractor.excludes.json * [ACS-4794][link-adf:feature/dev-mkinas-es-migration] Fix missed test case * Revert "[ACS-4794][link-adf:feature/dev-mkinas-es-migration] Fix missed test case" This reverts commit d1cd0ee. * [ACS-4985] Empty commit to trigger finalise job * Revert "[ACS-4794] Fix missed test case" This reverts commit d1cd0ee. --------- Co-authored-by: Aleksander Sklorz <[email protected]>
Alfresco · Jul 28, 2023 · 174d7b6 · 174d7b6
1 parent 38d6819
commit 174d7b6
Show file tree

Hide file tree

Showing 21 changed files with 60 additions and 91 deletions.
diff --git a/e2e/protractor/protractor.excludes.json b/e2e/protractor/protractor.excludes.json
@@ -5,15 +5,21 @@
   "C213134": "temp, see https://alfresco.atlassian.net/browse/ACS-5189",
   "C286252": "temp, see https://alfresco.atlassian.net/browse/ACS-5189",
   "C284666": "temp, see https://alfresco.atlassian.net/browse/ACS-5189",
-  "C286269": "temp, see https://alfresco.atlassian.net/browse/ACS-5189",
+  "C279186": "will be fixed after protractor to playwright migration, see https://alfresco.atlassian.net/browse/ACS-5007",
+  "C279211": "will be fixed after protractor to playwright migration, see https://alfresco.atlassian.net/browse/ACS-5007",
+  "C279212": "will be fixed after protractor to playwright migration, see https://alfresco.atlassian.net/browse/ACS-5007",
+  "C279213": "will be fixed after protractor to playwright migration, see https://alfresco.atlassian.net/browse/ACS-5007",
+  "C279214": "will be fixed after protractor to playwright migration, see https://alfresco.atlassian.net/browse/ACS-5007",
+  "C279215": "will be fixed after protractor to playwright migration, see https://alfresco.atlassian.net/browse/ACS-5007",
+  "C279216": "will be fixed after protractor to playwright migration, see https://alfresco.atlassian.net/browse/ACS-5007",
+  "C279217": "will be fixed after protractor to playwright migration, see https://alfresco.atlassian.net/browse/ACS-5007",
+  "C279219": "will be fixed after protractor to playwright migration, see https://alfresco.atlassian.net/browse/ACS-5007",
+  "C279220": "will be fixed after protractor to playwright migration, see https://alfresco.atlassian.net/browse/ACS-5007",
+  "C279221": "will be fixed after protractor to playwright migration, see https://alfresco.atlassian.net/browse/ACS-5007",
+  "C325006": "will be fixed after protractor to playwright migration, see https://alfresco.atlassiana.net/browse/ACS-5007",
+  "C213097": "https://alfresco.atlassian.net/browse/ACS-5479",
   "C280051": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-5632",
   "C308042": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-5632",
-  "C279186": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4985",
-  "C279219": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4985",
-  "C279221": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4985",
-  "C279220": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4985",
-  "C325006": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4985",
-  "C213097": "https://alfresco.atlassian.net/browse/ACS-5479",
 
   "C268958" : "test migrated to playwright https://alfresco.atlassian.net/browse/ACS-5604",
   "C268959" : "test migrated to playwright https://alfresco.atlassian.net/browse/ACS-5604",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -45,6 +45,7 @@
     "@angular/core": "14.1.3",
     "@angular/forms": "14.1.3",
     "@angular/material": "14.1.3",
+    "@angular/material-date-fns-adapter": "14.1.3",
     "@angular/material-moment-adapter": "14.1.3",
     "@angular/platform-browser": "14.1.3",
     "@angular/platform-browser-dynamic": "14.1.3",

diff --git a/projects/aca-content/assets/app.extensions.json b/projects/aca-content/assets/app.extensions.json
@@ -1452,32 +1452,19 @@
             }
           },
           {
-            "id": "createdDateRange",
-            "name": "SEARCH.CATEGORIES.CREATED_DATE",
+            "id": "createdModifiedDateRange",
+            "name": "SEARCH.CATEGORIES.DATE",
             "enabled": true,
             "component": {
-              "selector": "date-range",
+              "selector": "date-range-advanced",
               "settings": {
-                "allowUpdateOnChange": false,
-                "hideDefaultAction": true,
-                "field": "cm:created",
-                "dateFormat": "DD-MMM-YY",
-                "maxDate": "today"
-              }
-            }
-          },
-          {
-            "id": "modifiedDateRange",
-            "name": "SEARCH.CATEGORIES.MODIFIED_DATE",
-            "enabled": true,
-            "component": {
-              "selector": "date-range",
-              "settings": {
-                "allowUpdateOnChange": false,
-                "hideDefaultAction": true,
-                "field": "cm:modified",
-                "dateFormat": "DD-MMM-YY",
-                "maxDate": "today"
+                "field": "cm:created,cm:modified",
+                "dateFormat": "dd-MMM-yy",
+                "maxDate": "today",
+                "displayedLabelsByField": {
+                  "cm:created": "SEARCH.CATEGORIES.DATE_TABS.CREATED",
+                  "cm:modified": "SEARCH.CATEGORIES.DATE_TABS.MODIFIED"
+                }
               }
             }
           },
@@ -1650,16 +1637,17 @@
           },
           {
             "id": "createdDateRange",
-            "name": "SEARCH.CATEGORIES.CREATED_DATE",
+            "name": "SEARCH.CATEGORIES.DATE",
             "enabled": true,
             "component": {
-              "selector": "date-range",
+              "selector": "date-range-advanced",
               "settings": {
-                "allowUpdateOnChange": false,
-                "hideDefaultAction": true,
                 "field": "cm:created",
-                "dateFormat": "DD-MMM-YY",
-                "maxDate": "today"
+                "dateFormat": "dd-MMM-yy",
+                "maxDate": "today",
+                "displayedLabelsByField": {
+                  "cm:created": "SEARCH.CATEGORIES.DATE_TABS.CREATED"
+                }
               }
             }
           },
@@ -1785,32 +1773,21 @@
             }
           },
           {
-            "id": "createdDateRange",
-            "name": "SEARCH.CATEGORIES.CREATED_DATE",
+            "id": "createdModifiedDateRange",
+            "name": "SEARCH.CATEGORIES.DATE",
             "enabled": true,
             "component": {
-              "selector": "date-range",
+              "selector": "date-range-advanced",
               "settings": {
                 "allowUpdateOnChange": false,
                 "hideDefaultAction": true,
-                "field": "cm:created",
-                "dateFormat": "DD-MMM-YY",
-                "maxDate": "today"
-              }
-            }
-          },
-          {
-            "id": "modifiedDateRange",
-            "name": "SEARCH.CATEGORIES.MODIFIED_DATE",
-            "enabled": true,
-            "component": {
-              "selector": "date-range",
-              "settings": {
-                "allowUpdateOnChange": false,
-                "hideDefaultAction": true,
-                "field": "cm:modified",
-                "dateFormat": "DD-MMM-YY",
-                "maxDate": "today"
+                "field": "cm:created,cm:modified",
+                "dateFormat": "dd-MMM-yy",
+                "maxDate": "today",
+                "displayedLabelsByField": {
+                  "cm:created": "SEARCH.CATEGORIES.DATE_TABS.CREATED",
+                  "cm:modified": "SEARCH.CATEGORIES.DATE_TABS.MODIFIED"
+                }
               }
             }
           },

diff --git a/projects/aca-content/assets/i18n/ar.json b/projects/aca-content/assets/i18n/ar.json
@@ -531,8 +531,6 @@
       "CATEGORIES": "فئات"
     },
     "CATEGORIES": {
-      "MODIFIED_DATE": "تاريخ التعديل",
-      "CREATED_DATE": "تاريخ الإنشاء",
       "EFFECTIVITY_FROM": "فعالية من",
       "EFFECTIVITY_TO": "فعالية ل",
       "LOGIC": "منطق"

diff --git a/projects/aca-content/assets/i18n/cs.json b/projects/aca-content/assets/i18n/cs.json
@@ -531,8 +531,6 @@
       "CATEGORIES": "Kategorie"
     },
     "CATEGORIES": {
-      "MODIFIED_DATE": "Datum úpravy",
-      "CREATED_DATE": "Datum vytvoření",
       "EFFECTIVITY_FROM": "Platnost od",
       "EFFECTIVITY_TO": "Platnost do",
       "LOGIC": "Logika"

diff --git a/projects/aca-content/assets/i18n/da.json b/projects/aca-content/assets/i18n/da.json
@@ -531,8 +531,6 @@
       "CATEGORIES": "Kategorier"
     },
     "CATEGORIES": {
-      "MODIFIED_DATE": "Ændringsdato",
-      "CREATED_DATE": "Oprettelsesdato",
       "EFFECTIVITY_FROM": "Gældende periode fra",
       "EFFECTIVITY_TO": "Gældende periode til",
       "LOGIC": "Logik"

diff --git a/projects/aca-content/assets/i18n/de.json b/projects/aca-content/assets/i18n/de.json
@@ -531,8 +531,6 @@
       "CATEGORIES": "Categories"
     },
     "CATEGORIES": {
-      "MODIFIED_DATE": "Datum der Änderung",
-      "CREATED_DATE": "Datum der Erstellung",
       "EFFECTIVITY_FROM": "Effektiv ab",
       "EFFECTIVITY_TO": "Effektiv bis",
       "LOGIC": "Logik"

diff --git a/projects/aca-content/assets/i18n/en.json b/projects/aca-content/assets/i18n/en.json
@@ -532,8 +532,11 @@
             "CATEGORIES": "Categories"
         },
         "CATEGORIES": {
-            "MODIFIED_DATE": "Modified date",
-            "CREATED_DATE": "Created date",
+            "DATE": "Date",
+            "DATE_TABS": {
+              "CREATED": "Created",
+              "MODIFIED": "Modified"
+            },
             "EFFECTIVITY_FROM": "Effectivity from",
             "EFFECTIVITY_TO": "Effectivity to",
             "LOGIC": "Logic",

diff --git a/projects/aca-content/assets/i18n/es.json b/projects/aca-content/assets/i18n/es.json
@@ -531,8 +531,6 @@
       "CATEGORIES": "Categorías"
     },
     "CATEGORIES": {
-      "MODIFIED_DATE": "Fecha de modificación",
-      "CREATED_DATE": "Fecha de creación",
       "EFFECTIVITY_FROM": "Válido desde",
       "EFFECTIVITY_TO": "Válido hasta",
       "LOGIC": "Lógica"

diff --git a/projects/aca-content/assets/i18n/fi.json b/projects/aca-content/assets/i18n/fi.json
@@ -531,8 +531,6 @@
       "CATEGORIES": "Luokat"
     },
     "CATEGORIES": {
-      "MODIFIED_DATE": "Muokkauspäivämäärä",
-      "CREATED_DATE": "Luontipäivämäärä",
       "EFFECTIVITY_FROM": "Voimassaolon alku",
       "EFFECTIVITY_TO": "Voimassaolon loppu",
       "LOGIC": "Logiikka"

diff --git a/projects/aca-content/assets/i18n/fr.json b/projects/aca-content/assets/i18n/fr.json
@@ -531,8 +531,6 @@
       "CATEGORIES": "Catégories"
     },
     "CATEGORIES": {
-      "MODIFIED_DATE": "Date de modification",
-      "CREATED_DATE": "Date de création",
       "EFFECTIVITY_FROM": "Date de début d'effectivité",
       "EFFECTIVITY_TO": "Date de fin d'effectivité",
       "LOGIC": "Connexion"

diff --git a/projects/aca-content/assets/i18n/it.json b/projects/aca-content/assets/i18n/it.json
@@ -531,8 +531,6 @@
       "CATEGORIES": "Categorie"
     },
     "CATEGORIES": {
-      "MODIFIED_DATE": "Data di modifica",
-      "CREATED_DATE": "Data di creazione",
       "EFFECTIVITY_FROM": "Inizio validità",
       "EFFECTIVITY_TO": "Fine validità",
       "LOGIC": "Logica"

diff --git a/projects/aca-content/assets/i18n/ja.json b/projects/aca-content/assets/i18n/ja.json
@@ -531,8 +531,6 @@
       "CATEGORIES": "カテゴリ"
     },
     "CATEGORIES": {
-      "MODIFIED_DATE": "変更日",
-      "CREATED_DATE": "作成日",
       "EFFECTIVITY_FROM": "有効性の開始",
       "EFFECTIVITY_TO": "有効性の終了",
       "LOGIC": "ロジック"

diff --git a/projects/aca-content/assets/i18n/nb.json b/projects/aca-content/assets/i18n/nb.json
@@ -531,8 +531,6 @@
       "CATEGORIES": "Kategorier"
     },
     "CATEGORIES": {
-      "MODIFIED_DATE": "Endringsdato",
-      "CREATED_DATE": "Opprettelsesdato",
       "EFFECTIVITY_FROM": "Effektivitet fra",
       "EFFECTIVITY_TO": "Effektivitet til",
       "LOGIC": "Logikk"

diff --git a/projects/aca-content/assets/i18n/nl.json b/projects/aca-content/assets/i18n/nl.json
@@ -531,8 +531,6 @@
       "CATEGORIES": "Categorieën"
     },
     "CATEGORIES": {
-      "MODIFIED_DATE": "Datum gewijzigd",
-      "CREATED_DATE": "Datum gemaakt",
       "EFFECTIVITY_FROM": "Effectiviteit vanaf",
       "EFFECTIVITY_TO": "Effectiviteit tot",
       "LOGIC": "Logica"

diff --git a/projects/aca-content/assets/i18n/pl.json b/projects/aca-content/assets/i18n/pl.json
@@ -531,8 +531,6 @@
       "CATEGORIES": "Kategorie"
     },
     "CATEGORIES": {
-      "MODIFIED_DATE": "Data modyfikacji",
-      "CREATED_DATE": "Data utworzenia",
       "EFFECTIVITY_FROM": "Data początku obowiązywania",
       "EFFECTIVITY_TO": "Data końca obowiązywania",
       "LOGIC": "Logika"

diff --git a/projects/aca-content/assets/i18n/pt-BR.json b/projects/aca-content/assets/i18n/pt-BR.json
@@ -531,8 +531,6 @@
       "CATEGORIES": "Categorias"
     },
     "CATEGORIES": {
-      "MODIFIED_DATE": "Data de modificação",
-      "CREATED_DATE": "Data de criação",
       "EFFECTIVITY_FROM": "Eficácia de",
       "EFFECTIVITY_TO": "Eficácia para",
       "LOGIC": "Lógica"

diff --git a/projects/aca-content/assets/i18n/ru.json b/projects/aca-content/assets/i18n/ru.json
@@ -531,8 +531,6 @@
       "CATEGORIES": "Категории"
     },
     "CATEGORIES": {
-      "MODIFIED_DATE": "Дата изменения",
-      "CREATED_DATE": "Дата создания",
       "EFFECTIVITY_FROM": "Действует с",
       "EFFECTIVITY_TO": "Действует до",
       "LOGIC": "Логика"

diff --git a/projects/aca-content/assets/i18n/sv.json b/projects/aca-content/assets/i18n/sv.json
@@ -531,8 +531,6 @@
       "CATEGORIES": "Kategorier"
     },
     "CATEGORIES": {
-      "MODIFIED_DATE": "Modifierad datum",
-      "CREATED_DATE": "Skapad datum",
       "EFFECTIVITY_FROM": "Giltighet från",
       "EFFECTIVITY_TO": "Giltighet till",
       "LOGIC": "Logik"

diff --git a/projects/aca-content/assets/i18n/zh-CN.json b/projects/aca-content/assets/i18n/zh-CN.json
@@ -531,8 +531,6 @@
       "CATEGORIES": "类别"
     },
     "CATEGORIES": {
-      "MODIFIED_DATE": "修改日期",
-      "CREATED_DATE": "创建日期",
       "EFFECTIVITY_FROM": "有效开始",
       "EFFECTIVITY_TO": "有效结束",
       "LOGIC": "登录"