diff --git a/lib/core/src/lib/core.module.ts b/lib/core/src/lib/core.module.ts index 2970f0e3a8..c07fb9e327 100644 --- a/lib/core/src/lib/core.module.ts +++ b/lib/core/src/lib/core.module.ts @@ -26,7 +26,6 @@ import { LANGUAGE_MENU_DIRECTIVES } from './language-menu/language-menu.module'; import { LOGIN_DIRECTIVES } from './login/login.module'; import { PAGINATION_DIRECTIVES } from './pagination/pagination.module'; import { TOOLBAR_DIRECTIVES } from './toolbar/toolbar.module'; -import { VIEWER_DIRECTIVES } from './viewer/viewer.module'; import { FormBaseModule } from './form/form-base.module'; import { LAYOUT_DIRECTIVES } from './layout/layout.module'; import { CommentsComponent } from './comments/comments.component'; @@ -61,7 +60,6 @@ import { MaterialModule } from './material.module'; imports: [ TranslateModule, ...ABOUT_DIRECTIVES, - ...VIEWER_DIRECTIVES, ...LAYOUT_DIRECTIVES, ...CORE_PIPES, IdentityUserInfoComponent, @@ -97,7 +95,6 @@ import { MaterialModule } from './material.module'; providers: [...CORE_PIPES], exports: [ ...ABOUT_DIRECTIVES, - ...VIEWER_DIRECTIVES, ...LAYOUT_DIRECTIVES, ...CORE_PIPES, ...CORE_DIRECTIVES, diff --git a/lib/core/src/lib/form/components/widgets/index.ts b/lib/core/src/lib/form/components/widgets/index.ts index e4f40afe6b..a21814b469 100644 --- a/lib/core/src/lib/form/components/widgets/index.ts +++ b/lib/core/src/lib/form/components/widgets/index.ts @@ -29,7 +29,6 @@ import { InputMaskDirective } from './text/text-mask.component'; import { TextWidgetComponent } from './text/text.widget'; import { DateTimeWidgetComponent } from './date-time/date-time.widget'; import { JsonWidgetComponent } from './json/json.widget'; -import { BaseViewerWidgetComponent } from './base-viewer/base-viewer.widget'; import { DecimalWidgetComponent } from './decimal/decimal.component'; // core @@ -50,7 +49,6 @@ export * from './amount/amount.widget'; export * from './error/error.component'; export * from './date-time/date-time.widget'; export * from './json/json.widget'; -export * from './base-viewer/base-viewer.widget'; export * from './text/text-mask.component'; // widgets with schema @@ -70,8 +68,7 @@ export const WIDGET_DIRECTIVES = [ AmountWidgetComponent, ErrorWidgetComponent, DateTimeWidgetComponent, - JsonWidgetComponent, - BaseViewerWidgetComponent + JsonWidgetComponent ] as const; export const MASK_DIRECTIVE = [InputMaskDirective] as const; diff --git a/lib/core/src/lib/form/services/form-rendering.service.ts b/lib/core/src/lib/form/services/form-rendering.service.ts index 085c439cde..97bb68d2c8 100644 --- a/lib/core/src/lib/form/services/form-rendering.service.ts +++ b/lib/core/src/lib/form/services/form-rendering.service.ts @@ -43,7 +43,6 @@ export class FormRenderingService extends DynamicComponentMapper { [FormFieldTypes.READONLY_TEXT]: DynamicComponentResolver.fromType(widgets.DisplayTextWidgetComponent), [FormFieldTypes.JSON]: DynamicComponentResolver.fromType(widgets.JsonWidgetComponent), [FormFieldTypes.DISPLAY_VALUE]: DynamicComponentResolver.fromType(widgets.TextWidgetComponent), - [FormFieldTypes.DATETIME]: DynamicComponentResolver.fromType(widgets.DateTimeWidgetComponent), - [FormFieldTypes.VIEWER]: DynamicComponentResolver.fromType(widgets.BaseViewerWidgetComponent) + [FormFieldTypes.DATETIME]: DynamicComponentResolver.fromType(widgets.DateTimeWidgetComponent) }; } diff --git a/lib/core/src/public-api.ts b/lib/core/src/public-api.ts index 0c7af4c561..522954520e 100644 --- a/lib/core/src/public-api.ts +++ b/lib/core/src/public-api.ts @@ -19,7 +19,6 @@ export * from './lib/about/index'; export * from './lib/avatar/avatar.component'; export * from './lib/button/button.component'; export * from './lib/progress/progress.component'; -export * from './lib/viewer/index'; export * from './lib/toolbar/index'; export * from './lib/header/index'; export * from './lib/pagination/index'; diff --git a/lib/core/tsconfig.lib.json b/lib/core/tsconfig.lib.json index 5235439297..a81146090f 100644 --- a/lib/core/tsconfig.lib.json +++ b/lib/core/tsconfig.lib.json @@ -11,6 +11,8 @@ "@alfresco/adf-core/shell": ["../shell/src/index.ts"], "@alfresco/adf-core/api": ["../api/src/index.ts"], "@alfresco/adf-core/feature-flags": ["../feature-flags/src/index.ts"], + "@alfresco/adf-core/viewer": ["../viewer/src/index.ts"], + "@alfresco/adf-core": ["../src/public-api.ts"], "@alfresco/js-api": ["../../../dist/libs/js-api"], "@alfresco/js-api/*": ["../../../dist/libs/js-api/*"] }, diff --git a/lib/core/viewer/ng-package.json b/lib/core/viewer/ng-package.json new file mode 100644 index 0000000000..caac2fd9f1 --- /dev/null +++ b/lib/core/viewer/ng-package.json @@ -0,0 +1,8 @@ +{ + "lib": { + "entryFile": "src/index.ts", + "styleIncludePaths": [ + "../src/lib/styles" + ] + } +} diff --git a/lib/core/src/lib/viewer/index.ts b/lib/core/viewer/public-api.ts similarity index 95% rename from lib/core/src/lib/viewer/index.ts rename to lib/core/viewer/public-api.ts index f22da90e09..770628866f 100644 --- a/lib/core/src/lib/viewer/index.ts +++ b/lib/core/viewer/public-api.ts @@ -15,4 +15,4 @@ * limitations under the License. */ -export * from './public-api'; +export * from './src/index'; diff --git a/lib/core/src/lib/viewer/assets/fake-test-file.pdf b/lib/core/viewer/src/assets/fake-test-file.pdf similarity index 100% rename from lib/core/src/lib/viewer/assets/fake-test-file.pdf rename to lib/core/viewer/src/assets/fake-test-file.pdf diff --git a/lib/core/src/lib/viewer/assets/fake-test-file.txt b/lib/core/viewer/src/assets/fake-test-file.txt similarity index 100% rename from lib/core/src/lib/viewer/assets/fake-test-file.txt rename to lib/core/viewer/src/assets/fake-test-file.txt diff --git a/lib/core/src/lib/viewer/assets/fake-test-password-file.pdf b/lib/core/viewer/src/assets/fake-test-password-file.pdf similarity index 100% rename from lib/core/src/lib/viewer/assets/fake-test-password-file.pdf rename to lib/core/viewer/src/assets/fake-test-password-file.pdf diff --git a/lib/core/src/lib/viewer/assets/fake-test-video.mp4 b/lib/core/viewer/src/assets/fake-test-video.mp4 similarity index 100% rename from lib/core/src/lib/viewer/assets/fake-test-video.mp4 rename to lib/core/viewer/src/assets/fake-test-video.mp4 diff --git a/lib/core/src/lib/viewer/components/download-prompt-dialog/download-prompt-dialog.component.html b/lib/core/viewer/src/components/download-prompt-dialog/download-prompt-dialog.component.html similarity index 100% rename from lib/core/src/lib/viewer/components/download-prompt-dialog/download-prompt-dialog.component.html rename to lib/core/viewer/src/components/download-prompt-dialog/download-prompt-dialog.component.html diff --git a/lib/core/src/lib/viewer/components/download-prompt-dialog/download-prompt-dialog.component.spec.ts b/lib/core/viewer/src/components/download-prompt-dialog/download-prompt-dialog.component.spec.ts similarity index 100% rename from lib/core/src/lib/viewer/components/download-prompt-dialog/download-prompt-dialog.component.spec.ts rename to lib/core/viewer/src/components/download-prompt-dialog/download-prompt-dialog.component.spec.ts diff --git a/lib/core/src/lib/viewer/components/download-prompt-dialog/download-prompt-dialog.component.ts b/lib/core/viewer/src/components/download-prompt-dialog/download-prompt-dialog.component.ts similarity index 100% rename from lib/core/src/lib/viewer/components/download-prompt-dialog/download-prompt-dialog.component.ts rename to lib/core/viewer/src/components/download-prompt-dialog/download-prompt-dialog.component.ts diff --git a/lib/core/src/lib/viewer/components/img-viewer/img-viewer.component.html b/lib/core/viewer/src/components/img-viewer/img-viewer.component.html similarity index 100% rename from lib/core/src/lib/viewer/components/img-viewer/img-viewer.component.html rename to lib/core/viewer/src/components/img-viewer/img-viewer.component.html diff --git a/lib/core/src/lib/viewer/components/img-viewer/img-viewer.component.scss b/lib/core/viewer/src/components/img-viewer/img-viewer.component.scss similarity index 97% rename from lib/core/src/lib/viewer/components/img-viewer/img-viewer.component.scss rename to lib/core/viewer/src/components/img-viewer/img-viewer.component.scss index b2237920cf..7450127d54 100644 --- a/lib/core/src/lib/viewer/components/img-viewer/img-viewer.component.scss +++ b/lib/core/viewer/src/components/img-viewer/img-viewer.component.scss @@ -1,4 +1,4 @@ -@use '../../../styles/mat-selectors' as ms; +@use 'mat-selectors' as ms; .adf-image-viewer { width: 100%; diff --git a/lib/core/src/lib/viewer/components/img-viewer/img-viewer.component.spec.ts b/lib/core/viewer/src/components/img-viewer/img-viewer.component.spec.ts similarity index 100% rename from lib/core/src/lib/viewer/components/img-viewer/img-viewer.component.spec.ts rename to lib/core/viewer/src/components/img-viewer/img-viewer.component.spec.ts diff --git a/lib/core/src/lib/viewer/components/img-viewer/img-viewer.component.ts b/lib/core/viewer/src/components/img-viewer/img-viewer.component.ts similarity index 97% rename from lib/core/src/lib/viewer/components/img-viewer/img-viewer.component.ts rename to lib/core/viewer/src/components/img-viewer/img-viewer.component.ts index 1f535b3d3f..14e6f67ebd 100644 --- a/lib/core/src/lib/viewer/components/img-viewer/img-viewer.component.ts +++ b/lib/core/viewer/src/components/img-viewer/img-viewer.component.ts @@ -34,9 +34,7 @@ import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { TranslateModule } from '@ngx-translate/core'; import Cropper from 'cropperjs'; -import { AppConfigService } from '../../../app-config'; -import { UrlService } from '../../../common'; -import { ToolbarComponent } from '../../../toolbar'; +import { AppConfigService, UrlService, ToolbarComponent } from '@alfresco/adf-core'; @Component({ selector: 'adf-img-viewer', diff --git a/lib/core/src/lib/viewer/components/media-player/media-player.component.html b/lib/core/viewer/src/components/media-player/media-player.component.html similarity index 100% rename from lib/core/src/lib/viewer/components/media-player/media-player.component.html rename to lib/core/viewer/src/components/media-player/media-player.component.html diff --git a/lib/core/src/lib/viewer/components/media-player/media-player.component.scss b/lib/core/viewer/src/components/media-player/media-player.component.scss similarity index 100% rename from lib/core/src/lib/viewer/components/media-player/media-player.component.scss rename to lib/core/viewer/src/components/media-player/media-player.component.scss diff --git a/lib/core/src/lib/viewer/components/media-player/media-player.component.ts b/lib/core/viewer/src/components/media-player/media-player.component.ts similarity index 97% rename from lib/core/src/lib/viewer/components/media-player/media-player.component.ts rename to lib/core/viewer/src/components/media-player/media-player.component.ts index 50d8f8d40a..21630d7c65 100644 --- a/lib/core/src/lib/viewer/components/media-player/media-player.component.ts +++ b/lib/core/viewer/src/components/media-player/media-player.component.ts @@ -17,7 +17,7 @@ import { NgClass, NgForOf } from '@angular/common'; import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges, ViewEncapsulation } from '@angular/core'; -import { UrlService } from '../../../common'; +import { UrlService } from '@alfresco/adf-core'; import { Track } from '../../models/viewer.model'; @Component({ diff --git a/lib/core/src/lib/viewer/components/mock/adf-viewer-container-more-actions.component.mock.ts b/lib/core/viewer/src/components/mock/adf-viewer-container-more-actions.component.mock.ts similarity index 100% rename from lib/core/src/lib/viewer/components/mock/adf-viewer-container-more-actions.component.mock.ts rename to lib/core/viewer/src/components/mock/adf-viewer-container-more-actions.component.mock.ts diff --git a/lib/core/src/lib/viewer/components/mock/adf-viewer-container-open-with.component.mock.ts b/lib/core/viewer/src/components/mock/adf-viewer-container-open-with.component.mock.ts similarity index 100% rename from lib/core/src/lib/viewer/components/mock/adf-viewer-container-open-with.component.mock.ts rename to lib/core/viewer/src/components/mock/adf-viewer-container-open-with.component.mock.ts diff --git a/lib/core/src/lib/viewer/components/mock/adf-viewer-container-sidebar.component.mock.ts b/lib/core/viewer/src/components/mock/adf-viewer-container-sidebar.component.mock.ts similarity index 100% rename from lib/core/src/lib/viewer/components/mock/adf-viewer-container-sidebar.component.mock.ts rename to lib/core/viewer/src/components/mock/adf-viewer-container-sidebar.component.mock.ts diff --git a/lib/core/src/lib/viewer/components/mock/adf-viewer-container-toolbar-actions.component.mock.ts b/lib/core/viewer/src/components/mock/adf-viewer-container-toolbar-actions.component.mock.ts similarity index 100% rename from lib/core/src/lib/viewer/components/mock/adf-viewer-container-toolbar-actions.component.mock.ts rename to lib/core/viewer/src/components/mock/adf-viewer-container-toolbar-actions.component.mock.ts diff --git a/lib/core/src/lib/viewer/components/mock/adf-viewer-container-toolbar.component.mock.ts b/lib/core/viewer/src/components/mock/adf-viewer-container-toolbar.component.mock.ts similarity index 100% rename from lib/core/src/lib/viewer/components/mock/adf-viewer-container-toolbar.component.mock.ts rename to lib/core/viewer/src/components/mock/adf-viewer-container-toolbar.component.mock.ts diff --git a/lib/core/src/lib/viewer/components/mock/pdfjs-lib.mock.ts b/lib/core/viewer/src/components/mock/pdfjs-lib.mock.ts similarity index 100% rename from lib/core/src/lib/viewer/components/mock/pdfjs-lib.mock.ts rename to lib/core/viewer/src/components/mock/pdfjs-lib.mock.ts diff --git a/lib/core/src/lib/viewer/components/pdf-viewer-password-dialog/pdf-viewer-password-dialog.html b/lib/core/viewer/src/components/pdf-viewer-password-dialog/pdf-viewer-password-dialog.html similarity index 100% rename from lib/core/src/lib/viewer/components/pdf-viewer-password-dialog/pdf-viewer-password-dialog.html rename to lib/core/viewer/src/components/pdf-viewer-password-dialog/pdf-viewer-password-dialog.html diff --git a/lib/core/src/lib/viewer/components/pdf-viewer-password-dialog/pdf-viewer-password-dialog.scss b/lib/core/viewer/src/components/pdf-viewer-password-dialog/pdf-viewer-password-dialog.scss similarity index 100% rename from lib/core/src/lib/viewer/components/pdf-viewer-password-dialog/pdf-viewer-password-dialog.scss rename to lib/core/viewer/src/components/pdf-viewer-password-dialog/pdf-viewer-password-dialog.scss diff --git a/lib/core/src/lib/viewer/components/pdf-viewer-password-dialog/pdf-viewer-password-dialog.spec.ts b/lib/core/viewer/src/components/pdf-viewer-password-dialog/pdf-viewer-password-dialog.spec.ts similarity index 100% rename from lib/core/src/lib/viewer/components/pdf-viewer-password-dialog/pdf-viewer-password-dialog.spec.ts rename to lib/core/viewer/src/components/pdf-viewer-password-dialog/pdf-viewer-password-dialog.spec.ts diff --git a/lib/core/src/lib/viewer/components/pdf-viewer-password-dialog/pdf-viewer-password-dialog.ts b/lib/core/viewer/src/components/pdf-viewer-password-dialog/pdf-viewer-password-dialog.ts similarity index 100% rename from lib/core/src/lib/viewer/components/pdf-viewer-password-dialog/pdf-viewer-password-dialog.ts rename to lib/core/viewer/src/components/pdf-viewer-password-dialog/pdf-viewer-password-dialog.ts diff --git a/lib/core/src/lib/viewer/components/pdf-viewer-thumb/pdf-viewer-thumb.component.html b/lib/core/viewer/src/components/pdf-viewer-thumb/pdf-viewer-thumb.component.html similarity index 100% rename from lib/core/src/lib/viewer/components/pdf-viewer-thumb/pdf-viewer-thumb.component.html rename to lib/core/viewer/src/components/pdf-viewer-thumb/pdf-viewer-thumb.component.html diff --git a/lib/core/src/lib/viewer/components/pdf-viewer-thumb/pdf-viewer-thumb.component.spec.ts b/lib/core/viewer/src/components/pdf-viewer-thumb/pdf-viewer-thumb.component.spec.ts similarity index 100% rename from lib/core/src/lib/viewer/components/pdf-viewer-thumb/pdf-viewer-thumb.component.spec.ts rename to lib/core/viewer/src/components/pdf-viewer-thumb/pdf-viewer-thumb.component.spec.ts diff --git a/lib/core/src/lib/viewer/components/pdf-viewer-thumb/pdf-viewer-thumb.component.ts b/lib/core/viewer/src/components/pdf-viewer-thumb/pdf-viewer-thumb.component.ts similarity index 100% rename from lib/core/src/lib/viewer/components/pdf-viewer-thumb/pdf-viewer-thumb.component.ts rename to lib/core/viewer/src/components/pdf-viewer-thumb/pdf-viewer-thumb.component.ts diff --git a/lib/core/src/lib/viewer/components/pdf-viewer-thumbnails/pdf-viewer-thumbnails.component.html b/lib/core/viewer/src/components/pdf-viewer-thumbnails/pdf-viewer-thumbnails.component.html similarity index 100% rename from lib/core/src/lib/viewer/components/pdf-viewer-thumbnails/pdf-viewer-thumbnails.component.html rename to lib/core/viewer/src/components/pdf-viewer-thumbnails/pdf-viewer-thumbnails.component.html diff --git a/lib/core/src/lib/viewer/components/pdf-viewer-thumbnails/pdf-viewer-thumbnails.component.scss b/lib/core/viewer/src/components/pdf-viewer-thumbnails/pdf-viewer-thumbnails.component.scss similarity index 100% rename from lib/core/src/lib/viewer/components/pdf-viewer-thumbnails/pdf-viewer-thumbnails.component.scss rename to lib/core/viewer/src/components/pdf-viewer-thumbnails/pdf-viewer-thumbnails.component.scss diff --git a/lib/core/src/lib/viewer/components/pdf-viewer-thumbnails/pdf-viewer-thumbnails.component.spec.ts b/lib/core/viewer/src/components/pdf-viewer-thumbnails/pdf-viewer-thumbnails.component.spec.ts similarity index 100% rename from lib/core/src/lib/viewer/components/pdf-viewer-thumbnails/pdf-viewer-thumbnails.component.spec.ts rename to lib/core/viewer/src/components/pdf-viewer-thumbnails/pdf-viewer-thumbnails.component.spec.ts diff --git a/lib/core/src/lib/viewer/components/pdf-viewer-thumbnails/pdf-viewer-thumbnails.component.ts b/lib/core/viewer/src/components/pdf-viewer-thumbnails/pdf-viewer-thumbnails.component.ts similarity index 100% rename from lib/core/src/lib/viewer/components/pdf-viewer-thumbnails/pdf-viewer-thumbnails.component.ts rename to lib/core/viewer/src/components/pdf-viewer-thumbnails/pdf-viewer-thumbnails.component.ts diff --git a/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer-host.component.scss b/lib/core/viewer/src/components/pdf-viewer/pdf-viewer-host.component.scss similarity index 100% rename from lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer-host.component.scss rename to lib/core/viewer/src/components/pdf-viewer/pdf-viewer-host.component.scss diff --git a/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.html b/lib/core/viewer/src/components/pdf-viewer/pdf-viewer.component.html similarity index 100% rename from lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.html rename to lib/core/viewer/src/components/pdf-viewer/pdf-viewer.component.html diff --git a/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.scss b/lib/core/viewer/src/components/pdf-viewer/pdf-viewer.component.scss similarity index 98% rename from lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.scss rename to lib/core/viewer/src/components/pdf-viewer/pdf-viewer.component.scss index 35d956b8e4..242b79d61c 100644 --- a/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.scss +++ b/lib/core/viewer/src/components/pdf-viewer/pdf-viewer.component.scss @@ -1,4 +1,4 @@ -@use '../../../styles/mat-selectors' as ms; +@use 'mat-selectors' as ms; .adf-pdf-viewer { width: 100%; diff --git a/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.spec.ts b/lib/core/viewer/src/components/pdf-viewer/pdf-viewer.component.spec.ts similarity index 100% rename from lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.spec.ts rename to lib/core/viewer/src/components/pdf-viewer/pdf-viewer.component.spec.ts diff --git a/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.ts b/lib/core/viewer/src/components/pdf-viewer/pdf-viewer.component.ts similarity index 99% rename from lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.ts rename to lib/core/viewer/src/components/pdf-viewer/pdf-viewer.component.ts index dc59f3a69f..6cc8b33974 100644 --- a/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.ts +++ b/lib/core/viewer/src/components/pdf-viewer/pdf-viewer.component.ts @@ -41,8 +41,7 @@ import { MatProgressBarModule } from '@angular/material/progress-bar'; import { TranslateModule } from '@ngx-translate/core'; import { from, Subject, switchMap } from 'rxjs'; import { catchError } from 'rxjs/operators'; -import { AppConfigService } from '../../../app-config'; -import { ToolbarComponent, ToolbarDividerComponent } from '../../../toolbar'; +import { AppConfigService, ToolbarComponent, ToolbarDividerComponent } from '@alfresco/adf-core'; import { RenderingQueueServices } from '../../services/rendering-queue.services'; import { PdfPasswordDialogComponent } from '../pdf-viewer-password-dialog/pdf-viewer-password-dialog'; import { PdfThumbListComponent } from '../pdf-viewer-thumbnails/pdf-viewer-thumbnails.component'; diff --git a/lib/core/src/lib/viewer/components/txt-viewer/txt-viewer.component.html b/lib/core/viewer/src/components/txt-viewer/txt-viewer.component.html similarity index 100% rename from lib/core/src/lib/viewer/components/txt-viewer/txt-viewer.component.html rename to lib/core/viewer/src/components/txt-viewer/txt-viewer.component.html diff --git a/lib/core/src/lib/viewer/components/txt-viewer/txt-viewer.component.scss b/lib/core/viewer/src/components/txt-viewer/txt-viewer.component.scss similarity index 100% rename from lib/core/src/lib/viewer/components/txt-viewer/txt-viewer.component.scss rename to lib/core/viewer/src/components/txt-viewer/txt-viewer.component.scss diff --git a/lib/core/src/lib/viewer/components/txt-viewer/txt-viewer.component.spec.ts b/lib/core/viewer/src/components/txt-viewer/txt-viewer.component.spec.ts similarity index 97% rename from lib/core/src/lib/viewer/components/txt-viewer/txt-viewer.component.spec.ts rename to lib/core/viewer/src/components/txt-viewer/txt-viewer.component.spec.ts index 05019a5a5d..afe6cbfb63 100644 --- a/lib/core/src/lib/viewer/components/txt-viewer/txt-viewer.component.spec.ts +++ b/lib/core/viewer/src/components/txt-viewer/txt-viewer.component.spec.ts @@ -18,7 +18,7 @@ import { SimpleChange } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TxtViewerComponent } from './txt-viewer.component'; -import { CoreTestingModule, UnitTestingUtils } from '../../../testing'; +import { CoreTestingModule, UnitTestingUtils } from '@alfresco/adf-core'; import { HttpClient } from '@angular/common/http'; import { of } from 'rxjs'; diff --git a/lib/core/src/lib/viewer/components/txt-viewer/txt-viewer.component.ts b/lib/core/viewer/src/components/txt-viewer/txt-viewer.component.ts similarity index 98% rename from lib/core/src/lib/viewer/components/txt-viewer/txt-viewer.component.ts rename to lib/core/viewer/src/components/txt-viewer/txt-viewer.component.ts index c818c3cd72..e83c5fc05e 100644 --- a/lib/core/src/lib/viewer/components/txt-viewer/txt-viewer.component.ts +++ b/lib/core/viewer/src/components/txt-viewer/txt-viewer.component.ts @@ -17,7 +17,7 @@ import { HttpClient } from '@angular/common/http'; import { Component, Input, OnChanges, SimpleChanges, ViewEncapsulation } from '@angular/core'; -import { AppConfigService } from '../../../app-config'; +import { AppConfigService } from '@alfresco/adf-core'; @Component({ selector: 'adf-txt-viewer', diff --git a/lib/core/src/lib/viewer/components/unknown-format/unknown-format.component.html b/lib/core/viewer/src/components/unknown-format/unknown-format.component.html similarity index 100% rename from lib/core/src/lib/viewer/components/unknown-format/unknown-format.component.html rename to lib/core/viewer/src/components/unknown-format/unknown-format.component.html diff --git a/lib/core/src/lib/viewer/components/unknown-format/unknown-format.component.scss b/lib/core/viewer/src/components/unknown-format/unknown-format.component.scss similarity index 100% rename from lib/core/src/lib/viewer/components/unknown-format/unknown-format.component.scss rename to lib/core/viewer/src/components/unknown-format/unknown-format.component.scss diff --git a/lib/core/src/lib/viewer/components/unknown-format/unknown-format.component.spec.ts b/lib/core/viewer/src/components/unknown-format/unknown-format.component.spec.ts similarity index 100% rename from lib/core/src/lib/viewer/components/unknown-format/unknown-format.component.spec.ts rename to lib/core/viewer/src/components/unknown-format/unknown-format.component.spec.ts diff --git a/lib/core/src/lib/viewer/components/unknown-format/unknown-format.component.ts b/lib/core/viewer/src/components/unknown-format/unknown-format.component.ts similarity index 100% rename from lib/core/src/lib/viewer/components/unknown-format/unknown-format.component.ts rename to lib/core/viewer/src/components/unknown-format/unknown-format.component.ts diff --git a/lib/core/src/lib/viewer/components/viewer-more-actions.component.ts b/lib/core/viewer/src/components/viewer-more-actions.component.ts similarity index 100% rename from lib/core/src/lib/viewer/components/viewer-more-actions.component.ts rename to lib/core/viewer/src/components/viewer-more-actions.component.ts diff --git a/lib/core/src/lib/viewer/components/viewer-open-with.component.ts b/lib/core/viewer/src/components/viewer-open-with.component.ts similarity index 100% rename from lib/core/src/lib/viewer/components/viewer-open-with.component.ts rename to lib/core/viewer/src/components/viewer-open-with.component.ts diff --git a/lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.html b/lib/core/viewer/src/components/viewer-render/viewer-render.component.html similarity index 100% rename from lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.html rename to lib/core/viewer/src/components/viewer-render/viewer-render.component.html diff --git a/lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.scss b/lib/core/viewer/src/components/viewer-render/viewer-render.component.scss similarity index 100% rename from lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.scss rename to lib/core/viewer/src/components/viewer-render/viewer-render.component.scss diff --git a/lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.spec.ts b/lib/core/viewer/src/components/viewer-render/viewer-render.component.spec.ts similarity index 100% rename from lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.spec.ts rename to lib/core/viewer/src/components/viewer-render/viewer-render.component.spec.ts diff --git a/lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.ts b/lib/core/viewer/src/components/viewer-render/viewer-render.component.ts similarity index 100% rename from lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.ts rename to lib/core/viewer/src/components/viewer-render/viewer-render.component.ts diff --git a/lib/core/src/lib/viewer/components/viewer-sidebar.component.ts b/lib/core/viewer/src/components/viewer-sidebar.component.ts similarity index 100% rename from lib/core/src/lib/viewer/components/viewer-sidebar.component.ts rename to lib/core/viewer/src/components/viewer-sidebar.component.ts diff --git a/lib/core/src/lib/viewer/components/viewer-toolbar-actions.component.ts b/lib/core/viewer/src/components/viewer-toolbar-actions.component.ts similarity index 100% rename from lib/core/src/lib/viewer/components/viewer-toolbar-actions.component.ts rename to lib/core/viewer/src/components/viewer-toolbar-actions.component.ts diff --git a/lib/core/src/lib/viewer/components/viewer-toolbar-custom-actions.component.ts b/lib/core/viewer/src/components/viewer-toolbar-custom-actions.component.ts similarity index 100% rename from lib/core/src/lib/viewer/components/viewer-toolbar-custom-actions.component.ts rename to lib/core/viewer/src/components/viewer-toolbar-custom-actions.component.ts diff --git a/lib/core/src/lib/viewer/components/viewer-toolbar.component.ts b/lib/core/viewer/src/components/viewer-toolbar.component.ts similarity index 100% rename from lib/core/src/lib/viewer/components/viewer-toolbar.component.ts rename to lib/core/viewer/src/components/viewer-toolbar.component.ts diff --git a/lib/core/src/lib/viewer/components/viewer.component.html b/lib/core/viewer/src/components/viewer.component.html similarity index 100% rename from lib/core/src/lib/viewer/components/viewer.component.html rename to lib/core/viewer/src/components/viewer.component.html diff --git a/lib/core/src/lib/viewer/components/viewer.component.scss b/lib/core/viewer/src/components/viewer.component.scss similarity index 98% rename from lib/core/src/lib/viewer/components/viewer.component.scss rename to lib/core/viewer/src/components/viewer.component.scss index 9116c626fb..5ddbc68f32 100644 --- a/lib/core/src/lib/viewer/components/viewer.component.scss +++ b/lib/core/viewer/src/components/viewer.component.scss @@ -1,5 +1,5 @@ /* stylelint-disable scss/at-extend-no-missing-placeholder */ -@use '../../styles/mat-selectors' as ms; +@use 'mat-selectors' as ms; .adf-full-screen { width: 100%; diff --git a/lib/core/src/lib/viewer/components/viewer.component.spec.ts b/lib/core/viewer/src/components/viewer.component.spec.ts similarity index 100% rename from lib/core/src/lib/viewer/components/viewer.component.spec.ts rename to lib/core/viewer/src/components/viewer.component.spec.ts diff --git a/lib/core/src/lib/viewer/components/viewer.component.ts b/lib/core/viewer/src/components/viewer.component.ts similarity index 98% rename from lib/core/src/lib/viewer/components/viewer.component.ts rename to lib/core/viewer/src/components/viewer.component.ts index 4a3764c616..2a2e893509 100644 --- a/lib/core/src/lib/viewer/components/viewer.component.ts +++ b/lib/core/viewer/src/components/viewer.component.ts @@ -41,8 +41,6 @@ import { MatMenuModule } from '@angular/material/menu'; import { TranslateModule } from '@ngx-translate/core'; import { fromEvent } from 'rxjs'; import { filter, first, skipWhile } from 'rxjs/operators'; -import { AppConfigService } from '../../app-config'; -import { ToolbarComponent, ToolbarDividerComponent, ToolbarTitleComponent } from '../../toolbar'; import { DownloadPromptActions } from '../models/download-prompt.actions'; import { CloseButtonPosition, Track } from '../models/viewer.model'; import { ViewUtilService } from '../services/view-util.service'; @@ -54,8 +52,14 @@ import { ViewerSidebarComponent } from './viewer-sidebar.component'; import { ViewerToolbarComponent } from './viewer-toolbar.component'; import { ViewerToolbarActionsComponent } from './viewer-toolbar-actions.component'; import { ViewerToolbarCustomActionsComponent } from './viewer-toolbar-custom-actions.component'; -import { IconComponent } from '../../icon'; -import { ThumbnailService } from '../../common'; +import { + ThumbnailService, + IconComponent, + ToolbarComponent, + ToolbarDividerComponent, + ToolbarTitleComponent, + AppConfigService +} from '@alfresco/adf-core'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; const DEFAULT_NON_PREVIEW_CONFIG = { diff --git a/lib/core/src/lib/viewer/directives/viewer-extension.directive.spec.ts b/lib/core/viewer/src/directives/viewer-extension.directive.spec.ts similarity index 100% rename from lib/core/src/lib/viewer/directives/viewer-extension.directive.spec.ts rename to lib/core/viewer/src/directives/viewer-extension.directive.spec.ts diff --git a/lib/core/src/lib/viewer/directives/viewer-extension.directive.ts b/lib/core/viewer/src/directives/viewer-extension.directive.ts similarity index 100% rename from lib/core/src/lib/viewer/directives/viewer-extension.directive.ts rename to lib/core/viewer/src/directives/viewer-extension.directive.ts diff --git a/lib/core/src/lib/viewer/public-api.ts b/lib/core/viewer/src/index.ts similarity index 100% rename from lib/core/src/lib/viewer/public-api.ts rename to lib/core/viewer/src/index.ts diff --git a/lib/core/src/lib/viewer/models/download-prompt.actions.ts b/lib/core/viewer/src/models/download-prompt.actions.ts similarity index 100% rename from lib/core/src/lib/viewer/models/download-prompt.actions.ts rename to lib/core/viewer/src/models/download-prompt.actions.ts diff --git a/lib/core/src/lib/viewer/models/viewer.model.ts b/lib/core/viewer/src/models/viewer.model.ts similarity index 100% rename from lib/core/src/lib/viewer/models/viewer.model.ts rename to lib/core/viewer/src/models/viewer.model.ts diff --git a/lib/core/src/lib/viewer/services/rendering-queue.services.ts b/lib/core/viewer/src/services/rendering-queue.services.ts similarity index 100% rename from lib/core/src/lib/viewer/services/rendering-queue.services.ts rename to lib/core/viewer/src/services/rendering-queue.services.ts diff --git a/lib/core/src/lib/viewer/services/view-util.service.spec.ts b/lib/core/viewer/src/services/view-util.service.spec.ts similarity index 100% rename from lib/core/src/lib/viewer/services/view-util.service.spec.ts rename to lib/core/viewer/src/services/view-util.service.spec.ts diff --git a/lib/core/src/lib/viewer/services/view-util.service.ts b/lib/core/viewer/src/services/view-util.service.ts similarity index 100% rename from lib/core/src/lib/viewer/services/view-util.service.ts rename to lib/core/viewer/src/services/view-util.service.ts diff --git a/lib/core/src/lib/viewer/viewer.module.ts b/lib/core/viewer/src/viewer.module.ts similarity index 100% rename from lib/core/src/lib/viewer/viewer.module.ts rename to lib/core/viewer/src/viewer.module.ts diff --git a/lib/core/src/lib/form/components/widgets/base-viewer/base-viewer.widget.html b/lib/core/viewer/src/widgets/base-viewer/base-viewer.widget.html similarity index 100% rename from lib/core/src/lib/form/components/widgets/base-viewer/base-viewer.widget.html rename to lib/core/viewer/src/widgets/base-viewer/base-viewer.widget.html diff --git a/lib/core/src/lib/form/components/widgets/base-viewer/base-viewer.widget.scss b/lib/core/viewer/src/widgets/base-viewer/base-viewer.widget.scss similarity index 100% rename from lib/core/src/lib/form/components/widgets/base-viewer/base-viewer.widget.scss rename to lib/core/viewer/src/widgets/base-viewer/base-viewer.widget.scss diff --git a/lib/core/src/lib/form/components/widgets/base-viewer/base-viewer.widget.spec.ts b/lib/core/viewer/src/widgets/base-viewer/base-viewer.widget.spec.ts similarity index 90% rename from lib/core/src/lib/form/components/widgets/base-viewer/base-viewer.widget.spec.ts rename to lib/core/viewer/src/widgets/base-viewer/base-viewer.widget.spec.ts index d51e4c38e2..c73cdfaefc 100644 --- a/lib/core/src/lib/form/components/widgets/base-viewer/base-viewer.widget.spec.ts +++ b/lib/core/viewer/src/widgets/base-viewer/base-viewer.widget.spec.ts @@ -16,9 +16,10 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { CoreTestingModule } from '../../../../testing'; -import { FormService } from '../../../services/form.service'; -import { FormFieldModel, FormModel } from '../core'; +// import { CoreTestingModule } from '../../../../src/lib/testing'; +// import { FormService } from '../../../../src/lib/form/services/form.service'; +// import { FormFieldModel, FormModel } from '../../../../src/lib/form/components/widgets/core'; +import { CoreTestingModule, FormService, FormFieldModel, FormModel } from '@alfresco/adf-core'; import { BaseViewerWidgetComponent } from './base-viewer.widget'; describe('BaseViewerWidgetComponent', () => { diff --git a/lib/core/src/lib/form/components/widgets/base-viewer/base-viewer.widget.ts b/lib/core/viewer/src/widgets/base-viewer/base-viewer.widget.ts similarity index 89% rename from lib/core/src/lib/form/components/widgets/base-viewer/base-viewer.widget.ts rename to lib/core/viewer/src/widgets/base-viewer/base-viewer.widget.ts index a4f5f0a052..d67ee63038 100644 --- a/lib/core/src/lib/form/components/widgets/base-viewer/base-viewer.widget.ts +++ b/lib/core/viewer/src/widgets/base-viewer/base-viewer.widget.ts @@ -18,10 +18,8 @@ import { NgIf } from '@angular/common'; import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; -import { ViewerComponent } from '../../../../viewer'; -import { FormService } from '../../../services/form.service'; -import { ErrorWidgetComponent } from '../error/error.component'; -import { WidgetComponent } from '../widget.component'; +import { ViewerComponent } from '@alfresco/adf-core/viewer'; +import { FormService, ErrorWidgetComponent, WidgetComponent } from '@alfresco/adf-core'; /* eslint-disable @angular-eslint/component-selector */ diff --git a/tsconfig.json b/tsconfig.json index 3afd6c280c..8f46b9d92b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -28,6 +28,7 @@ "@alfresco/adf-core/api": ["lib/core/api/src/index.ts"], "@alfresco/adf-core/auth": ["lib/core/auth/src/index.ts"], "@alfresco/adf-core/breadcrumbs": ["lib/core/breadcrumbs/src/index.ts"], + "@alfresco/adf-core/viewer": ["lib/core/viewer/src/index.ts"], "@alfresco/adf-core/feature-flags": ["lib/core/feature-flags/public-api.ts"], "@alfresco/adf-core/shell": ["lib/core/shell/src/index.ts"], "@alfresco/adf-extensions": ["lib/extensions/src/public-api.ts"],