diff --git a/e2e/playwright/folder-rules/src/tests/create-rules.e2e.ts b/e2e/playwright/folder-rules/src/tests/create-rules.e2e.ts index 6c63dc3b2..69b3f0e5b 100644 --- a/e2e/playwright/folder-rules/src/tests/create-rules.e2e.ts +++ b/e2e/playwright/folder-rules/src/tests/create-rules.e2e.ts @@ -195,7 +195,12 @@ test.describe('Folder Rules Actions', () => { await nodesPage.manageRulesDialog.createRuleButton.waitFor({ state: 'hidden' }); await nodesPage.manageRules.getGroupsList(randomRuleName).click(); - await nodesPage.manageRules.checkAspects(['cm:generalclassifiable', 'cm:countable', 'sys:incomplete', 'st:siteContainer']); + await nodesPage.manageRules.checkAspects([ + 'Classifiable [cm:generalclassifiable]', + 'Countable [cm:countable]', + 'Incomplete [sys:incomplete]', + 'Site Container [st:siteContainer]' + ]); }); test('[XAT-891] Prevent rule creation after clicking on cancel during selecting destination folder', async ({ nodesPage, personalFiles }) => { diff --git a/e2e/playwright/info-drawer/exclude.tests.json b/e2e/playwright/info-drawer/exclude.tests.json index 494662023..a78d3465f 100644 --- a/e2e/playwright/info-drawer/exclude.tests.json +++ b/e2e/playwright/info-drawer/exclude.tests.json @@ -1,3 +1,6 @@ { - "XAT-5523": "https://hyland.atlassian.net/browse/ACA-4697" + "XAT-5523": "https://hyland.atlassian.net/browse/ACA-4697", + "XAT-17239": "https://hyland.atlassian.net/browse/ACS-9795", + "XAT-5516": "https://hyland.atlassian.net/browse/ACS-9795", + "XAT-5520": "https://hyland.atlassian.net/browse/ACS-9795" } diff --git a/e2e/playwright/search/exclude.tests.json b/e2e/playwright/search/exclude.tests.json index 914cddf04..96f64fb95 100644 --- a/e2e/playwright/search/exclude.tests.json +++ b/e2e/playwright/search/exclude.tests.json @@ -5,5 +5,6 @@ "XAT-5571": "https://hyland.atlassian.net/browse/ACS-9756", "XAT-17700": "https://hyland.atlassian.net/browse/ACS-9756", "XAT-17120": "https://hyland.atlassian.net/browse/ACS-9756", - "XAT-5567": "https://hyland.atlassian.net/browse/ACS-9756" + "XAT-5567": "https://hyland.atlassian.net/browse/ACS-9756", + "XAT-17121": "https://hyland.atlassian.net/browse/ACS-9795" } diff --git a/e2e/playwright/smoke-test/exclude.tests.json b/e2e/playwright/smoke-test/exclude.tests.json index 9e26dfeeb..445330fc0 100644 --- a/e2e/playwright/smoke-test/exclude.tests.json +++ b/e2e/playwright/smoke-test/exclude.tests.json @@ -1 +1,3 @@ -{} \ No newline at end of file +{ + "XAT-17738": "https://hyland.atlassian.net/browse/ACS-9795" +} diff --git a/e2e/playwright/viewer/exclude.tests.json b/e2e/playwright/viewer/exclude.tests.json index 0967ef424..05779a2f6 100644 --- a/e2e/playwright/viewer/exclude.tests.json +++ b/e2e/playwright/viewer/exclude.tests.json @@ -1 +1,9 @@ -{} +{ + "XAT-5465": "https://hyland.atlassian.net/browse/ACS-9795", + "XAT-17781": "https://hyland.atlassian.net/browse/ACS-9795", + "XAT-17181": "https://hyland.atlassian.net/browse/ACS-9795", + "XAT-17182": "https://hyland.atlassian.net/browse/ACS-9795", + "XAT-17640": "https://hyland.atlassian.net/browse/ACS-9795", + "XAT-17644": "https://hyland.atlassian.net/browse/ACS-9795", + "XAT-5476": "https://hyland.atlassian.net/browse/ACS-9795" +} diff --git a/projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.scss index 492fffebd..d23c3ce59 100644 --- a/projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.scss +++ b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.scss @@ -2,6 +2,8 @@ /* stylelint-disable selector-class-pattern */ .aca-rule-action-list { + min-width: 0; + .aca-rule-action-list__item .aca-rule-action .mat-mdc-form-field-flex .mat-mdc-form-field-infix { padding-top: 24px; } diff --git a/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.html b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.html index 99c06284c..0e379e01e 100644 --- a/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.html +++ b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.html @@ -1,6 +1,6 @@
diff --git a/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.scss index 9e8396107..404fdc5fb 100644 --- a/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.scss +++ b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.scss @@ -1,4 +1,6 @@ .aca-rule-action { + max-width: 100%; + &__form { display: flex; flex-direction: row; @@ -27,5 +29,14 @@ &-full-width { height: fit-content; flex: 1; + + &.aca-rule-action-form-field { + min-width: unset; + } + + &.aca-rule-action-card-view { + overflow: hidden; + margin-top: 11px; + } } } diff --git a/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.ts b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.ts index a23ccf229..8d4d00ff5 100644 --- a/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.ts +++ b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.ts @@ -255,7 +255,7 @@ export class RuleActionUiComponent implements ControlValueAccessor, OnInit, OnCh } // falls through default: - if (constraintsForDropdownBox && !this.readOnly) { + if (constraintsForDropdownBox) { return new CardViewSelectItemModel({ ...cardViewPropertiesModel, value: (this.parameters[paramDef.name] as string) ?? '', diff --git a/projects/aca-playwright-shared/src/page-objects/components/manageRules/manage-rules.component.ts b/projects/aca-playwright-shared/src/page-objects/components/manageRules/manage-rules.component.ts index 7c8d8823d..44a22798c 100644 --- a/projects/aca-playwright-shared/src/page-objects/components/manageRules/manage-rules.component.ts +++ b/projects/aca-playwright-shared/src/page-objects/components/manageRules/manage-rules.component.ts @@ -35,7 +35,7 @@ export class ManageRules extends BaseComponent { public ruleDetailsDeleteButton = this.getChild('#delete-rule-btn'); public ruleDetailsEditButton = this.getChild('#edit-rule-btn'); public ruleDetailsWhenText = this.getChild('[data-automation-id="rule-details-triggers-component"]'); - public ruleDetailsPerformActionsDiv = this.getChild('adf-card-view-textitem mat-form-field input'); + public ruleDetailsPerformActionsDiv = this.getChild('adf-card-view-selectitem .adf-property-read-only'); public rulesEmptyListTitle = this.getChild('.adf-empty-content__title'); public ruleActions = this.getChild('aca-rule-action'); public ruleConditionsInGroup = this.getChild('aca-rule-composite-condition aca-rule-simple-condition'); @@ -47,7 +47,7 @@ export class ManageRules extends BaseComponent { async checkAspects(aspects: string[]): Promise