From 90c87ed04e9a064f560b9a0cfecaebb942518fe0 Mon Sep 17 00:00:00 2001 From: MichalKinas Date: Tue, 9 May 2023 11:07:41 +0200 Subject: [PATCH 1/6] [ACS-4538] Make folder-rules secondary entry point of aca-content --- .github/actions/publish-libs/npm-publish.sh | 1 - .../update-lib-versions.sh | 1 - .github/workflows/pull-request.yml | 1 - app/project.json | 6 +-- app/src/app/extensions.module.ts | 2 +- .../assets/folder-rules.plugin.json | 2 +- .../folder-rules}/assets/i18n/ar.json | 0 .../folder-rules}/assets/i18n/cs.json | 0 .../folder-rules}/assets/i18n/da.json | 0 .../folder-rules}/assets/i18n/de.json | 0 .../folder-rules}/assets/i18n/en.json | 0 .../folder-rules}/assets/i18n/es.json | 0 .../folder-rules}/assets/i18n/fi.json | 0 .../folder-rules}/assets/i18n/fr.json | 0 .../folder-rules}/assets/i18n/it.json | 0 .../folder-rules}/assets/i18n/ja.json | 0 .../folder-rules}/assets/i18n/nb.json | 0 .../folder-rules}/assets/i18n/nl.json | 0 .../folder-rules}/assets/i18n/pl.json | 0 .../folder-rules}/assets/i18n/pt-BR.json | 0 .../folder-rules}/assets/i18n/ru.json | 0 .../folder-rules}/assets/i18n/sv.json | 0 .../folder-rules}/assets/i18n/zh-CN.json | 0 .../aca-content/folder-rules/ng-package.json | 5 ++ .../folder-rules/src}/folder-rules.module.ts | 2 +- .../src}/folder-rules.rules.spec.ts | 0 .../folder-rules/src}/folder-rules.rules.ts | 0 .../manage-rules.smart-component.html | 0 .../manage-rules.smart-component.scss | 2 +- .../manage-rules.smart-component.spec.ts | 2 +- .../manage-rules.smart-component.ts | 0 .../mock/action-parameter-constraints.mock.ts | 0 .../folder-rules/src}/mock/actions.mock.ts | 0 .../folder-rules/src}/mock/conditions.mock.ts | 0 .../folder-rules/src}/mock/node.mock.ts | 0 .../folder-rules/src}/mock/rule-sets.mock.ts | 0 .../folder-rules/src}/mock/rules.mock.ts | 0 .../action-parameter-constraint.model.ts | 0 .../src}/model/rule-action.model.ts | 0 .../model/rule-composite-condition.model.ts | 0 .../src}/model/rule-grouping-item.model.ts | 0 .../folder-rules/src}/model/rule-set.model.ts | 0 .../src}/model/rule-simple-condition.model.ts | 0 .../folder-rules/src}/model/rule.model.ts | 0 .../folder-rules}/src/public-api.ts | 4 +- .../rule-action-list.ui-component.html | 0 .../rule-action-list.ui-component.scss | 0 .../rule-action-list.ui-component.spec.ts | 0 .../actions/rule-action-list.ui-component.ts | 0 .../actions/rule-action.ui-component.html | 0 .../actions/rule-action.ui-component.scss | 0 .../actions/rule-action.ui-component.spec.ts | 0 .../actions/rule-action.ui-component.ts | 0 ...rule-composite-condition.ui-component.html | 0 ...rule-composite-condition.ui-component.scss | 0 ...e-composite-condition.ui-component.spec.ts | 0 .../rule-composite-condition.ui-component.ts | 0 .../conditions/rule-condition-comparators.ts | 0 .../conditions/rule-condition-fields.ts | 0 .../conditions/rule-mime-types.ts | 0 .../rule-simple-condition.ui-component.html | 0 .../rule-simple-condition.ui-component.scss | 0 ...rule-simple-condition.ui-component.spec.ts | 0 .../rule-simple-condition.ui-component.ts | 0 .../edit-rule-dialog.smart-component.spec.ts | 0 .../edit-rule-dialog.ui-component.html | 0 .../edit-rule-dialog.ui-component.scss | 2 +- .../edit-rule-dialog.ui-component.ts | 0 .../options/rule-options.ui-component.html | 0 .../options/rule-options.ui-component.scss | 0 .../options/rule-options.ui-component.spec.ts | 0 .../options/rule-options.ui-component.ts | 0 .../rule-details.ui-component.html | 0 .../rule-details.ui-component.scss | 12 +++-- .../rule-details.ui-component.spec.ts | 0 .../rule-details/rule-details.ui-component.ts | 0 .../triggers/rule-triggers.ui-component.html | 0 .../rule-triggers.ui-component.spec.ts | 0 .../triggers/rule-triggers.ui-component.ts | 0 .../validators/rule-actions.validator.spec.ts | 0 .../validators/rule-actions.validator.ts | 0 .../rule-composite-condition.validator.ts | 0 .../rule-list-grouping.ui-component.html | 0 .../rule-list-grouping.ui-component.scss | 0 .../rule-list-grouping.ui-component.spec.ts | 2 +- .../rule-list-grouping.ui-component.ts | 0 .../rule-list-item.ui-component.html | 0 .../rule-list-item.ui-component.scss | 0 .../rule-list-item.ui-component.ts | 0 .../rule-list/rule-list.ui-component.html | 0 .../rule-list/rule-list.ui-component.scss | 0 .../rule-list/rule-list.ui-component.spec.ts | 0 .../rule-list/rule-list.ui-component.ts | 0 .../rule-set-picker.smart-component.html | 0 .../rule-set-picker.smart-component.scss | 0 .../rule-set-picker.smart-component.spec.ts | 0 .../rule-set-picker.smart-component.ts | 0 .../src}/services/actions.service.spec.ts | 0 .../src}/services/actions.service.ts | 0 .../services/folder-rule-sets.service.spec.ts | 0 .../src}/services/folder-rule-sets.service.ts | 0 .../services/folder-rules.service.spec.ts | 0 .../src}/services/folder-rules.service.ts | 0 projects/aca-content/ng-package.json | 1 + projects/aca-content/package.json | 14 ++++- .../aca-content/src/lib/aca-content.module.ts | 2 +- .../aca-content/src/lib/aca-content.routes.ts | 2 +- projects/aca-content/tsconfig.lib.json | 19 ++++++- projects/aca-content/tsconfig.lib.prod.json | 1 - projects/aca-folder-rules/.eslintrc.js | 23 -------- projects/aca-folder-rules/README.md | 9 ---- projects/aca-folder-rules/karma.conf.js | 15 ------ projects/aca-folder-rules/ng-package.json | 10 ---- projects/aca-folder-rules/package.json | 31 ----------- projects/aca-folder-rules/project.json | 54 ------------------- projects/aca-folder-rules/src/test.ts | 48 ----------------- projects/aca-folder-rules/tsconfig.lib.json | 25 --------- .../aca-folder-rules/tsconfig.lib.prod.json | 15 ------ .../aca-folder-rules/tsconfig.spec.adf.json | 16 ------ projects/aca-folder-rules/tsconfig.spec.json | 17 ------ tsconfig.adf.json | 4 +- tsconfig.json | 2 +- 122 files changed, 62 insertions(+), 290 deletions(-) rename projects/{aca-folder-rules => aca-content/folder-rules}/assets/folder-rules.plugin.json (97%) rename projects/{aca-folder-rules => aca-content/folder-rules}/assets/i18n/ar.json (100%) rename projects/{aca-folder-rules => aca-content/folder-rules}/assets/i18n/cs.json (100%) rename projects/{aca-folder-rules => aca-content/folder-rules}/assets/i18n/da.json (100%) rename projects/{aca-folder-rules => aca-content/folder-rules}/assets/i18n/de.json (100%) rename projects/{aca-folder-rules => aca-content/folder-rules}/assets/i18n/en.json (100%) rename projects/{aca-folder-rules => aca-content/folder-rules}/assets/i18n/es.json (100%) rename projects/{aca-folder-rules => aca-content/folder-rules}/assets/i18n/fi.json (100%) rename projects/{aca-folder-rules => aca-content/folder-rules}/assets/i18n/fr.json (100%) rename projects/{aca-folder-rules => aca-content/folder-rules}/assets/i18n/it.json (100%) rename projects/{aca-folder-rules => aca-content/folder-rules}/assets/i18n/ja.json (100%) rename projects/{aca-folder-rules => aca-content/folder-rules}/assets/i18n/nb.json (100%) rename projects/{aca-folder-rules => aca-content/folder-rules}/assets/i18n/nl.json (100%) rename projects/{aca-folder-rules => aca-content/folder-rules}/assets/i18n/pl.json (100%) rename projects/{aca-folder-rules => aca-content/folder-rules}/assets/i18n/pt-BR.json (100%) rename projects/{aca-folder-rules => aca-content/folder-rules}/assets/i18n/ru.json (100%) rename projects/{aca-folder-rules => aca-content/folder-rules}/assets/i18n/sv.json (100%) rename projects/{aca-folder-rules => aca-content/folder-rules}/assets/i18n/zh-CN.json (100%) create mode 100644 projects/aca-content/folder-rules/ng-package.json rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/folder-rules.module.ts (97%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/folder-rules.rules.spec.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/folder-rules.rules.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/manage-rules/manage-rules.smart-component.html (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/manage-rules/manage-rules.smart-component.scss (97%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/manage-rules/manage-rules.smart-component.spec.ts (99%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/manage-rules/manage-rules.smart-component.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/mock/action-parameter-constraints.mock.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/mock/actions.mock.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/mock/conditions.mock.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/mock/node.mock.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/mock/rule-sets.mock.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/mock/rules.mock.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/model/action-parameter-constraint.model.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/model/rule-action.model.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/model/rule-composite-condition.model.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/model/rule-grouping-item.model.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/model/rule-set.model.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/model/rule-simple-condition.model.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/model/rule.model.ts (100%) rename projects/{aca-folder-rules => aca-content/folder-rules}/src/public-api.ts (89%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/actions/rule-action-list.ui-component.html (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/actions/rule-action-list.ui-component.scss (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/actions/rule-action-list.ui-component.spec.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/actions/rule-action-list.ui-component.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/actions/rule-action.ui-component.html (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/actions/rule-action.ui-component.scss (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/actions/rule-action.ui-component.spec.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/actions/rule-action.ui-component.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/conditions/rule-composite-condition.ui-component.html (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/conditions/rule-composite-condition.ui-component.scss (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/conditions/rule-composite-condition.ui-component.spec.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/conditions/rule-composite-condition.ui-component.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/conditions/rule-condition-comparators.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/conditions/rule-condition-fields.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/conditions/rule-mime-types.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/conditions/rule-simple-condition.ui-component.html (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/conditions/rule-simple-condition.ui-component.scss (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/conditions/rule-simple-condition.ui-component.spec.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/conditions/rule-simple-condition.ui-component.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/edit-rule-dialog.smart-component.spec.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/edit-rule-dialog.ui-component.html (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/edit-rule-dialog.ui-component.scss (97%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/edit-rule-dialog.ui-component.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/options/rule-options.ui-component.html (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/options/rule-options.ui-component.scss (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/options/rule-options.ui-component.spec.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/options/rule-options.ui-component.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/rule-details.ui-component.html (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/rule-details.ui-component.scss (86%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/rule-details.ui-component.spec.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/rule-details.ui-component.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/triggers/rule-triggers.ui-component.html (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/triggers/rule-triggers.ui-component.spec.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/triggers/rule-triggers.ui-component.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/validators/rule-actions.validator.spec.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/validators/rule-actions.validator.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-details/validators/rule-composite-condition.validator.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-list/rule-list-grouping/rule-list-grouping.ui-component.html (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-list/rule-list-grouping/rule-list-grouping.ui-component.scss (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-list/rule-list-grouping/rule-list-grouping.ui-component.spec.ts (97%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-list/rule-list-grouping/rule-list-grouping.ui-component.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-list/rule-list-item/rule-list-item.ui-component.html (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-list/rule-list-item/rule-list-item.ui-component.scss (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-list/rule-list-item/rule-list-item.ui-component.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-list/rule-list/rule-list.ui-component.html (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-list/rule-list/rule-list.ui-component.scss (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-list/rule-list/rule-list.ui-component.spec.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-list/rule-list/rule-list.ui-component.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-set-picker/rule-set-picker.smart-component.html (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-set-picker/rule-set-picker.smart-component.scss (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-set-picker/rule-set-picker.smart-component.spec.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/rule-set-picker/rule-set-picker.smart-component.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/services/actions.service.spec.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/services/actions.service.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/services/folder-rule-sets.service.spec.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/services/folder-rule-sets.service.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/services/folder-rules.service.spec.ts (100%) rename projects/{aca-folder-rules/src/lib => aca-content/folder-rules/src}/services/folder-rules.service.ts (100%) delete mode 100644 projects/aca-folder-rules/.eslintrc.js delete mode 100644 projects/aca-folder-rules/README.md delete mode 100644 projects/aca-folder-rules/karma.conf.js delete mode 100644 projects/aca-folder-rules/ng-package.json delete mode 100644 projects/aca-folder-rules/package.json delete mode 100644 projects/aca-folder-rules/project.json delete mode 100644 projects/aca-folder-rules/src/test.ts delete mode 100644 projects/aca-folder-rules/tsconfig.lib.json delete mode 100644 projects/aca-folder-rules/tsconfig.lib.prod.json delete mode 100644 projects/aca-folder-rules/tsconfig.spec.adf.json delete mode 100644 projects/aca-folder-rules/tsconfig.spec.json diff --git a/.github/actions/publish-libs/npm-publish.sh b/.github/actions/publish-libs/npm-publish.sh index 65627e1adb..49b97a2327 100755 --- a/.github/actions/publish-libs/npm-publish.sh +++ b/.github/actions/publish-libs/npm-publish.sh @@ -12,7 +12,6 @@ fi export PROJECTS=( 'aca-content' - 'aca-folder-rules' 'aca-preview' 'aca-shared' 'aca-viewer' diff --git a/.github/actions/update-library-versions/update-lib-versions.sh b/.github/actions/update-library-versions/update-lib-versions.sh index b570e60362..5b983fabc4 100755 --- a/.github/actions/update-library-versions/update-lib-versions.sh +++ b/.github/actions/update-library-versions/update-lib-versions.sh @@ -11,7 +11,6 @@ fi export PROJECTS=( 'aca-content' - 'aca-folder-rules' 'aca-preview' 'aca-shared' 'aca-viewer' diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 4b65f5bea9..5a81c34158 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -96,7 +96,6 @@ jobs: unit-tests: - name: "aca-content" - name: "aca-shared" - - name: "aca-folder-rules" - name: "aca-preview" steps: - name: Checkout diff --git a/app/project.json b/app/project.json index a19f1e575c..b90c7fddad 100644 --- a/app/project.json +++ b/app/project.json @@ -79,13 +79,13 @@ }, { "glob": "folder-rules.plugin.json", - "input": "projects/aca-folder-rules/assets", + "input": "projects/aca-content/folder-rules/assets", "output": "./assets/plugins" }, { "glob": "**/*", - "input": "projects/aca-folder-rules/assets", - "output": "./assets/aca-folder-rules" + "input": "projects/aca-content/folder-rules/assets", + "output": "./assets/folder-rules" }, { "glob": "**/*", diff --git a/app/src/app/extensions.module.ts b/app/src/app/extensions.module.ts index 9f63703f97..7c08b6c7d1 100644 --- a/app/src/app/extensions.module.ts +++ b/app/src/app/extensions.module.ts @@ -23,9 +23,9 @@ */ import { NgModule } from '@angular/core'; +import { AcaFolderRulesModule } from '@alfresco/aca-content/folder-rules'; import { AosExtensionModule } from '@alfresco/aca-content/ms-office'; import { AcaAboutModule, DEV_MODE_TOKEN, PACKAGE_JSON } from '@alfresco/aca-content/about'; -import { AcaFolderRulesModule } from '@alfresco/aca-folder-rules'; import { environment } from '../environments/environment'; import packageJson from 'package.json'; diff --git a/projects/aca-folder-rules/assets/folder-rules.plugin.json b/projects/aca-content/folder-rules/assets/folder-rules.plugin.json similarity index 97% rename from projects/aca-folder-rules/assets/folder-rules.plugin.json rename to projects/aca-content/folder-rules/assets/folder-rules.plugin.json index a3845283a3..c653eedbba 100644 --- a/projects/aca-folder-rules/assets/folder-rules.plugin.json +++ b/projects/aca-content/folder-rules/assets/folder-rules.plugin.json @@ -1,5 +1,5 @@ { - "$schema": "../../../extension.schema.json", + "$schema": "../../../../extension.schema.json", "$id": "0455ca6c-cc7a-43ae-bbf7-35795413d2dd", "$name": "Folder Rules Plugin", "$version": "0.0.1", diff --git a/projects/aca-folder-rules/assets/i18n/ar.json b/projects/aca-content/folder-rules/assets/i18n/ar.json similarity index 100% rename from projects/aca-folder-rules/assets/i18n/ar.json rename to projects/aca-content/folder-rules/assets/i18n/ar.json diff --git a/projects/aca-folder-rules/assets/i18n/cs.json b/projects/aca-content/folder-rules/assets/i18n/cs.json similarity index 100% rename from projects/aca-folder-rules/assets/i18n/cs.json rename to projects/aca-content/folder-rules/assets/i18n/cs.json diff --git a/projects/aca-folder-rules/assets/i18n/da.json b/projects/aca-content/folder-rules/assets/i18n/da.json similarity index 100% rename from projects/aca-folder-rules/assets/i18n/da.json rename to projects/aca-content/folder-rules/assets/i18n/da.json diff --git a/projects/aca-folder-rules/assets/i18n/de.json b/projects/aca-content/folder-rules/assets/i18n/de.json similarity index 100% rename from projects/aca-folder-rules/assets/i18n/de.json rename to projects/aca-content/folder-rules/assets/i18n/de.json diff --git a/projects/aca-folder-rules/assets/i18n/en.json b/projects/aca-content/folder-rules/assets/i18n/en.json similarity index 100% rename from projects/aca-folder-rules/assets/i18n/en.json rename to projects/aca-content/folder-rules/assets/i18n/en.json diff --git a/projects/aca-folder-rules/assets/i18n/es.json b/projects/aca-content/folder-rules/assets/i18n/es.json similarity index 100% rename from projects/aca-folder-rules/assets/i18n/es.json rename to projects/aca-content/folder-rules/assets/i18n/es.json diff --git a/projects/aca-folder-rules/assets/i18n/fi.json b/projects/aca-content/folder-rules/assets/i18n/fi.json similarity index 100% rename from projects/aca-folder-rules/assets/i18n/fi.json rename to projects/aca-content/folder-rules/assets/i18n/fi.json diff --git a/projects/aca-folder-rules/assets/i18n/fr.json b/projects/aca-content/folder-rules/assets/i18n/fr.json similarity index 100% rename from projects/aca-folder-rules/assets/i18n/fr.json rename to projects/aca-content/folder-rules/assets/i18n/fr.json diff --git a/projects/aca-folder-rules/assets/i18n/it.json b/projects/aca-content/folder-rules/assets/i18n/it.json similarity index 100% rename from projects/aca-folder-rules/assets/i18n/it.json rename to projects/aca-content/folder-rules/assets/i18n/it.json diff --git a/projects/aca-folder-rules/assets/i18n/ja.json b/projects/aca-content/folder-rules/assets/i18n/ja.json similarity index 100% rename from projects/aca-folder-rules/assets/i18n/ja.json rename to projects/aca-content/folder-rules/assets/i18n/ja.json diff --git a/projects/aca-folder-rules/assets/i18n/nb.json b/projects/aca-content/folder-rules/assets/i18n/nb.json similarity index 100% rename from projects/aca-folder-rules/assets/i18n/nb.json rename to projects/aca-content/folder-rules/assets/i18n/nb.json diff --git a/projects/aca-folder-rules/assets/i18n/nl.json b/projects/aca-content/folder-rules/assets/i18n/nl.json similarity index 100% rename from projects/aca-folder-rules/assets/i18n/nl.json rename to projects/aca-content/folder-rules/assets/i18n/nl.json diff --git a/projects/aca-folder-rules/assets/i18n/pl.json b/projects/aca-content/folder-rules/assets/i18n/pl.json similarity index 100% rename from projects/aca-folder-rules/assets/i18n/pl.json rename to projects/aca-content/folder-rules/assets/i18n/pl.json diff --git a/projects/aca-folder-rules/assets/i18n/pt-BR.json b/projects/aca-content/folder-rules/assets/i18n/pt-BR.json similarity index 100% rename from projects/aca-folder-rules/assets/i18n/pt-BR.json rename to projects/aca-content/folder-rules/assets/i18n/pt-BR.json diff --git a/projects/aca-folder-rules/assets/i18n/ru.json b/projects/aca-content/folder-rules/assets/i18n/ru.json similarity index 100% rename from projects/aca-folder-rules/assets/i18n/ru.json rename to projects/aca-content/folder-rules/assets/i18n/ru.json diff --git a/projects/aca-folder-rules/assets/i18n/sv.json b/projects/aca-content/folder-rules/assets/i18n/sv.json similarity index 100% rename from projects/aca-folder-rules/assets/i18n/sv.json rename to projects/aca-content/folder-rules/assets/i18n/sv.json diff --git a/projects/aca-folder-rules/assets/i18n/zh-CN.json b/projects/aca-content/folder-rules/assets/i18n/zh-CN.json similarity index 100% rename from projects/aca-folder-rules/assets/i18n/zh-CN.json rename to projects/aca-content/folder-rules/assets/i18n/zh-CN.json diff --git a/projects/aca-content/folder-rules/ng-package.json b/projects/aca-content/folder-rules/ng-package.json new file mode 100644 index 0000000000..fbafcc4448 --- /dev/null +++ b/projects/aca-content/folder-rules/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "src/public-api.ts" + } +} diff --git a/projects/aca-folder-rules/src/lib/folder-rules.module.ts b/projects/aca-content/folder-rules/src/folder-rules.module.ts similarity index 97% rename from projects/aca-folder-rules/src/lib/folder-rules.module.ts rename to projects/aca-content/folder-rules/src/folder-rules.module.ts index 6d17ea7206..d888af5429 100644 --- a/projects/aca-folder-rules/src/lib/folder-rules.module.ts +++ b/projects/aca-content/folder-rules/src/folder-rules.module.ts @@ -82,7 +82,7 @@ const routes: Routes = [ }) export class AcaFolderRulesModule { constructor(translation: TranslationService, extensions: ExtensionService) { - translation.addTranslationFolder('aca-folder-rules', 'assets/aca-folder-rules'); + translation.addTranslationFolder('folder-rules', 'assets/folder-rules'); extensions.setEvaluators({ 'rules.canManageFolderRules': rules.canManageFolderRules diff --git a/projects/aca-folder-rules/src/lib/folder-rules.rules.spec.ts b/projects/aca-content/folder-rules/src/folder-rules.rules.spec.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/folder-rules.rules.spec.ts rename to projects/aca-content/folder-rules/src/folder-rules.rules.spec.ts diff --git a/projects/aca-folder-rules/src/lib/folder-rules.rules.ts b/projects/aca-content/folder-rules/src/folder-rules.rules.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/folder-rules.rules.ts rename to projects/aca-content/folder-rules/src/folder-rules.rules.ts diff --git a/projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.html b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.html similarity index 100% rename from projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.html rename to projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.html diff --git a/projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.scss b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.scss similarity index 97% rename from projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.scss rename to projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.scss index 20037426df..8e3c941e97 100644 --- a/projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.scss +++ b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.scss @@ -34,7 +34,7 @@ &__container { display: grid; - grid-template-columns: minmax(250px,1fr) 3fr; + grid-template-columns: minmax(250px, 1fr) 3fr; padding: 20px; gap: 12px; overflow-y: auto; diff --git a/projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.spec.ts b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.spec.ts similarity index 99% rename from projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.spec.ts rename to projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.spec.ts index 14593c8846..5b0ce925da 100644 --- a/projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.spec.ts +++ b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.spec.ts @@ -23,7 +23,7 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { AcaFolderRulesModule, ManageRulesSmartComponent } from '@alfresco/aca-folder-rules'; +import { AcaFolderRulesModule, ManageRulesSmartComponent } from '@alfresco/aca-content/folder-rules'; import { DebugElement, Predicate } from '@angular/core'; import { CoreTestingModule } from '@alfresco/adf-core'; import { FolderRulesService } from '../services/folder-rules.service'; diff --git a/projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.ts b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.ts rename to projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.ts diff --git a/projects/aca-folder-rules/src/lib/mock/action-parameter-constraints.mock.ts b/projects/aca-content/folder-rules/src/mock/action-parameter-constraints.mock.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/mock/action-parameter-constraints.mock.ts rename to projects/aca-content/folder-rules/src/mock/action-parameter-constraints.mock.ts diff --git a/projects/aca-folder-rules/src/lib/mock/actions.mock.ts b/projects/aca-content/folder-rules/src/mock/actions.mock.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/mock/actions.mock.ts rename to projects/aca-content/folder-rules/src/mock/actions.mock.ts diff --git a/projects/aca-folder-rules/src/lib/mock/conditions.mock.ts b/projects/aca-content/folder-rules/src/mock/conditions.mock.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/mock/conditions.mock.ts rename to projects/aca-content/folder-rules/src/mock/conditions.mock.ts diff --git a/projects/aca-folder-rules/src/lib/mock/node.mock.ts b/projects/aca-content/folder-rules/src/mock/node.mock.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/mock/node.mock.ts rename to projects/aca-content/folder-rules/src/mock/node.mock.ts diff --git a/projects/aca-folder-rules/src/lib/mock/rule-sets.mock.ts b/projects/aca-content/folder-rules/src/mock/rule-sets.mock.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/mock/rule-sets.mock.ts rename to projects/aca-content/folder-rules/src/mock/rule-sets.mock.ts diff --git a/projects/aca-folder-rules/src/lib/mock/rules.mock.ts b/projects/aca-content/folder-rules/src/mock/rules.mock.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/mock/rules.mock.ts rename to projects/aca-content/folder-rules/src/mock/rules.mock.ts diff --git a/projects/aca-folder-rules/src/lib/model/action-parameter-constraint.model.ts b/projects/aca-content/folder-rules/src/model/action-parameter-constraint.model.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/model/action-parameter-constraint.model.ts rename to projects/aca-content/folder-rules/src/model/action-parameter-constraint.model.ts diff --git a/projects/aca-folder-rules/src/lib/model/rule-action.model.ts b/projects/aca-content/folder-rules/src/model/rule-action.model.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/model/rule-action.model.ts rename to projects/aca-content/folder-rules/src/model/rule-action.model.ts diff --git a/projects/aca-folder-rules/src/lib/model/rule-composite-condition.model.ts b/projects/aca-content/folder-rules/src/model/rule-composite-condition.model.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/model/rule-composite-condition.model.ts rename to projects/aca-content/folder-rules/src/model/rule-composite-condition.model.ts diff --git a/projects/aca-folder-rules/src/lib/model/rule-grouping-item.model.ts b/projects/aca-content/folder-rules/src/model/rule-grouping-item.model.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/model/rule-grouping-item.model.ts rename to projects/aca-content/folder-rules/src/model/rule-grouping-item.model.ts diff --git a/projects/aca-folder-rules/src/lib/model/rule-set.model.ts b/projects/aca-content/folder-rules/src/model/rule-set.model.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/model/rule-set.model.ts rename to projects/aca-content/folder-rules/src/model/rule-set.model.ts diff --git a/projects/aca-folder-rules/src/lib/model/rule-simple-condition.model.ts b/projects/aca-content/folder-rules/src/model/rule-simple-condition.model.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/model/rule-simple-condition.model.ts rename to projects/aca-content/folder-rules/src/model/rule-simple-condition.model.ts diff --git a/projects/aca-folder-rules/src/lib/model/rule.model.ts b/projects/aca-content/folder-rules/src/model/rule.model.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/model/rule.model.ts rename to projects/aca-content/folder-rules/src/model/rule.model.ts diff --git a/projects/aca-folder-rules/src/public-api.ts b/projects/aca-content/folder-rules/src/public-api.ts similarity index 89% rename from projects/aca-folder-rules/src/public-api.ts rename to projects/aca-content/folder-rules/src/public-api.ts index 0a9f4273f2..1db452bcfc 100644 --- a/projects/aca-folder-rules/src/public-api.ts +++ b/projects/aca-content/folder-rules/src/public-api.ts @@ -22,5 +22,5 @@ * from Hyland Software. If not, see . */ -export * from './lib/folder-rules.module'; -export { ManageRulesSmartComponent } from './lib/manage-rules/manage-rules.smart-component'; +export * from './folder-rules.module'; +export { ManageRulesSmartComponent } from './manage-rules/manage-rules.smart-component'; diff --git a/projects/aca-folder-rules/src/lib/rule-details/actions/rule-action-list.ui-component.html b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.html similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/actions/rule-action-list.ui-component.html rename to projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.html diff --git a/projects/aca-folder-rules/src/lib/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 similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/actions/rule-action-list.ui-component.scss rename to projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.scss diff --git a/projects/aca-folder-rules/src/lib/rule-details/actions/rule-action-list.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.spec.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/actions/rule-action-list.ui-component.spec.ts rename to projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.spec.ts diff --git a/projects/aca-folder-rules/src/lib/rule-details/actions/rule-action-list.ui-component.ts b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/actions/rule-action-list.ui-component.ts rename to projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.ts diff --git a/projects/aca-folder-rules/src/lib/rule-details/actions/rule-action.ui-component.html b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.html similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/actions/rule-action.ui-component.html rename to projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.html diff --git a/projects/aca-folder-rules/src/lib/rule-details/actions/rule-action.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.scss similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/actions/rule-action.ui-component.scss rename to projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.scss diff --git a/projects/aca-folder-rules/src/lib/rule-details/actions/rule-action.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.spec.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/actions/rule-action.ui-component.spec.ts rename to projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.spec.ts diff --git a/projects/aca-folder-rules/src/lib/rule-details/actions/rule-action.ui-component.ts b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/actions/rule-action.ui-component.ts rename to projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.ts diff --git a/projects/aca-folder-rules/src/lib/rule-details/conditions/rule-composite-condition.ui-component.html b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.html similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/conditions/rule-composite-condition.ui-component.html rename to projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.html diff --git a/projects/aca-folder-rules/src/lib/rule-details/conditions/rule-composite-condition.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.scss similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/conditions/rule-composite-condition.ui-component.scss rename to projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.scss diff --git a/projects/aca-folder-rules/src/lib/rule-details/conditions/rule-composite-condition.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.spec.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/conditions/rule-composite-condition.ui-component.spec.ts rename to projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.spec.ts diff --git a/projects/aca-folder-rules/src/lib/rule-details/conditions/rule-composite-condition.ui-component.ts b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/conditions/rule-composite-condition.ui-component.ts rename to projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.ts diff --git a/projects/aca-folder-rules/src/lib/rule-details/conditions/rule-condition-comparators.ts b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-condition-comparators.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/conditions/rule-condition-comparators.ts rename to projects/aca-content/folder-rules/src/rule-details/conditions/rule-condition-comparators.ts diff --git a/projects/aca-folder-rules/src/lib/rule-details/conditions/rule-condition-fields.ts b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-condition-fields.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/conditions/rule-condition-fields.ts rename to projects/aca-content/folder-rules/src/rule-details/conditions/rule-condition-fields.ts diff --git a/projects/aca-folder-rules/src/lib/rule-details/conditions/rule-mime-types.ts b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-mime-types.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/conditions/rule-mime-types.ts rename to projects/aca-content/folder-rules/src/rule-details/conditions/rule-mime-types.ts diff --git a/projects/aca-folder-rules/src/lib/rule-details/conditions/rule-simple-condition.ui-component.html b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.html similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/conditions/rule-simple-condition.ui-component.html rename to projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.html diff --git a/projects/aca-folder-rules/src/lib/rule-details/conditions/rule-simple-condition.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.scss similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/conditions/rule-simple-condition.ui-component.scss rename to projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.scss diff --git a/projects/aca-folder-rules/src/lib/rule-details/conditions/rule-simple-condition.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.spec.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/conditions/rule-simple-condition.ui-component.spec.ts rename to projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.spec.ts diff --git a/projects/aca-folder-rules/src/lib/rule-details/conditions/rule-simple-condition.ui-component.ts b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/conditions/rule-simple-condition.ui-component.ts rename to projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.ts diff --git a/projects/aca-folder-rules/src/lib/rule-details/edit-rule-dialog.smart-component.spec.ts b/projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.smart-component.spec.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/edit-rule-dialog.smart-component.spec.ts rename to projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.smart-component.spec.ts diff --git a/projects/aca-folder-rules/src/lib/rule-details/edit-rule-dialog.ui-component.html b/projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.ui-component.html similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/edit-rule-dialog.ui-component.html rename to projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.ui-component.html diff --git a/projects/aca-folder-rules/src/lib/rule-details/edit-rule-dialog.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.ui-component.scss similarity index 97% rename from projects/aca-folder-rules/src/lib/rule-details/edit-rule-dialog.ui-component.scss rename to projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.ui-component.scss index 34344e4f81..a24044e643 100644 --- a/projects/aca-folder-rules/src/lib/rule-details/edit-rule-dialog.ui-component.scss +++ b/projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.ui-component.scss @@ -36,7 +36,7 @@ display: flex; align-items: center; justify-content: center; - margin: 20px 0 + margin: 20px 0; } } diff --git a/projects/aca-folder-rules/src/lib/rule-details/edit-rule-dialog.ui-component.ts b/projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.ui-component.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/edit-rule-dialog.ui-component.ts rename to projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.ui-component.ts diff --git a/projects/aca-folder-rules/src/lib/rule-details/options/rule-options.ui-component.html b/projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.html similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/options/rule-options.ui-component.html rename to projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.html diff --git a/projects/aca-folder-rules/src/lib/rule-details/options/rule-options.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.scss similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/options/rule-options.ui-component.scss rename to projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.scss diff --git a/projects/aca-folder-rules/src/lib/rule-details/options/rule-options.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.spec.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/options/rule-options.ui-component.spec.ts rename to projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.spec.ts diff --git a/projects/aca-folder-rules/src/lib/rule-details/options/rule-options.ui-component.ts b/projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/options/rule-options.ui-component.ts rename to projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.ts diff --git a/projects/aca-folder-rules/src/lib/rule-details/rule-details.ui-component.html b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.html similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/rule-details.ui-component.html rename to projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.html diff --git a/projects/aca-folder-rules/src/lib/rule-details/rule-details.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.scss similarity index 86% rename from projects/aca-folder-rules/src/lib/rule-details/rule-details.ui-component.scss rename to projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.scss index 752a92aeab..0661eaca37 100644 --- a/projects/aca-folder-rules/src/lib/rule-details/rule-details.ui-component.scss +++ b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.scss @@ -24,7 +24,8 @@ align-items: baseline; gap: 8px; - & > label, & > .label { + & > label, + & > .label { font-weight: bold; width: 20%; min-width: 100px; @@ -75,12 +76,15 @@ } } - &.read-only, .mat-form-field-disabled { - .mat-form-field-underline, .mat-select-arrow-wrapper { + &.read-only, + .mat-form-field-disabled { + .mat-form-field-underline, + .mat-select-arrow-wrapper { display: none; } - *:disabled, .mat-select-disabled .mat-select-value { + *:disabled, + .mat-select-disabled .mat-select-value { color: inherit; } } diff --git a/projects/aca-folder-rules/src/lib/rule-details/rule-details.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.spec.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/rule-details.ui-component.spec.ts rename to projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.spec.ts diff --git a/projects/aca-folder-rules/src/lib/rule-details/rule-details.ui-component.ts b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/rule-details.ui-component.ts rename to projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.ts diff --git a/projects/aca-folder-rules/src/lib/rule-details/triggers/rule-triggers.ui-component.html b/projects/aca-content/folder-rules/src/rule-details/triggers/rule-triggers.ui-component.html similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/triggers/rule-triggers.ui-component.html rename to projects/aca-content/folder-rules/src/rule-details/triggers/rule-triggers.ui-component.html diff --git a/projects/aca-folder-rules/src/lib/rule-details/triggers/rule-triggers.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-details/triggers/rule-triggers.ui-component.spec.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/triggers/rule-triggers.ui-component.spec.ts rename to projects/aca-content/folder-rules/src/rule-details/triggers/rule-triggers.ui-component.spec.ts diff --git a/projects/aca-folder-rules/src/lib/rule-details/triggers/rule-triggers.ui-component.ts b/projects/aca-content/folder-rules/src/rule-details/triggers/rule-triggers.ui-component.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/triggers/rule-triggers.ui-component.ts rename to projects/aca-content/folder-rules/src/rule-details/triggers/rule-triggers.ui-component.ts diff --git a/projects/aca-folder-rules/src/lib/rule-details/validators/rule-actions.validator.spec.ts b/projects/aca-content/folder-rules/src/rule-details/validators/rule-actions.validator.spec.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/validators/rule-actions.validator.spec.ts rename to projects/aca-content/folder-rules/src/rule-details/validators/rule-actions.validator.spec.ts diff --git a/projects/aca-folder-rules/src/lib/rule-details/validators/rule-actions.validator.ts b/projects/aca-content/folder-rules/src/rule-details/validators/rule-actions.validator.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/validators/rule-actions.validator.ts rename to projects/aca-content/folder-rules/src/rule-details/validators/rule-actions.validator.ts diff --git a/projects/aca-folder-rules/src/lib/rule-details/validators/rule-composite-condition.validator.ts b/projects/aca-content/folder-rules/src/rule-details/validators/rule-composite-condition.validator.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-details/validators/rule-composite-condition.validator.ts rename to projects/aca-content/folder-rules/src/rule-details/validators/rule-composite-condition.validator.ts diff --git a/projects/aca-folder-rules/src/lib/rule-list/rule-list-grouping/rule-list-grouping.ui-component.html b/projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.html similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-list/rule-list-grouping/rule-list-grouping.ui-component.html rename to projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.html diff --git a/projects/aca-folder-rules/src/lib/rule-list/rule-list-grouping/rule-list-grouping.ui-component.scss b/projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.scss similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-list/rule-list-grouping/rule-list-grouping.ui-component.scss rename to projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.scss diff --git a/projects/aca-folder-rules/src/lib/rule-list/rule-list-grouping/rule-list-grouping.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.spec.ts similarity index 97% rename from projects/aca-folder-rules/src/lib/rule-list/rule-list-grouping/rule-list-grouping.ui-component.spec.ts rename to projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.spec.ts index 4f8d42d85b..0aaeaae5e2 100644 --- a/projects/aca-folder-rules/src/lib/rule-list/rule-list-grouping/rule-list-grouping.ui-component.spec.ts +++ b/projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.spec.ts @@ -28,7 +28,7 @@ import { ruleListGroupingItemsMock, rulesMock } from '../../mock/rules.mock'; import { DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; import { CoreTestingModule } from '@alfresco/adf-core'; -import { AcaFolderRulesModule } from '@alfresco/aca-folder-rules'; +import { AcaFolderRulesModule } from '@alfresco/aca-content/folder-rules'; describe('RuleListGroupingUiComponent', () => { let component: RuleListGroupingUiComponent; diff --git a/projects/aca-folder-rules/src/lib/rule-list/rule-list-grouping/rule-list-grouping.ui-component.ts b/projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-list/rule-list-grouping/rule-list-grouping.ui-component.ts rename to projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.ts diff --git a/projects/aca-folder-rules/src/lib/rule-list/rule-list-item/rule-list-item.ui-component.html b/projects/aca-content/folder-rules/src/rule-list/rule-list-item/rule-list-item.ui-component.html similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-list/rule-list-item/rule-list-item.ui-component.html rename to projects/aca-content/folder-rules/src/rule-list/rule-list-item/rule-list-item.ui-component.html diff --git a/projects/aca-folder-rules/src/lib/rule-list/rule-list-item/rule-list-item.ui-component.scss b/projects/aca-content/folder-rules/src/rule-list/rule-list-item/rule-list-item.ui-component.scss similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-list/rule-list-item/rule-list-item.ui-component.scss rename to projects/aca-content/folder-rules/src/rule-list/rule-list-item/rule-list-item.ui-component.scss diff --git a/projects/aca-folder-rules/src/lib/rule-list/rule-list-item/rule-list-item.ui-component.ts b/projects/aca-content/folder-rules/src/rule-list/rule-list-item/rule-list-item.ui-component.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-list/rule-list-item/rule-list-item.ui-component.ts rename to projects/aca-content/folder-rules/src/rule-list/rule-list-item/rule-list-item.ui-component.ts diff --git a/projects/aca-folder-rules/src/lib/rule-list/rule-list/rule-list.ui-component.html b/projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.html similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-list/rule-list/rule-list.ui-component.html rename to projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.html diff --git a/projects/aca-folder-rules/src/lib/rule-list/rule-list/rule-list.ui-component.scss b/projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.scss similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-list/rule-list/rule-list.ui-component.scss rename to projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.scss diff --git a/projects/aca-folder-rules/src/lib/rule-list/rule-list/rule-list.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.spec.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-list/rule-list/rule-list.ui-component.spec.ts rename to projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.spec.ts diff --git a/projects/aca-folder-rules/src/lib/rule-list/rule-list/rule-list.ui-component.ts b/projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-list/rule-list/rule-list.ui-component.ts rename to projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.ts diff --git a/projects/aca-folder-rules/src/lib/rule-set-picker/rule-set-picker.smart-component.html b/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.html similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-set-picker/rule-set-picker.smart-component.html rename to projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.html diff --git a/projects/aca-folder-rules/src/lib/rule-set-picker/rule-set-picker.smart-component.scss b/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.scss similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-set-picker/rule-set-picker.smart-component.scss rename to projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.scss diff --git a/projects/aca-folder-rules/src/lib/rule-set-picker/rule-set-picker.smart-component.spec.ts b/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.spec.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-set-picker/rule-set-picker.smart-component.spec.ts rename to projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.spec.ts diff --git a/projects/aca-folder-rules/src/lib/rule-set-picker/rule-set-picker.smart-component.ts b/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/rule-set-picker/rule-set-picker.smart-component.ts rename to projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.ts diff --git a/projects/aca-folder-rules/src/lib/services/actions.service.spec.ts b/projects/aca-content/folder-rules/src/services/actions.service.spec.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/services/actions.service.spec.ts rename to projects/aca-content/folder-rules/src/services/actions.service.spec.ts diff --git a/projects/aca-folder-rules/src/lib/services/actions.service.ts b/projects/aca-content/folder-rules/src/services/actions.service.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/services/actions.service.ts rename to projects/aca-content/folder-rules/src/services/actions.service.ts diff --git a/projects/aca-folder-rules/src/lib/services/folder-rule-sets.service.spec.ts b/projects/aca-content/folder-rules/src/services/folder-rule-sets.service.spec.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/services/folder-rule-sets.service.spec.ts rename to projects/aca-content/folder-rules/src/services/folder-rule-sets.service.spec.ts diff --git a/projects/aca-folder-rules/src/lib/services/folder-rule-sets.service.ts b/projects/aca-content/folder-rules/src/services/folder-rule-sets.service.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/services/folder-rule-sets.service.ts rename to projects/aca-content/folder-rules/src/services/folder-rule-sets.service.ts diff --git a/projects/aca-folder-rules/src/lib/services/folder-rules.service.spec.ts b/projects/aca-content/folder-rules/src/services/folder-rules.service.spec.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/services/folder-rules.service.spec.ts rename to projects/aca-content/folder-rules/src/services/folder-rules.service.spec.ts diff --git a/projects/aca-folder-rules/src/lib/services/folder-rules.service.ts b/projects/aca-content/folder-rules/src/services/folder-rules.service.ts similarity index 100% rename from projects/aca-folder-rules/src/lib/services/folder-rules.service.ts rename to projects/aca-content/folder-rules/src/services/folder-rules.service.ts diff --git a/projects/aca-content/ng-package.json b/projects/aca-content/ng-package.json index 893f210ec4..ddb6ac1726 100644 --- a/projects/aca-content/ng-package.json +++ b/projects/aca-content/ng-package.json @@ -11,6 +11,7 @@ "input": "./src/lib/ui/", "output": "ui" }, + "folder-rules/assets", "about/assets", "ms-office/assets", "assets" diff --git a/projects/aca-content/package.json b/projects/aca-content/package.json index eabdddfc85..72517884eb 100644 --- a/projects/aca-content/package.json +++ b/projects/aca-content/package.json @@ -4,7 +4,19 @@ "license": "LGPL-3.0", "peerDependencies": { "@angular/common": "^14.1.0", - "@angular/core": "^14.1.0" + "@angular/core": "^14.1.0", + "@alfresco/adf-core": "6.1.0-4893268711", + "@alfresco/adf-content-services": "6.1.0-4893268711", + "@alfresco/adf-extensions": "6.1.0-4893268711", + "@alfresco/js-api": "6.0.0", + "@angular/animations": "^14.1.3", + "@angular/cdk": "^14.1.3", + "@angular/flex-layout": "^14.0.0-beta.40", + "@angular/forms": "^14.1.3", + "@angular/material": "^14.1.3", + "@ngx-translate/core": "^14.0.0", + "rxjs": "6.6.6", + "zone.js": "0.11.8" }, "dependencies": { "tslib": "^2.3.0" diff --git a/projects/aca-content/src/lib/aca-content.module.ts b/projects/aca-content/src/lib/aca-content.module.ts index 6916b8e6a1..ac48d850a6 100644 --- a/projects/aca-content/src/lib/aca-content.module.ts +++ b/projects/aca-content/src/lib/aca-content.module.ts @@ -89,7 +89,7 @@ import { CONTENT_ROUTES } from './aca-content.routes'; import { RouterModule } from '@angular/router'; import { UploadFilesDialogComponent } from './components/upload-files-dialog/upload-files-dialog.component'; import { AppSharedLinkViewModule } from './components/shared-link-view/shared-link-view.module'; -import { AcaFolderRulesModule } from '@alfresco/aca-folder-rules'; +import { AcaFolderRulesModule } from '@alfresco/aca-content/folder-rules'; import { TagsColumnComponent } from './components/dl-custom-components/tags-column/tags-column.component'; import { UserInfoComponent } from './components/common/user-info/user-info.component'; import { SidenavComponent } from './components/sidenav/sidenav.component'; diff --git a/projects/aca-content/src/lib/aca-content.routes.ts b/projects/aca-content/src/lib/aca-content.routes.ts index 56cc534813..3c720c96ba 100644 --- a/projects/aca-content/src/lib/aca-content.routes.ts +++ b/projects/aca-content/src/lib/aca-content.routes.ts @@ -571,7 +571,7 @@ export const CONTENT_LAYOUT_ROUTES: Route = { children: [ { path: '', - loadChildren: () => import('@alfresco/aca-folder-rules').then((m) => m.AcaFolderRulesModule) + loadChildren: () => import('@alfresco/aca-content/folder-rules').then((m) => m.AcaFolderRulesModule) } ] }, diff --git a/projects/aca-content/tsconfig.lib.json b/projects/aca-content/tsconfig.lib.json index 8532fb4c6c..5b863a5b8d 100644 --- a/projects/aca-content/tsconfig.lib.json +++ b/projects/aca-content/tsconfig.lib.json @@ -3,10 +3,27 @@ "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "../../out-tsc/lib", + "target": "es2020", + "moduleResolution": "node", + "sourceMap": true, "declaration": true, "declarationMap": true, "inlineSources": true, - "types": [] + "emitDecoratorMetadata": true, + "experimentalDecorators": true, + "importHelpers": true, + "types": [], + "lib": [ + "dom", + "es2020" + ] + }, + "angularCompilerOptions": { + "skipTemplateCodegen": true, + "strictMetadataEmit": true, + "enableResourceInlining": true, + "fullTemplateTypeCheck": true, + "strictInjectionParameters": true }, "exclude": [ "test.ts", diff --git a/projects/aca-content/tsconfig.lib.prod.json b/projects/aca-content/tsconfig.lib.prod.json index fc8229de49..de0d99b652 100644 --- a/projects/aca-content/tsconfig.lib.prod.json +++ b/projects/aca-content/tsconfig.lib.prod.json @@ -7,7 +7,6 @@ "@alfresco/aca-shared": ["dist/@alfresco/aca-shared"], "@alfresco/aca-shared/store": ["dist/@alfresco/aca-shared/store"], "@alfresco/aca-shared/rules": ["dist/@alfresco/aca-shared/rules"], - "@alfresco/aca-folder-rules": ["dist/@alfresco/aca-folder-rules"], "@alfresco/aca-viewer": ["dist/@alfresco/aca-viewer"], "@alfresco/aca-preview": ["dist/@alfresco/aca-preview"] }, diff --git a/projects/aca-folder-rules/.eslintrc.js b/projects/aca-folder-rules/.eslintrc.js deleted file mode 100644 index 9e780e164b..0000000000 --- a/projects/aca-folder-rules/.eslintrc.js +++ /dev/null @@ -1,23 +0,0 @@ -path = require("path"); -module.exports = { - "extends": "../../.eslintrc.json", - "ignorePatterns": [ - "!**/*" - ], - "overrides": [ - { - "files": [ - "*.ts" - ], - "parserOptions": { - "project": [ - path.join(__dirname, "tsconfig.lib.json"), - path.join(__dirname, "tsconfig.spec.json") - ], - "createDefaultProgram": true - }, - "rules": { - } - } - ] -} diff --git a/projects/aca-folder-rules/README.md b/projects/aca-folder-rules/README.md deleted file mode 100644 index 8854b79d88..0000000000 --- a/projects/aca-folder-rules/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# Folder Rules - -## Build - -Run `nx build aca-folder-rules` to build the project. The build artifacts will be stored in the `dist/` directory. - -## Running unit tests - -Run `nx test aca-folder-rules` to execute the unit tests via [Karma](https://karma-runner.github.io). diff --git a/projects/aca-folder-rules/karma.conf.js b/projects/aca-folder-rules/karma.conf.js deleted file mode 100644 index 6c900ccaff..0000000000 --- a/projects/aca-folder-rules/karma.conf.js +++ /dev/null @@ -1,15 +0,0 @@ -// Karma configuration file, see link for more information -// https://karma-runner.github.io/1.0/config/configuration-file.html -const { join } = require('path'); -const getBaseKarmaConfig = require('../../karma.conf'); - -module.exports = function (config) { - const baseConfig = getBaseKarmaConfig(); - config.set({ - ...baseConfig, - coverageReporter: { - ...baseConfig.coverageReporter, - dir: join(__dirname, '../../coverage/aca-folder-rules'), - }, - }); -}; diff --git a/projects/aca-folder-rules/ng-package.json b/projects/aca-folder-rules/ng-package.json deleted file mode 100644 index cbd0584c80..0000000000 --- a/projects/aca-folder-rules/ng-package.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../dist/@alfresco/aca-folder-rules", - "lib": { - "entryFile": "src/public-api.ts" - }, - "assets": [ - "assets" - ] -} diff --git a/projects/aca-folder-rules/package.json b/projects/aca-folder-rules/package.json deleted file mode 100644 index f24a104aa3..0000000000 --- a/projects/aca-folder-rules/package.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "name": "@alfresco/aca-folder-rules", - "version": "0.0.1", - "license": "LGPL-3.0", - "peerDependencies": { - "@angular/common": "^14.1.0", - "@angular/core": "^14.1.0", - "@alfresco/adf-core": "^6.1.0-0", - "@alfresco/adf-content-services": "^6.1.0-0", - "@alfresco/adf-extensions": "^6.1.0-0", - "@alfresco/js-api": "^6.1.0-0", - "@angular/animations": "^14.1.3", - "@angular/cdk": "^14.1.3", - "@angular/forms": "^14.1.3", - "@angular/material": "^14.1.3", - "@ngx-translate/core": "^14.0.0", - "rxjs": "6.6.6", - "tslib": "^2.0.0", - "zone.js": "0.11.8" - }, - "dependencies": { - "tslib": "^2.3.0" - }, - "publishConfig": { - "access": "public" - }, - "repository": { - "type": "git", - "url": "https://github.com/Alfresco/alfresco-content-app.git" - } -} diff --git a/projects/aca-folder-rules/project.json b/projects/aca-folder-rules/project.json deleted file mode 100644 index c56130a2a2..0000000000 --- a/projects/aca-folder-rules/project.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "$schema": "../../node_modules/nx/schemas/project-schema.json", - "name": "aca-folder-rules", - "projectType": "library", - "sourceRoot": "projects/aca-folder-rules/src", - "prefix": "lib", - "targets": { - "build": { - "executor": "@angular-devkit/build-angular:ng-packagr", - "options": { - "tsConfig": "projects/aca-folder-rules/tsconfig.lib.json", - "project": "projects/aca-folder-rules/ng-package.json" - }, - "configurations": { - "production": { - "tsConfig": "projects/aca-folder-rules/tsconfig.lib.prod.json" - } - }, - "defaultConfiguration": "production", - "outputs": [ - "{workspaceRoot}/dist/@alfresco/aca-folder-rules" - ] - }, - "test": { - "executor": "@angular-devkit/build-angular:karma", - "options": { - "codeCoverage": true, - "main": "projects/aca-folder-rules/src/test.ts", - "tsConfig": "projects/aca-folder-rules/tsconfig.spec.json", - "karmaConfig": "projects/aca-folder-rules/karma.conf.js" - }, - "configurations": { - "adfprod": { - "tsConfig": "projects/aca-folder-rules/tsconfig.spec.adf.json" - } - } - }, - "lint": { - "executor": "@angular-eslint/builder:lint", - "options": { - "lintFilePatterns": [ - "projects/aca-folder-rules/**/*.ts", - "projects/aca-folder-rules/**/*.html" - ], - "cache": true, - "cacheLocation": ".eslintcache", - "ignorePath": ".eslintignore" - }, - "outputs": [ - "{options.outputFile}" - ] - } - } -} diff --git a/projects/aca-folder-rules/src/test.ts b/projects/aca-folder-rules/src/test.ts deleted file mode 100644 index 24bdc445c8..0000000000 --- a/projects/aca-folder-rules/src/test.ts +++ /dev/null @@ -1,48 +0,0 @@ -/*! - * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved. - * - * Alfresco Example Content Application - * - * This file is part of the Alfresco Example Content Application. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * The Alfresco Example Content Application is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * The Alfresco Example Content Application is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * from Hyland Software. If not, see . - */ - -// This file is required by karma.conf.js and loads recursively all the .spec and framework files - -import 'zone.js/dist/zone'; -import 'zone.js/dist/zone-testing'; -import { getTestBed } from '@angular/core/testing'; -import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; - -declare const require: { - context( - path: string, - deep?: boolean, - filter?: RegExp - ): { - keys(): string[]; - (id: string): T; - }; -}; - -// First, initialize the Angular testing environment. -getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting()); -// Then we find all the tests. -const context = require.context('./', true, /\.spec\.ts$/); -// And load the modules. -context.keys().map(context); diff --git a/projects/aca-folder-rules/tsconfig.lib.json b/projects/aca-folder-rules/tsconfig.lib.json deleted file mode 100644 index a5aa46acef..0000000000 --- a/projects/aca-folder-rules/tsconfig.lib.json +++ /dev/null @@ -1,25 +0,0 @@ -/* To learn more about this file see: https://angular.io/config/tsconfig. */ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "outDir": "../../out-tsc/lib", - "target": "es2020", - "declaration": true, - "declarationMap": true, - "inlineSources": true, - "types": [], - "lib": [ - "dom", - "es2020" - ] - }, - "angularCompilerOptions": { - "skipTemplateCodegen": true, - "strictMetadataEmit": true, - "enableResourceInlining": true - }, - "exclude": [ - "src/test.ts", - "**/*.spec.ts" - ] -} diff --git a/projects/aca-folder-rules/tsconfig.lib.prod.json b/projects/aca-folder-rules/tsconfig.lib.prod.json deleted file mode 100644 index 2d277e037a..0000000000 --- a/projects/aca-folder-rules/tsconfig.lib.prod.json +++ /dev/null @@ -1,15 +0,0 @@ -/* To learn more about this file see: https://angular.io/config/tsconfig. */ -{ - "extends": "./tsconfig.lib.json", - "compilerOptions": { - "declarationMap": false, - "paths": { - "@alfresco/aca-shared": ["dist/@alfresco/aca-shared"], - "@alfresco/aca-shared/store": ["dist/@alfresco/aca-shared/store"], - "@alfresco/aca-shared/rules": ["dist/@alfresco/aca-shared/rules"] - } - }, - "angularCompilerOptions": { - "enableIvy": false - } -} diff --git a/projects/aca-folder-rules/tsconfig.spec.adf.json b/projects/aca-folder-rules/tsconfig.spec.adf.json deleted file mode 100644 index 04a6994be7..0000000000 --- a/projects/aca-folder-rules/tsconfig.spec.adf.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "extends": "../../tsconfig.adf.json", - "compilerOptions": { - "outDir": "../../out-tsc/spec", - "types": [ - "jasmine" - ] - }, - "files": [ - "src/test.ts" - ], - "include": [ - "**/*.spec.ts", - "**/*.d.ts" - ] -} diff --git a/projects/aca-folder-rules/tsconfig.spec.json b/projects/aca-folder-rules/tsconfig.spec.json deleted file mode 100644 index 715dd0a5d2..0000000000 --- a/projects/aca-folder-rules/tsconfig.spec.json +++ /dev/null @@ -1,17 +0,0 @@ -/* To learn more about this file see: https://angular.io/config/tsconfig. */ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "outDir": "../../out-tsc/spec", - "types": [ - "jasmine" - ] - }, - "files": [ - "src/test.ts" - ], - "include": [ - "**/*.spec.ts", - "**/*.d.ts" - ] -} diff --git a/tsconfig.adf.json b/tsconfig.adf.json index 4edf86a8b3..0783af92d8 100644 --- a/tsconfig.adf.json +++ b/tsconfig.adf.json @@ -38,9 +38,9 @@ "@alfresco/aca-shared/rules": ["projects/aca-shared/rules/src/public-api.ts"], "@alfresco/aca-content/ms-office": ["projects/aca-content/ms-office/src/public-api.ts"], "@alfresco/aca-testing-shared": ["projects/aca-testing-shared/src/index.ts"], - "@alfresco/aca-folder-rules": ["projects/aca-folder-rules/src/public-api.ts"], - "@alfresco/aca-content": ["projects/aca-content/src/public-api.ts"], "@alfresco/aca-content/about": ["projects/aca-content/about/src/public-api.ts"], + "@alfresco/aca-content/folder-rules": ["projects/aca-content/folder-rules/src/public-api.ts"], + "@alfresco/aca-content": ["projects/aca-content/src/public-api.ts"], "@alfresco/aca-viewer": ["projects/aca-viewer/src/public-api.ts"], "@alfresco/aca-preview": ["projects/aca-preview/src/public-api.ts"], "package.json": ["package.json"], diff --git a/tsconfig.json b/tsconfig.json index 0a98d1d023..43062f18f7 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -26,7 +26,7 @@ "@alfresco/aca-shared/rules": ["projects/aca-shared/rules/src/public-api.ts"], "@alfresco/aca-content/ms-office": ["projects/aca-content/ms-office/src/public-api.ts"], "@alfresco/aca-testing-shared": ["projects/aca-testing-shared/src/index.ts"], - "@alfresco/aca-folder-rules": ["projects/aca-folder-rules/src/public-api.ts"], + "@alfresco/aca-content/folder-rules": ["projects/aca-content/folder-rules/src/public-api.ts"], "@alfresco/aca-content": ["projects/aca-content/src/public-api.ts"], "@alfresco/aca-content/about": ["projects/aca-content/about/src/public-api.ts"], "@alfresco/aca-viewer": ["projects/aca-viewer/src/public-api.ts"], From 2e76375fcb51e837cea8ea7272107ffb16c2115d Mon Sep 17 00:00:00 2001 From: MichalKinas Date: Tue, 9 May 2023 12:58:44 +0200 Subject: [PATCH 2/6] [ACA-4538] Fix folder rules imports --- .../src/manage-rules/manage-rules.smart-component.spec.ts | 3 ++- .../rule-list-grouping/rule-list-grouping.ui-component.spec.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.spec.ts b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.spec.ts index 5b0ce925da..d2a1da9dfa 100644 --- a/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.spec.ts +++ b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.spec.ts @@ -23,7 +23,8 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { AcaFolderRulesModule, ManageRulesSmartComponent } from '@alfresco/aca-content/folder-rules'; +import { AcaFolderRulesModule } from '../folder-rules.module'; +import { ManageRulesSmartComponent } from './manage-rules.smart-component'; import { DebugElement, Predicate } from '@angular/core'; import { CoreTestingModule } from '@alfresco/adf-core'; import { FolderRulesService } from '../services/folder-rules.service'; diff --git a/projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.spec.ts index 0aaeaae5e2..49969c4d71 100644 --- a/projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.spec.ts +++ b/projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.spec.ts @@ -28,7 +28,7 @@ import { ruleListGroupingItemsMock, rulesMock } from '../../mock/rules.mock'; import { DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; import { CoreTestingModule } from '@alfresco/adf-core'; -import { AcaFolderRulesModule } from '@alfresco/aca-content/folder-rules'; +import { AcaFolderRulesModule } from '../../folder-rules.module'; describe('RuleListGroupingUiComponent', () => { let component: RuleListGroupingUiComponent; From 102671254b6feaa16c67e941d2fa43aac2636b5b Mon Sep 17 00:00:00 2001 From: MichalKinas Date: Thu, 11 May 2023 14:29:26 +0200 Subject: [PATCH 3/6] [ACS-4538] Fix folder-rules unit tests --- app/project.json | 6 +++- .../manage-rules.smart-component.spec.ts | 16 ++++++++- .../rule-set-picker.smart-component.spec.ts | 33 ++++++++++++++++--- 3 files changed, 49 insertions(+), 6 deletions(-) diff --git a/app/project.json b/app/project.json index b90c7fddad..e5471f1118 100644 --- a/app/project.json +++ b/app/project.json @@ -253,7 +253,11 @@ "assets": [ "app/src/assets", "app/src/favicon-96x96.png", - "projects/aca-content/assets", + { + "glob": "**/*", + "input": "projects/aca-content/assets", + "output": "/assets" + }, { "input": "app/.tmp", "output": "/", diff --git a/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.spec.ts b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.spec.ts index d2a1da9dfa..00c14cbd6e 100644 --- a/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.spec.ts +++ b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.spec.ts @@ -38,7 +38,7 @@ import { ruleSetWithLinkMock } from '../mock/rule-sets.mock'; import { By } from '@angular/platform-browser'; -import { owningFolderIdMock, owningFolderMock } from '../mock/node.mock'; +import { getOwningFolderEntryMock, owningFolderIdMock, owningFolderMock } from '../mock/node.mock'; import { MatDialog } from '@angular/material/dialog'; import { ActionsService } from '../services/actions.service'; import { FolderRuleSetsService } from '../services/folder-rule-sets.service'; @@ -54,6 +54,7 @@ describe('ManageRulesSmartComponent', () => { let folderRuleSetsService: FolderRuleSetsService; let folderRulesService: FolderRulesService; let actionsService: ActionsService; + let callApiSpy: jasmine.Spy; beforeEach(() => { TestBed.configureTestingModule({ @@ -82,6 +83,19 @@ describe('ManageRulesSmartComponent', () => { actionsService = TestBed.inject(ActionsService); spyOn(actionsService, 'loadActionDefinitions').and.stub(); + spyOn(folderRulesService, 'getRuleSettings').and.returnValue(Promise.resolve(ruleSettingsMock)); + callApiSpy = spyOn(folderRuleSetsService, 'callApi'); + callApiSpy + .withArgs(`/nodes/${owningFolderIdMock}/rule-sets?include=isLinkedTo,owningFolder,linkedToBy&skipCount=0&maxItems=100`, 'GET') + .and.returnValue(Promise.resolve(ownedRuleSetMock)) + .withArgs(`/nodes/${owningFolderIdMock}/rule-sets/-default-?include=isLinkedTo,owningFolder,linkedToBy`, 'GET') + .and.returnValue(Promise.resolve(ownedRuleSetMock)) + .withArgs(`/nodes/${owningFolderIdMock}?include=path%2Cproperties%2CallowableOperations%2Cpermissions`, 'GET') + .and.returnValue(Promise.resolve(getOwningFolderEntryMock)); + }); + + afterEach(() => { + fixture.destroy(); }); it('should show a list of rule sets and rules', () => { diff --git a/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.spec.ts b/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.spec.ts index 1c441657a8..f4d61d9d2c 100644 --- a/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.spec.ts +++ b/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.spec.ts @@ -25,11 +25,12 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RuleSetPickerOptions, RuleSetPickerSmartComponent } from './rule-set-picker.smart-component'; import { CoreTestingModule } from '@alfresco/adf-core'; -import { folderToLinkMock } from '../mock/node.mock'; +import { folderToLinkMock, otherFolderMock } from '../mock/node.mock'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { FolderRuleSetsService } from '../services/folder-rule-sets.service'; import { of } from 'rxjs'; -import { ruleSetWithLinkMock, ruleSetWithNoRulesToLinkMock, ruleSetWithOwnedRulesToLinkMock } from '../mock/rule-sets.mock'; +import { ownedRuleSetMock, ruleSetWithLinkMock, ruleSetWithNoRulesToLinkMock, ruleSetWithOwnedRulesToLinkMock } from '../mock/rule-sets.mock'; +import { ContentApiService } from '../../../../aca-shared/src/public-api'; import { By } from '@angular/platform-browser'; describe('RuleSetPickerSmartComponent', () => { @@ -38,6 +39,7 @@ describe('RuleSetPickerSmartComponent', () => { let folderRuleSetsService: FolderRuleSetsService; let loadRuleSetsSpy: jasmine.Spy; + let callApiSpy: jasmine.Spy; const dialogRef = { close: jasmine.createSpy('close'), @@ -54,7 +56,18 @@ describe('RuleSetPickerSmartComponent', () => { imports: [CoreTestingModule], providers: [ { provide: MatDialogRef, useValue: dialogRef }, - { provide: MAT_DIALOG_DATA, useValue: dialogOptions } + { provide: MAT_DIALOG_DATA, useValue: dialogOptions }, + { + provide: ContentApiService, + useValue: { + getNode: () => { + return of({ entry: folderToLinkMock }); + }, + getNodeInfo: () => { + return of(otherFolderMock); + } + } + } ] }); @@ -63,7 +76,19 @@ describe('RuleSetPickerSmartComponent', () => { component = fixture.componentInstance; component['folderRuleSetsService'] = folderRuleSetsService; - loadRuleSetsSpy = spyOn(folderRuleSetsService, 'loadRuleSets'); + loadRuleSetsSpy = spyOn(folderRuleSetsService, 'loadRuleSets').and.callThrough(); + callApiSpy = spyOn(folderRuleSetsService, 'callApi'); + callApiSpy + .withArgs(`/nodes/${dialogOptions.nodeId}/rule-sets?include=isLinkedTo,owningFolder,linkedToBy&skipCount=0&maxItems=100`, 'GET') + .and.returnValue(Promise.resolve(ownedRuleSetMock)) + .withArgs(`/nodes/${dialogOptions.nodeId}/rule-sets/-default-?include=isLinkedTo,owningFolder,linkedToBy`, 'GET') + .and.returnValue(Promise.resolve(ownedRuleSetMock)) + .withArgs(`/nodes/${folderToLinkMock.id}?include=path%2Cproperties%2CallowableOperations%2Cpermissions`, 'GET') + .and.returnValue(Promise.resolve({ entry: folderToLinkMock })); + }); + + afterEach(() => { + fixture.destroy(); }); it('should load the rule sets of a node once it has been selected', () => { From e746200f2ce06899da9559a3b0b509281fd9939a Mon Sep 17 00:00:00 2001 From: MichalKinas Date: Fri, 16 Jun 2023 11:22:10 +0200 Subject: [PATCH 4/6] [ACS-4538] Fix package.json after folder rules transition --- projects/aca-content/package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/aca-content/package.json b/projects/aca-content/package.json index 72517884eb..1503e32697 100644 --- a/projects/aca-content/package.json +++ b/projects/aca-content/package.json @@ -5,17 +5,17 @@ "peerDependencies": { "@angular/common": "^14.1.0", "@angular/core": "^14.1.0", - "@alfresco/adf-core": "6.1.0-4893268711", - "@alfresco/adf-content-services": "6.1.0-4893268711", - "@alfresco/adf-extensions": "6.1.0-4893268711", - "@alfresco/js-api": "6.0.0", + "@alfresco/adf-core": "^6.1.0-0", + "@alfresco/adf-content-services": "^6.1.0-0", + "@alfresco/adf-extensions": "^6.1.0-0", + "@alfresco/js-api": "^6.1.0-0", "@angular/animations": "^14.1.3", "@angular/cdk": "^14.1.3", - "@angular/flex-layout": "^14.0.0-beta.40", "@angular/forms": "^14.1.3", "@angular/material": "^14.1.3", "@ngx-translate/core": "^14.0.0", "rxjs": "6.6.6", + "tslib": "^2.0.0", "zone.js": "0.11.8" }, "dependencies": { From b428cc8bef0ff5cede5fcef26c19873bd4358cdc Mon Sep 17 00:00:00 2001 From: MichalKinas Date: Fri, 16 Jun 2023 11:32:50 +0200 Subject: [PATCH 5/6] [ACS-4538] Remove duplicated peerDependency --- projects/aca-content/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/aca-content/package.json b/projects/aca-content/package.json index 1503e32697..989d48169f 100644 --- a/projects/aca-content/package.json +++ b/projects/aca-content/package.json @@ -15,7 +15,6 @@ "@angular/material": "^14.1.3", "@ngx-translate/core": "^14.0.0", "rxjs": "6.6.6", - "tslib": "^2.0.0", "zone.js": "0.11.8" }, "dependencies": { From 7b0c3fdd53c6407e4f960caf4a2438dd7e8b033f Mon Sep 17 00:00:00 2001 From: MichalKinas Date: Fri, 16 Jun 2023 13:15:05 +0200 Subject: [PATCH 6/6] [ACS-4538] Import fix --- .../src/rule-set-picker/rule-set-picker.smart-component.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.spec.ts b/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.spec.ts index f4d61d9d2c..25432fd1d4 100644 --- a/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.spec.ts +++ b/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.spec.ts @@ -30,7 +30,7 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { FolderRuleSetsService } from '../services/folder-rule-sets.service'; import { of } from 'rxjs'; import { ownedRuleSetMock, ruleSetWithLinkMock, ruleSetWithNoRulesToLinkMock, ruleSetWithOwnedRulesToLinkMock } from '../mock/rule-sets.mock'; -import { ContentApiService } from '../../../../aca-shared/src/public-api'; +import { ContentApiService } from '@alfresco/aca-shared'; import { By } from '@angular/platform-browser'; describe('RuleSetPickerSmartComponent', () => {