diff --git a/cspell.json b/cspell.json index 5bfa6a141..1fbc2db15 100644 --- a/cspell.json +++ b/cspell.json @@ -65,7 +65,8 @@ "dateitem", "versionable", "erroredSpy", - "errored" + "errored", + "noderef" ], "dictionaries": ["html", "en-gb", "en_US"] } diff --git a/projects/aca-folder-rules/assets/i18n/en.json b/projects/aca-folder-rules/assets/i18n/en.json index 529d0e798..9ead4a3eb 100644 --- a/projects/aca-folder-rules/assets/i18n/en.json +++ b/projects/aca-folder-rules/assets/i18n/en.json @@ -22,7 +22,8 @@ "NAME": "Enter rule name", "DESCRIPTION": "Enter rule description", "NO_DESCRIPTION": "No description", - "VALUE": "Value" + "VALUE": "Value", + "CHOOSE_FOLDER": "Choose destination folder" }, "ERROR": { "REQUIRED": "This field is required", diff --git a/projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.html b/projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.html index 18d674bdd..f4936bd32 100644 --- a/projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.html +++ b/projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.html @@ -86,7 +86,8 @@ [actionDefinitions]="actionDefinitions$ | async" [readOnly]="true" [preview]="true" - [value]="selectedRule"> + [value]="selectedRule" + [nodeId]="nodeId"> diff --git a/projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.ts b/projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.ts index aca129d01..f6822e14a 100644 --- a/projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.ts +++ b/projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.ts @@ -48,7 +48,7 @@ import { RuleSet } from '../model/rule-set.model'; host: { class: 'aca-manage-rules' } }) export class ManageRulesSmartComponent implements OnInit, OnDestroy { - nodeId: string = null; + nodeId = ''; mainRuleSet$: Observable; inheritedRuleSets$: Observable; @@ -115,7 +115,8 @@ export class ManageRulesSmartComponent implements OnInit, OnDestroy { width: '90%', panelClass: 'aca-edit-rule-dialog-container', data: { - model + model, + nodeId: this.nodeId } }); diff --git a/projects/aca-folder-rules/src/lib/mock/actions.mock.ts b/projects/aca-folder-rules/src/lib/mock/actions.mock.ts index 2cf497e3f..63d3584f6 100644 --- a/projects/aca-folder-rules/src/lib/mock/actions.mock.ts +++ b/projects/aca-folder-rules/src/lib/mock/actions.mock.ts @@ -57,6 +57,18 @@ export const actionDefListMock = { multiValued: false, mandatory: false, parameterConstraintName: 'ac-aspects' + }, + { + name: 'mock-action-parameter-noderef', + type: 'd:noderef', + multiValued: false, + mandatory: false + }, + { + name: 'aspect-name', + type: 'd:noderef', + multiValued: false, + mandatory: false } ], name: 'mock-action-1-definition', @@ -102,6 +114,24 @@ const actionParam3TransformedMock: ActionParameterDefinitionTransformed = { parameterConstraintName: 'ac-aspects' }; +const actionParam4TransformedMock: ActionParameterDefinitionTransformed = { + name: 'mock-action-parameter-noderef', + type: 'd:noderef', + multiValued: false, + mandatory: false, + displayLabel: 'mock-action-parameter-noderef', + parameterConstraintName: '' +}; + +const actionParam5TransformedMock: ActionParameterDefinitionTransformed = { + name: 'aspect-name', + type: 'd:noderef', + multiValued: false, + mandatory: false, + displayLabel: 'aspect-name', + parameterConstraintName: '' +}; + const action1TransformedMock: ActionDefinitionTransformed = { id: 'mock-action-1-definition', name: 'mock-action-1-definition', @@ -109,7 +139,13 @@ const action1TransformedMock: ActionDefinitionTransformed = { title: 'Action 1 title', applicableTypes: [], trackStatus: false, - parameterDefinitions: [actionParam1TransformedMock, actionParam2TransformedMock, actionParam3TransformedMock] + parameterDefinitions: [ + actionParam1TransformedMock, + actionParam2TransformedMock, + actionParam3TransformedMock, + actionParam4TransformedMock, + actionParam5TransformedMock + ] }; const action2TransformedMock: ActionDefinitionTransformed = { diff --git a/projects/aca-folder-rules/src/lib/rule-details/actions/rule-action-list.ui-component.html b/projects/aca-folder-rules/src/lib/rule-details/actions/rule-action-list.ui-component.html index 5d0250cd4..071dae114 100644 --- a/projects/aca-folder-rules/src/lib/rule-details/actions/rule-action-list.ui-component.html +++ b/projects/aca-folder-rules/src/lib/rule-details/actions/rule-action-list.ui-component.html @@ -3,7 +3,8 @@ [actionDefinitions]="actionDefinitions" [parameterConstraints]="parameterConstraints" [readOnly]="readOnly" - [formControl]="control"> + [formControl]="control" + [nodeId]="nodeId">