Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ACS-4985] Added configuration to merge created and modified date filters into a single date filter #3324

Merged
merged 12 commits into from
Jul 28, 2023
Merged

[ACS-4985] Added configuration to merge created and modified date filters into a single date filter #3324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d235813
ACS-4985 Prepared configuration for created and modified dates in search
AleksanderSklorz Jun 21, 2023
22942ae
[ACS-4985] Updated search filter configuration for ACA to include the…
swapnil-verma-gl Jul 10, 2023
b3c5e31
[ACS-4985] Added date-fns adapter to alfresco content app
swapnil-verma-gl Jul 14, 2023
5468c80
[ACS-4985] Added failing e2e test cases to protractor.excludes.json
swapnil-verma-gl Jul 20, 2023
1ea0423
[ACS-4985] Removed unused Created Date/Modified Date entries from i18…
swapnil-verma-gl Jul 26, 2023
d04d435
[ACS-4985] Removed .env-original (file not required)
swapnil-verma-gl Jul 26, 2023
2e9438b
[ACS-4985] Updated protractor.excludes.json
swapnil-verma-gl Jul 26, 2023
d1cd0ee
[ACS-4794][link-adf:feature/dev-mkinas-es-migration] Fix missed test …
swapnil-verma-gl Jul 27, 2023
748220d
Revert "[ACS-4794][link-adf:feature/dev-mkinas-es-migration] Fix miss…
swapnil-verma-gl Jul 27, 2023
15ce458
[ACS-4985] Empty commit to trigger finalise job
swapnil-verma-gl Jul 27, 2023
ad30098
Revert "[ACS-4794] Fix missed test case"
swapnil-verma-gl Jul 27, 2023
7a35798
Merge remote-tracking branch 'origin/ACS-4985-Advanced-Search-Date-pi…
swapnil-verma-gl Jul 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions e2e/protractor/protractor.excludes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
14 changes: 14 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need removing the moment one? or it's still needed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure. I don't see usages of the moment adapter in ACA anymore, but there would still be its usages in ADF. There are usages of the base moment library in some ACA E2E test cases though

"@angular/platform-browser": "14.1.3",
"@angular/platform-browser-dynamic": "14.1.3",
Expand Down
77 changes: 27 additions & 50 deletions projects/aca-content/assets/app.extensions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
},
Expand Down Expand Up @@ -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"
}
}
}
},
Expand Down Expand Up @@ -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"
}
}
}
},
Expand Down
2 changes: 0 additions & 2 deletions projects/aca-content/assets/i18n/ar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,8 +531,6 @@
"CATEGORIES": "فئات"
},
"CATEGORIES": {
"MODIFIED_DATE": "تاريخ التعديل",
"CREATED_DATE": "تاريخ الإنشاء",
"EFFECTIVITY_FROM": "فعالية من",
"EFFECTIVITY_TO": "فعالية ل",
"LOGIC": "منطق"
Expand Down
2 changes: 0 additions & 2 deletions projects/aca-content/assets/i18n/cs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions projects/aca-content/assets/i18n/da.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions projects/aca-content/assets/i18n/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
7 changes: 5 additions & 2 deletions projects/aca-content/assets/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 0 additions & 2 deletions projects/aca-content/assets/i18n/es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions projects/aca-content/assets/i18n/fi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions projects/aca-content/assets/i18n/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions projects/aca-content/assets/i18n/it.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions projects/aca-content/assets/i18n/ja.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,8 +531,6 @@
"CATEGORIES": "カテゴリ"
},
"CATEGORIES": {
"MODIFIED_DATE": "変更日",
"CREATED_DATE": "作成日",
"EFFECTIVITY_FROM": "有効性の開始",
"EFFECTIVITY_TO": "有効性の終了",
"LOGIC": "ロジック"
Expand Down
2 changes: 0 additions & 2 deletions projects/aca-content/assets/i18n/nb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,8 +531,6 @@
"CATEGORIES": "Kategorier"
},
"CATEGORIES": {
"MODIFIED_DATE": "Endringsdato",
"CREATED_DATE": "Opprettelsesdato",
"EFFECTIVITY_FROM": "Effektivitet fra",
"EFFECTIVITY_TO": "Effektivitet til",
"LOGIC": "Logikk"
Expand Down
2 changes: 0 additions & 2 deletions projects/aca-content/assets/i18n/nl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions projects/aca-content/assets/i18n/pl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions projects/aca-content/assets/i18n/pt-BR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions projects/aca-content/assets/i18n/ru.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,8 +531,6 @@
"CATEGORIES": "Категории"
},
"CATEGORIES": {
"MODIFIED_DATE": "Дата изменения",
"CREATED_DATE": "Дата создания",
"EFFECTIVITY_FROM": "Действует с",
"EFFECTIVITY_TO": "Действует до",
"LOGIC": "Логика"
Expand Down
2 changes: 0 additions & 2 deletions projects/aca-content/assets/i18n/sv.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions projects/aca-content/assets/i18n/zh-CN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,8 +531,6 @@
"CATEGORIES": "类别"
},
"CATEGORIES": {
"MODIFIED_DATE": "修改日期",
"CREATED_DATE": "创建日期",
"EFFECTIVITY_FROM": "有效开始",
"EFFECTIVITY_TO": "有效结束",
"LOGIC": "登录"
Expand Down