From 279a71873b34489d04315aa4812ff02c9bb75c32 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Sun, 9 Jun 2024 01:14:20 +0200 Subject: [PATCH] AAE 22837 Move confirm to core (#9750) * confirm dialog is used in many places and should be part of the core * fix * Update confirm.dialog.spec.ts * Update public-api.ts --- docs/README.md | 2 +- .../dialogs/confirm.dialog.md | 2 +- docs/release-notes/RelNote320.md | 2 +- docs/versionIndex.md | 2 +- .../content-node-share.dialog.ts | 2 +- .../src/lib/dialogs/dialog.module.ts | 3 -- .../src/lib/dialogs/public-api.ts | 1 - lib/content-services/src/lib/i18n/ar.json | 6 --- lib/content-services/src/lib/i18n/cs.json | 6 --- lib/content-services/src/lib/i18n/da.json | 6 --- lib/content-services/src/lib/i18n/de.json | 6 --- lib/content-services/src/lib/i18n/en.json | 6 --- lib/content-services/src/lib/i18n/es.json | 6 --- lib/content-services/src/lib/i18n/fi.json | 6 --- lib/content-services/src/lib/i18n/fr.json | 6 --- lib/content-services/src/lib/i18n/it.json | 6 --- lib/content-services/src/lib/i18n/ja.json | 6 --- lib/content-services/src/lib/i18n/nb.json | 6 --- lib/content-services/src/lib/i18n/nl.json | 6 --- lib/content-services/src/lib/i18n/pl.json | 6 --- lib/content-services/src/lib/i18n/pt-BR.json | 6 --- lib/content-services/src/lib/i18n/ru.json | 6 --- lib/content-services/src/lib/i18n/sv.json | 6 --- lib/content-services/src/lib/i18n/zh-CN.json | 6 --- .../version-manager/version-list.component.ts | 2 +- .../confirm-dialog}/confirm.dialog.html | 0 .../confirm-dialog/confirm.dialog.module.ts | 37 +++++++++++++++++++ .../confirm-dialog}/confirm.dialog.scss | 0 .../confirm-dialog}/confirm.dialog.spec.ts | 4 +- .../dialogs/confirm-dialog}/confirm.dialog.ts | 0 lib/core/src/lib/dialogs/public-api.ts | 5 +++ .../form/components/form-cloud.component.ts | 2 +- 32 files changed, 51 insertions(+), 115 deletions(-) rename docs/{content-services => core}/dialogs/confirm.dialog.md (96%) rename lib/{content-services/src/lib/dialogs => core/src/lib/dialogs/confirm-dialog}/confirm.dialog.html (100%) create mode 100644 lib/core/src/lib/dialogs/confirm-dialog/confirm.dialog.module.ts rename lib/{content-services/src/lib/dialogs => core/src/lib/dialogs/confirm-dialog}/confirm.dialog.scss (100%) rename lib/{content-services/src/lib/dialogs => core/src/lib/dialogs/confirm-dialog}/confirm.dialog.spec.ts (98%) rename lib/{content-services/src/lib/dialogs => core/src/lib/dialogs/confirm-dialog}/confirm.dialog.ts (100%) diff --git a/docs/README.md b/docs/README.md index 5c5650b9792..49cb631d8bd 100644 --- a/docs/README.md +++ b/docs/README.md @@ -144,6 +144,7 @@ for more information about installing and using the source code. | Name | Description | Source link | | ---- | ----------- | ----------- | +| [Confirm dialog component](core/dialogs/confirm.dialog.md) | Requests a yes/no choice from the user. | [Source](../lib/core/src/lib/dialogs/confirm-dialog/confirm.dialog.ts) | | [Edit JSON Dialog](core/dialogs/edit-json.dialog.md) | Allows a user to preview or edit a JSON content in a dialog. | [Source](../lib/testing/src/lib/core/dialog/edit-json-dialog.ts) | | [Unsaved Changes Dialog](core/dialogs/unsaved-changes-dialog.component.md) | Dialog which informs about unsaved changes. Allows discard them and proceed or close dialog and stop proceeding. | [Source](../lib/core/src/lib/dialogs/unsaved-changes-dialog/unsaved-changes-dialog.component.ts) | @@ -343,7 +344,6 @@ for more information about installing and using the source code. | Name | Description | Source link | | ---- | ----------- | ----------- | | [Dialog component](content-services/dialogs/dialog.md) | Dialog styled wrapper. | [Source](../lib/content-services/src/lib/dialogs/dialog/dialog.component.ts) | -| [Confirm dialog component](content-services/dialogs/confirm.dialog.md) | Requests a yes/no choice from the user. | [Source](../lib/content-services/src/lib/dialogs/confirm.dialog.ts) | | [Library dialog component](content-services/dialogs/library.dialog.md) | Creates a new Content Services document library/site. | [Source](../lib/content-services/src/lib/dialogs/library/library.dialog.ts) | ### Interfaces diff --git a/docs/content-services/dialogs/confirm.dialog.md b/docs/core/dialogs/confirm.dialog.md similarity index 96% rename from docs/content-services/dialogs/confirm.dialog.md rename to docs/core/dialogs/confirm.dialog.md index e67771f472a..47a1d98f510 100644 --- a/docs/content-services/dialogs/confirm.dialog.md +++ b/docs/core/dialogs/confirm.dialog.md @@ -5,7 +5,7 @@ Status: Active Last reviewed: 2019-01-22 --- -# [Confirm dialog component](../../../lib/content-services/src/lib/dialogs/confirm.dialog.ts "Defined in confirm.dialog.ts") +# [Confirm dialog component](../../../lib/core/src/lib/dialogs/confirm-dialog/confirm.dialog.ts "Defined in confirm.dialog.ts") Requests a yes/no choice from the user. diff --git a/docs/release-notes/RelNote320.md b/docs/release-notes/RelNote320.md index 16f52774c5b..f364cdecfd5 100644 --- a/docs/release-notes/RelNote320.md +++ b/docs/release-notes/RelNote320.md @@ -175,7 +175,7 @@ Is now possible add an extra button in the Confirm Dialog For more details refer to the: -- [Confirm Dialog](../content-services/dialogs/confirm.dialog.md) +- [Confirm Dialog](../core/dialogs/confirm.dialog.md) ### Configuration option to change the default viewer zoom diff --git a/docs/versionIndex.md b/docs/versionIndex.md index 0728496a263..ac00bc7e776 100644 --- a/docs/versionIndex.md +++ b/docs/versionIndex.md @@ -442,7 +442,7 @@ backend services have been tested with each released version of ADF. - [Comment content service](core/services/comment-content.service.md) -- [Confirm dialog](content-services/dialogs/confirm.dialog.md) +- [Confirm dialog](core/dialogs/confirm.dialog.md) - [Content node share directive](content-services/directives/content-node-share.directive.md) - [Custom resources service](content-services/services/custom-resources.service.md) - [Inherited button directive](content-services/directives/inherited-button.directive.md) diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts index fe954335184..c5111a718f2 100644 --- a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts +++ b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts @@ -23,7 +23,7 @@ import { Subject } from 'rxjs'; import { ContentService } from '../common/services/content.service'; import { SharedLinksApiService } from './services/shared-links-api.service'; import { SharedLinkBodyCreate } from '@alfresco/js-api'; -import { ConfirmDialogComponent } from '../dialogs/confirm.dialog'; +import { ConfirmDialogComponent } from '@alfresco/adf-core'; import { ContentNodeShareSettings } from './content-node-share.settings'; import { RenditionService } from '../common/services/rendition.service'; import { format, add, endOfDay, isBefore } from 'date-fns'; diff --git a/lib/content-services/src/lib/dialogs/dialog.module.ts b/lib/content-services/src/lib/dialogs/dialog.module.ts index 18ae7bc0ab2..bd3136dcf81 100644 --- a/lib/content-services/src/lib/dialogs/dialog.module.ts +++ b/lib/content-services/src/lib/dialogs/dialog.module.ts @@ -23,7 +23,6 @@ import { CoreModule } from '@alfresco/adf-core'; import { MaterialModule } from '../material.module'; import { FolderDialogComponent } from './folder.dialog'; import { NodeLockDialogComponent } from './node-lock.dialog'; -import { ConfirmDialogComponent } from './confirm.dialog'; import { MatDatetimepickerModule } from '@mat-datetimepicker/core'; import { LibraryDialogComponent } from './library/library.dialog'; import { ContentDirectiveModule } from '../directives'; @@ -46,14 +45,12 @@ import { CategoriesModule } from '../category'; declarations: [ FolderDialogComponent, NodeLockDialogComponent, - ConfirmDialogComponent, LibraryDialogComponent, CategorySelectorDialogComponent ], exports: [ FolderDialogComponent, NodeLockDialogComponent, - ConfirmDialogComponent, LibraryDialogComponent, CategorySelectorDialogComponent ] diff --git a/lib/content-services/src/lib/dialogs/public-api.ts b/lib/content-services/src/lib/dialogs/public-api.ts index 48c2d4db068..f12f324f717 100644 --- a/lib/content-services/src/lib/dialogs/public-api.ts +++ b/lib/content-services/src/lib/dialogs/public-api.ts @@ -17,7 +17,6 @@ export * from './folder.dialog'; export * from './node-lock.dialog'; -export * from './confirm.dialog'; export * from './category-selector.dialog'; export * from './dialog.module'; diff --git a/lib/content-services/src/lib/i18n/ar.json b/lib/content-services/src/lib/i18n/ar.json index 2929c90c176..51a770f1941 100644 --- a/lib/content-services/src/lib/i18n/ar.json +++ b/lib/content-services/src/lib/i18n/ar.json @@ -46,12 +46,6 @@ "ARROW_ICON": "أيقونة السهم الأيمن" } }, - "ADF_CONFIRM_DIALOG": { - "TITLE": "تأكيد", - "ACTION": "هل تريد المتابعة؟", - "YES_LABEL": "نعم", - "NO_LABEL": "لا" - }, "ADF-DOCUMENT-LIST": { "EMPTY": { "HEADER": "هذا المجلد فارغ" diff --git a/lib/content-services/src/lib/i18n/cs.json b/lib/content-services/src/lib/i18n/cs.json index 82afdd8b79c..9c655a1f3d8 100644 --- a/lib/content-services/src/lib/i18n/cs.json +++ b/lib/content-services/src/lib/i18n/cs.json @@ -46,12 +46,6 @@ "ARROW_ICON": "Ikona se šipkou doprava" } }, - "ADF_CONFIRM_DIALOG": { - "TITLE": "Potvrdit", - "ACTION": "Chcete pokračovat?", - "YES_LABEL": "Ano", - "NO_LABEL": "Ne" - }, "ADF-DOCUMENT-LIST": { "EMPTY": { "HEADER": "Tato složka je prázdná" diff --git a/lib/content-services/src/lib/i18n/da.json b/lib/content-services/src/lib/i18n/da.json index 4b273f46e82..6a2e6415388 100644 --- a/lib/content-services/src/lib/i18n/da.json +++ b/lib/content-services/src/lib/i18n/da.json @@ -46,12 +46,6 @@ "ARROW_ICON": "Pil højre ikon" } }, - "ADF_CONFIRM_DIALOG": { - "TITLE": "Bekræft", - "ACTION": "Vil du fortsætte?", - "YES_LABEL": "Ja", - "NO_LABEL": "Nej" - }, "ADF-DOCUMENT-LIST": { "EMPTY": { "HEADER": "Denne mappe er tom" diff --git a/lib/content-services/src/lib/i18n/de.json b/lib/content-services/src/lib/i18n/de.json index 18025188b96..944258cdf7f 100644 --- a/lib/content-services/src/lib/i18n/de.json +++ b/lib/content-services/src/lib/i18n/de.json @@ -46,12 +46,6 @@ "ARROW_ICON": "Pfeil-nach-rechts-Symbol" } }, - "ADF_CONFIRM_DIALOG": { - "TITLE": "Bestätigen", - "ACTION": "Möchten Sie fortfahren?", - "YES_LABEL": "Ja", - "NO_LABEL": "Nein" - }, "ADF-DOCUMENT-LIST": { "EMPTY": { "HEADER": "Dieser Ordner ist leer" diff --git a/lib/content-services/src/lib/i18n/en.json b/lib/content-services/src/lib/i18n/en.json index c68da5598bd..6ae29d89f16 100644 --- a/lib/content-services/src/lib/i18n/en.json +++ b/lib/content-services/src/lib/i18n/en.json @@ -46,12 +46,6 @@ "ARROW_ICON": "Arrow right icon" } }, - "ADF_CONFIRM_DIALOG": { - "TITLE": "Confirm", - "ACTION": "Do you want to proceed?", - "YES_LABEL": "Yes", - "NO_LABEL": "No" - }, "ADF-DOCUMENT-LIST": { "EMPTY": { "HEADER": "This folder is empty" diff --git a/lib/content-services/src/lib/i18n/es.json b/lib/content-services/src/lib/i18n/es.json index 877485549bd..df27558f837 100644 --- a/lib/content-services/src/lib/i18n/es.json +++ b/lib/content-services/src/lib/i18n/es.json @@ -46,12 +46,6 @@ "ARROW_ICON": "Icono de dirección a la derecha" } }, - "ADF_CONFIRM_DIALOG": { - "TITLE": "Confirmar", - "ACTION": "¿Desea continuar?", - "YES_LABEL": "Sí", - "NO_LABEL": "No" - }, "ADF-DOCUMENT-LIST": { "EMPTY": { "HEADER": "Esta carpeta está vacía" diff --git a/lib/content-services/src/lib/i18n/fi.json b/lib/content-services/src/lib/i18n/fi.json index 5f9b1b9f5c4..e7115462de2 100644 --- a/lib/content-services/src/lib/i18n/fi.json +++ b/lib/content-services/src/lib/i18n/fi.json @@ -46,12 +46,6 @@ "ARROW_ICON": "Oikea nuoli -kuvake" } }, - "ADF_CONFIRM_DIALOG": { - "TITLE": "Vahvista", - "ACTION": "Haluatko jatkaa?", - "YES_LABEL": "Kyllä", - "NO_LABEL": "Ei" - }, "ADF-DOCUMENT-LIST": { "EMPTY": { "HEADER": "Tämä kansio on tyhjä" diff --git a/lib/content-services/src/lib/i18n/fr.json b/lib/content-services/src/lib/i18n/fr.json index ff59434f4dc..9cdeb6effc2 100644 --- a/lib/content-services/src/lib/i18n/fr.json +++ b/lib/content-services/src/lib/i18n/fr.json @@ -46,12 +46,6 @@ "ARROW_ICON": "Icône flèche vers la droite" } }, - "ADF_CONFIRM_DIALOG": { - "TITLE": "Confirmer", - "ACTION": "Voulez-vous continuer ?", - "YES_LABEL": "Oui", - "NO_LABEL": "Non" - }, "ADF-DOCUMENT-LIST": { "EMPTY": { "HEADER": "Ce dossier est vide" diff --git a/lib/content-services/src/lib/i18n/it.json b/lib/content-services/src/lib/i18n/it.json index 0e13291e20b..d63fe654ad2 100644 --- a/lib/content-services/src/lib/i18n/it.json +++ b/lib/content-services/src/lib/i18n/it.json @@ -46,12 +46,6 @@ "ARROW_ICON": "Icona freccia destra" } }, - "ADF_CONFIRM_DIALOG": { - "TITLE": "Conferma", - "ACTION": "Procedere?", - "YES_LABEL": "Sì", - "NO_LABEL": "No" - }, "ADF-DOCUMENT-LIST": { "EMPTY": { "HEADER": "Questa cartella è vuota" diff --git a/lib/content-services/src/lib/i18n/ja.json b/lib/content-services/src/lib/i18n/ja.json index ab30385ca00..d1cc5973132 100644 --- a/lib/content-services/src/lib/i18n/ja.json +++ b/lib/content-services/src/lib/i18n/ja.json @@ -46,12 +46,6 @@ "ARROW_ICON": "右矢印アイコン" } }, - "ADF_CONFIRM_DIALOG": { - "TITLE": "確認", - "ACTION": "作業を続けますか?", - "YES_LABEL": "はい", - "NO_LABEL": "いいえ" - }, "ADF-DOCUMENT-LIST": { "EMPTY": { "HEADER": "このフォルダは空です" diff --git a/lib/content-services/src/lib/i18n/nb.json b/lib/content-services/src/lib/i18n/nb.json index 735c935bd29..9799669d782 100644 --- a/lib/content-services/src/lib/i18n/nb.json +++ b/lib/content-services/src/lib/i18n/nb.json @@ -46,12 +46,6 @@ "ARROW_ICON": "Høyrepil-ikon" } }, - "ADF_CONFIRM_DIALOG": { - "TITLE": "Bekreft", - "ACTION": "Vil du fortsette?", - "YES_LABEL": "Ja", - "NO_LABEL": "Nei" - }, "ADF-DOCUMENT-LIST": { "EMPTY": { "HEADER": "Denne mappen er tom" diff --git a/lib/content-services/src/lib/i18n/nl.json b/lib/content-services/src/lib/i18n/nl.json index f8cf5c54e68..7a607d5082b 100644 --- a/lib/content-services/src/lib/i18n/nl.json +++ b/lib/content-services/src/lib/i18n/nl.json @@ -46,12 +46,6 @@ "ARROW_ICON": "Pictogram pijl-rechts" } }, - "ADF_CONFIRM_DIALOG": { - "TITLE": "Bevestigen", - "ACTION": "Wilt u doorgaan?", - "YES_LABEL": "Ja", - "NO_LABEL": "Nee" - }, "ADF-DOCUMENT-LIST": { "EMPTY": { "HEADER": "Deze map is leeg" diff --git a/lib/content-services/src/lib/i18n/pl.json b/lib/content-services/src/lib/i18n/pl.json index 5aec1dfff77..1d09a99597d 100644 --- a/lib/content-services/src/lib/i18n/pl.json +++ b/lib/content-services/src/lib/i18n/pl.json @@ -46,12 +46,6 @@ "ARROW_ICON": "Ikona strzałki w prawo" } }, - "ADF_CONFIRM_DIALOG": { - "TITLE": "Potwierdź", - "ACTION": "Czy chcesz kontynuować?", - "YES_LABEL": "Tak", - "NO_LABEL": "Nie" - }, "ADF-DOCUMENT-LIST": { "EMPTY": { "HEADER": "Ten folder jest pusty" diff --git a/lib/content-services/src/lib/i18n/pt-BR.json b/lib/content-services/src/lib/i18n/pt-BR.json index 0662bec46fe..741b7088e24 100644 --- a/lib/content-services/src/lib/i18n/pt-BR.json +++ b/lib/content-services/src/lib/i18n/pt-BR.json @@ -46,12 +46,6 @@ "ARROW_ICON": "Ícone de seta direita" } }, - "ADF_CONFIRM_DIALOG": { - "TITLE": "Confirmar", - "ACTION": "Deseja continuar?", - "YES_LABEL": "Sim", - "NO_LABEL": "Não" - }, "ADF-DOCUMENT-LIST": { "EMPTY": { "HEADER": "Esta pasta está vazia" diff --git a/lib/content-services/src/lib/i18n/ru.json b/lib/content-services/src/lib/i18n/ru.json index 06a28b2bc49..29d7d6dceea 100644 --- a/lib/content-services/src/lib/i18n/ru.json +++ b/lib/content-services/src/lib/i18n/ru.json @@ -46,12 +46,6 @@ "ARROW_ICON": "Значок правой стрелки" } }, - "ADF_CONFIRM_DIALOG": { - "TITLE": "Подтвердить", - "ACTION": "Хотите продолжить?", - "YES_LABEL": "Да", - "NO_LABEL": "Нет" - }, "ADF-DOCUMENT-LIST": { "EMPTY": { "HEADER": "Эта папка пуста" diff --git a/lib/content-services/src/lib/i18n/sv.json b/lib/content-services/src/lib/i18n/sv.json index 6c4958c008b..69917452010 100644 --- a/lib/content-services/src/lib/i18n/sv.json +++ b/lib/content-services/src/lib/i18n/sv.json @@ -46,12 +46,6 @@ "ARROW_ICON": "Ikon för högerpil" } }, - "ADF_CONFIRM_DIALOG": { - "TITLE": "Bekräfta", - "ACTION": "Vill du fortsätta?", - "YES_LABEL": "Ja", - "NO_LABEL": "Nej" - }, "ADF-DOCUMENT-LIST": { "EMPTY": { "HEADER": "Den här mappen är tom" diff --git a/lib/content-services/src/lib/i18n/zh-CN.json b/lib/content-services/src/lib/i18n/zh-CN.json index fba99c2a068..ca5b2acd9af 100644 --- a/lib/content-services/src/lib/i18n/zh-CN.json +++ b/lib/content-services/src/lib/i18n/zh-CN.json @@ -46,12 +46,6 @@ "ARROW_ICON": "右箭头图标" } }, - "ADF_CONFIRM_DIALOG": { - "TITLE": "确认", - "ACTION": "是否要继续？", - "YES_LABEL": "是", - "NO_LABEL": "否" - }, "ADF-DOCUMENT-LIST": { "EMPTY": { "HEADER": "此文件夹为空" diff --git a/lib/content-services/src/lib/version-manager/version-list.component.ts b/lib/content-services/src/lib/version-manager/version-list.component.ts index ea0e3a5c344..3094faf3255 100644 --- a/lib/content-services/src/lib/version-manager/version-list.component.ts +++ b/lib/content-services/src/lib/version-manager/version-list.component.ts @@ -19,7 +19,7 @@ import { AlfrescoApiService } from '@alfresco/adf-core'; import { Component, Input, OnChanges, ViewEncapsulation, EventEmitter, Output, OnInit, OnDestroy, ViewChild } from '@angular/core'; import { VersionsApi, Node, VersionEntry, NodesApi, NodeEntry, ContentApi, ContentPagingQuery } from '@alfresco/js-api'; import { MatDialog } from '@angular/material/dialog'; -import { ConfirmDialogComponent } from '../dialogs'; +import { ConfirmDialogComponent } from '@alfresco/adf-core'; import { ContentVersionService } from './content-version.service'; import { ContentService } from '../common'; import { InfiniteScrollDatasource } from '../infinite-scroll-datasource'; diff --git a/lib/content-services/src/lib/dialogs/confirm.dialog.html b/lib/core/src/lib/dialogs/confirm-dialog/confirm.dialog.html similarity index 100% rename from lib/content-services/src/lib/dialogs/confirm.dialog.html rename to lib/core/src/lib/dialogs/confirm-dialog/confirm.dialog.html diff --git a/lib/core/src/lib/dialogs/confirm-dialog/confirm.dialog.module.ts b/lib/core/src/lib/dialogs/confirm-dialog/confirm.dialog.module.ts new file mode 100644 index 00000000000..f03a1505c5e --- /dev/null +++ b/lib/core/src/lib/dialogs/confirm-dialog/confirm.dialog.module.ts @@ -0,0 +1,37 @@ +/*! + * @license + * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { NgModule } from '@angular/core'; +import { ConfirmDialogComponent } from './confirm.dialog'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { CommonModule } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatButtonModule } from '@angular/material/button'; +@NgModule({ + declarations: [ConfirmDialogComponent], + imports: [ + CommonModule, + FormsModule, + ReactiveFormsModule, + TranslateModule, + MatDialogModule, + MatButtonModule + ], + exports: [ConfirmDialogComponent] +}) +export class ConfirmDialogModule {} diff --git a/lib/content-services/src/lib/dialogs/confirm.dialog.scss b/lib/core/src/lib/dialogs/confirm-dialog/confirm.dialog.scss similarity index 100% rename from lib/content-services/src/lib/dialogs/confirm.dialog.scss rename to lib/core/src/lib/dialogs/confirm-dialog/confirm.dialog.scss diff --git a/lib/content-services/src/lib/dialogs/confirm.dialog.spec.ts b/lib/core/src/lib/dialogs/confirm-dialog/confirm.dialog.spec.ts similarity index 98% rename from lib/content-services/src/lib/dialogs/confirm.dialog.spec.ts rename to lib/core/src/lib/dialogs/confirm-dialog/confirm.dialog.spec.ts index bbf8499709d..44652c1e29c 100644 --- a/lib/content-services/src/lib/dialogs/confirm.dialog.spec.ts +++ b/lib/core/src/lib/dialogs/confirm-dialog/confirm.dialog.spec.ts @@ -18,8 +18,8 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { ConfirmDialogComponent } from './confirm.dialog'; -import { ContentTestingModule } from '../testing/content.testing.module'; import { By } from '@angular/platform-browser'; +import { CoreTestingModule } from '@alfresco/adf-cor'; describe('Confirm Dialog Component', () => { let fixture: ComponentFixture; @@ -38,7 +38,7 @@ describe('Confirm Dialog Component', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule], + imports: [CoreTestingModule], providers: [ { provide: MatDialogRef, useValue: dialogRef }, { provide: MAT_DIALOG_DATA, useValue: data } diff --git a/lib/content-services/src/lib/dialogs/confirm.dialog.ts b/lib/core/src/lib/dialogs/confirm-dialog/confirm.dialog.ts similarity index 100% rename from lib/content-services/src/lib/dialogs/confirm.dialog.ts rename to lib/core/src/lib/dialogs/confirm-dialog/confirm.dialog.ts diff --git a/lib/core/src/lib/dialogs/public-api.ts b/lib/core/src/lib/dialogs/public-api.ts index 1dbe405175b..29449f77b1d 100755 --- a/lib/core/src/lib/dialogs/public-api.ts +++ b/lib/core/src/lib/dialogs/public-api.ts @@ -17,7 +17,12 @@ export * from './edit-json/edit-json.dialog'; export * from './edit-json/edit-json.dialog.module'; + export * from './unsaved-changes-dialog/unsaved-changes-dialog.component'; export * from './unsaved-changes-dialog/unsaved-changes-dialog.module'; export * from './unsaved-changes-dialog/unsaved-changes.guard'; + +export * from './confirm-dialog/confirm.dialog'; +export * from './confirm-dialog/confirm.dialog.module'; + export * from './dialog'; diff --git a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts index 14becdbfdef..c004bdca89f 100644 --- a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts @@ -37,7 +37,7 @@ import { FormCloudService } from '../services/form-cloud.service'; import { TaskVariableCloud } from '../models/task-variable-cloud.model'; import { TaskDetailsCloudModel } from '../../task/start-task/models/task-details-cloud.model'; import { MatDialog } from '@angular/material/dialog'; -import { ConfirmDialogComponent } from '@alfresco/adf-content-services'; +import { ConfirmDialogComponent } from '@alfresco/adf-core'; import { v4 as uuidGeneration } from 'uuid'; import { FormCloudDisplayMode, FormCloudDisplayModeConfiguration } from '../../services/form-fields.interfaces'; import { DisplayModeService } from '../public-api';