[ADF-5456] improved theming bundling (#7180)

* theming barrel file for core

* card-view theme

* clipboard theme

* rename core theme files

* content services themes

* process services theme

* process services cloud theme

* insights theming

* try fix flaky test

docs/upgrade-guide/upgrade26-30.md

@@ -396,11 +396,11 @@ These changes are noted with an arrow "->".
 
 -   `adf-material-icons`
 
-#### [../../lib/core/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.scss](../../lib/core/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.scss)
+#### [../../lib/core/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.scss](../../lib/core/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.theme.scss)
 
 -   `adf-card-view`
 
-#### [../../lib/core/comments/comment-list.component.scss](../../lib/core/comments/comment-list.component.scss)
+#### [../../lib/core/comments/comment-list.component.scss](../../lib/core/comments/comment-list.theme.scss)
 
 -   `adf-is-selected`
 

lib/content-services/ng-package.json

@@ -1,6 +1,11 @@
 {
   "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
   "dest": "../dist/content-services",
+  "assets": [
+    "./src/lib/styles/**/*.scss",
+    "./theming/**/*.scss",
+    "./src/**/*.theme.scss"
+  ],
   "lib": {
     "entryFile": "src/public-api.ts",
     "flatModuleFile": "adf-content-services",

lib/content-services/src/lib/content-metadata/content-metadata.theme.scss

@@ -1,5 +1,5 @@
-@import './components/content-metadata/content-metadata.component';
+@import './components/content-metadata/content-metadata.theme';
-@import './components/content-metadata-card/content-metadata-card.component';
+@import './components/content-metadata-card/content-metadata-card.theme';
 
 @mixin adf-content-metadata-module-theme($theme) {
     @include adf-content-metadata-theme($theme);

lib/content-services/src/lib/styles/_index.scss

@@ -1,37 +1,37 @@
-@import '../breadcrumb/breadcrumb.component';
+@import '../breadcrumb/breadcrumb.theme';
-@import '../breadcrumb/dropdown-breadcrumb.component';
+@import '../breadcrumb/dropdown-breadcrumb.theme';
-@import '../content-node-selector/content-node-selector-panel.component';
+@import '../content-node-selector/content-node-selector-panel.theme';
-@import '../content-node-selector/name-location-cell/name-location-cell.component';
+@import '../content-node-selector/name-location-cell/name-location-cell.theme';
-@import '../document-list/components/document-list.component';
+@import '../document-list/components/document-list.theme';
 
-@import '../upload/components/file-uploading-list-row.component';
+@import '../upload/components/file-uploading-list-row.theme';
-@import '../upload/components/file-uploading-dialog.component';
+@import '../upload/components/file-uploading-dialog.theme';
-@import '../upload/components/upload-drag-area.component';
+@import '../upload/components/upload-drag-area.theme';
 
-@import '../search/components/search-control.component';
+@import '../search/components/search-control.theme';
-@import '../search/components/search-sorting-picker/search-sorting-picker.component';
+@import '../search/components/search-sorting-picker/search-sorting-picker.theme';
-@import '../search/components/search-filter/search-filter.component';
+@import '../search/components/search-filter/search-filter.theme';
-@import '../search/components/search-chip-list/search-chip-list.component';
+@import '../search/components/search-chip-list/search-chip-list.theme';
-@import '../search/components/search-filter-container/search-filter-container.component';
+@import '../search/components/search-filter-container/search-filter-container.theme';
 
-@import '../dialogs/folder.dialog';
+@import '../dialogs/folder.dialog.theme';
 
-@import '../content-node-selector/content-node-selector.component';
+@import '../content-node-selector/content-node-selector.theme';
-@import '../content-node-share/content-node-share.dialog';
+@import '../content-node-share/content-node-share.dialog.theme';
-@import '../content-metadata/content-metadata.module';
+@import '../content-metadata/content-metadata.theme';
-@import '../permission-manager/components/permission-list/permission-list.component';
+@import '../permission-manager/components/permission-list/permission-list.theme';
-@import '../permission-manager/components/add-permission/add-permission.component';
+@import '../permission-manager/components/add-permission/add-permission.theme';
-@import '../permission-manager/components/add-permission/add-permission-dialog.component';
+@import '../permission-manager/components/add-permission/add-permission-dialog.theme';
-@import '../permission-manager/components/add-permission/add-permission-panel.component';
+@import '../permission-manager/components/add-permission/add-permission-panel.theme';
-@import '../version-manager/version-comparison.component';
+@import '../version-manager/version-comparison.theme';
-@import '../content-type/content-type-dialog.component';
+@import '../content-type/content-type-dialog.theme';
-@import '../aspect-list/aspect-list.component';
+@import '../aspect-list/aspect-list.theme';
-@import '../permission-manager/components/user-icon-column/user-icon-column.component';
+@import '../permission-manager/components/user-icon-column/user-icon-column.theme';
-@import '../permission-manager/components/user-name-column/user-name-column.component';
+@import '../permission-manager/components/user-name-column/user-name-column.theme';
-@import '../search/components/search-filter-chips/search-filter-chips.component';
+@import '../search/components/search-filter-chips/search-filter-chips.theme';
-@import '../search/components/search-facet-field/search-facet-field.component';
+@import '../search/components/search-facet-field/search-facet-field.theme';
-@import '../search/components/search-form/search-form.component';
+@import '../search/components/search-form/search-form.theme';
-@import '../search/components/search-filter-chips/search-filter-menu-card/search-filter-menu-card.component';
+@import '../search/components/search-filter-chips/search-filter-menu-card/search-filter-menu-card.theme';
 
 @mixin adf-content-services-theme($theme) {
     @include adf-breadcrumb-theme($theme);

lib/content-services/src/lib/upload/components/upload-button.component.spec.ts

@@ -17,7 +17,7 @@
 
 import { SimpleChange } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { ContentService, UploadService, setupTestBed, FileUploadErrorEvent } from '@alfresco/adf-core';
+import { ContentService, UploadService, FileUploadErrorEvent } from '@alfresco/adf-core';
 import { of, throwError } from 'rxjs';
 import { UploadButtonComponent } from './upload-button.component';
 import { NodeEntry } from '@alfresco/js-api';
@@ -52,14 +52,13 @@ describe('UploadButtonComponent', () => {
     let uploadService: UploadService;
     let contentService: ContentService;
 
-    setupTestBed({
+    beforeEach(() => {
+        TestBed.configureTestingModule({
             imports: [
                 TranslateModule.forRoot(),
                 ContentTestingModule
             ]
         });
-
-    beforeEach(() => {
         fixture = TestBed.createComponent(UploadButtonComponent);
         uploadService = TestBed.inject(UploadService);
         contentService = TestBed.inject(ContentService);

lib/content-services/theming/_index.scss

@@ -0,0 +1 @@
+@forward '../src/lib/styles';

lib/core/card-view/card-view.theme.scss

@@ -1,9 +1,9 @@
-@import './components/card-view-arrayitem/card-view-arrayitem.component';
+@import './components/card-view-arrayitem/card-view-arrayitem.theme';
-@import './components/card-view-dateitem/card-view-dateitem.component';
+@import './components/card-view-dateitem/card-view-dateitem.theme';
-@import './components/card-view-textitem/card-view-textitem.component';
+@import './components/card-view-textitem/card-view-textitem.theme';
-@import './components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component';
+@import './components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.theme';
-@import './components/card-view/card-view.component';
+@import './components/card-view/card-view.component.theme';
-@import './components/card-view-selectitem/select-filter-input/select-filter-input.component';
+@import './components/card-view-selectitem/select-filter-input/select-filter-input.theme';
 @import '~@mat-datetimepicker/core/datetimepicker/datetimepicker-theme.scss';
 
 @mixin adf-card-view-module-theme($theme) {

lib/core/ng-package.json

@@ -1,6 +1,11 @@
 {
   "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
   "dest": "../dist/core/",
+  "assets": [
+    "./styles/**/*.scss",
+    "./theming/**/*.scss",
+    "./**/*.theme.scss"
+  ],
   "whitelistedNonPeerDependencies": [
     "cropperjs"
   ],

lib/core/styles/_index.scss

@@ -2,39 +2,40 @@
 @import './default-class';
 @import './theming';
 
-@import '../card-view/card-view.module';
+@import '../card-view/card-view.theme';
-@import '../datatable/components/datatable/datatable.component';
+@import '../datatable/components/datatable/datatable.theme';
-@import '../form/components/widgets/container/container.widget';
+@import '../form/components/widgets/container/container.theme';
-@import '../form/components/widgets/dynamic-table/dynamic-table.widget';
+@import '../form/components/widgets/dynamic-table/dynamic-table.theme';
-@import '../form/components/widgets/form';
+@import '../form/components/widgets/form.theme';
-@import '../form/components/widgets/hyperlink/hyperlink.widget';
+@import '../form/components/widgets/hyperlink/hyperlink.theme';
-@import '../form/components/widgets/amount/amount.widget';
+@import '../form/components/widgets/amount/amount.theme';
-@import '../form/components/widgets/people/people.widget';
+@import '../form/components/widgets/people/people.theme';
-@import '../info-drawer/info-drawer-layout.component';
+@import '../info-drawer/info-drawer-layout.theme';
-@import '../login/components/login.component';
+@import '../login/components/login.theme';
-@import '../pagination/pagination.component';
+@import '../pagination/pagination.theme';
-@import '../toolbar/toolbar.component';
+@import '../toolbar/toolbar.theme';
-@import '../userinfo/components/user-info.component';
+@import '../userinfo/components/user-info.theme';
-@import '../viewer/components/viewer.component';
+@import '../viewer/components/viewer.theme';
-@import '../viewer/components/pdf-viewer.component';
+@import '../viewer/components/pdf-viewer.theme';
-@import '../viewer/components/pdf-viewer-thumbnails.component';
+@import '../viewer/components/pdf-viewer-thumbnails.theme';
-@import '../viewer/components/txt-viewer.component';
+@import '../viewer/components/pdf-viewer-password-dialog.theme.scss';
-@import '../viewer/components/img-viewer.component';
+@import '../viewer/components/txt-viewer.theme';
-@import '../viewer/components/unknown-format/unknown-format.component';
+@import '../viewer/components/img-viewer.theme';
-@import '../form/components/form-renderer.component';
+@import '../viewer/components/unknown-format/unknown-format.theme';
-@import '../layout/components/sidebar-action/sidebar-action-menu.component';
+@import '../form/components/form-renderer.theme';
-@import '../layout/components/header/header.component';
+@import '../layout/components/sidebar-action/sidebar-action-menu.theme';
-@import '../comments/comment-list.component';
+@import '../layout/components/header/header.theme';
-@import '../comments/comments.component';
+@import '../comments/comment-list.theme';
-@import '../layout/components/layout-container/layout-container.component';
+@import '../comments/comments.theme';
-@import '../layout/components/sidenav-layout/sidenav-layout.component';
+@import '../layout/components/layout-container/layout-container.theme';
-@import '../templates/empty-content/empty-content.component';
+@import '../layout/components/sidenav-layout/sidenav-layout.theme';
-@import '../templates/error-content/error-content.component';
+@import '../templates/empty-content/empty-content.theme';
-@import '../../core/clipboard/clipboard.component';
+@import '../templates/error-content/error-content.theme';
-@import '../../core/search-text/search-text-input.component';
+@import '../clipboard/clipboard.theme';
-@import './snackbar';
+@import '../../core/search-text/search-text-input.theme';
-@import '../directives/tooltip-card/tooltip-card.component';
+@import './snackbar.theme';
-@import '../notifications/components/notification-history.component';
+@import '../directives/tooltip-card/tooltip-card.theme';
+@import '../notifications/components/notification-history.theme';
 
 @mixin adf-core-theme($theme) {
     @include adf-colors-theme($theme);
@@ -55,6 +56,7 @@
     @include adf-viewer-theme($theme);
     @include adf-pdf-viewer-theme($theme);
     @include adf-pdf-thumbnails-theme($theme);
+    @include adf-pdf-viewer-password-dialog-theme($theme);
     @include adf-image-viewer-theme($theme);
     @include adf-unknown-viewer-theme($theme);
     @include adf-text-viewer-theme($theme);

lib/core/theming/_index.scss

@@ -0,0 +1 @@
+@forward '../styles';

lib/core/viewer/components/pdf-viewer-password-dialog.theme.scss

@@ -1,4 +1,4 @@
-@mixin adf-dialog-theme($theme) {
+@mixin adf-pdf-viewer-password-dialog-theme($theme) {
     .adf-fill-remaining-space {
         flex: 1 1 auto;
     }

lib/insights/ng-package.json

@@ -1,6 +1,11 @@
 {
   "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
   "dest": "../dist/insights/",
+  "assets": [
+    "./src/lib/styles/**/*.scss",
+    "./theming/**/*.scss",
+    "./src/**/*.theme.scss"
+  ],
   "lib": {
     "entryFile": "src/public-api.ts",
     "flatModuleFile": "adf-insights",

lib/insights/src/lib/styles/_index.scss

@@ -1,6 +1,6 @@
-@import '../analytics-process/components/analytics-report-parameters.component';
+@import '../analytics-process/components/analytics-report-parameters.theme';
-@import '../analytics-process/components/analytics-report-list.component';
+@import '../analytics-process/components/analytics-report-list.theme';
-@import '../analytics-process/components/widgets/date-range/date-range.widget';
+@import '../analytics-process/components/widgets/date-range/date-range.theme';
 
 @mixin adf-insights-theme($theme) {
     @include adf-analytics-report-list-theme($theme);

lib/insights/theming/_index.scss

@@ -0,0 +1 @@
+@forward '../src/lib/styles';

lib/process-services-cloud/ng-package.json

@@ -1,6 +1,11 @@
 {
   "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
   "dest": "../dist/process-services-cloud",
+  "assets": [
+    "./src/lib/styles/**/*.scss",
+    "./theming/**/*.scss",
+    "./src/**/*.theme.scss"
+  ],
   "lib": {
     "entryFile": "src/public-api.ts",
     "flatModuleFile": "adf-process-services-cloud",

lib/process-services-cloud/src/lib/styles/_index.scss

@@ -1,13 +1,15 @@
-@import './../app/components/app-details-cloud.component';
+@import '../app/components/app-details-cloud.theme';
-@import './../group/components/group-cloud.component';
+@import '../group/components/group-cloud.theme';
-@import './../people/components/people-cloud.component.scss';
+@import '../people/components/people-cloud.theme';
-@import './../process/process-filters/components/edit-process-filter-cloud.component.scss';
+@import '../process/process-filters/components/edit-process-filter-cloud.theme';
-@import './../task/task-form/components/task-form-cloud.component';
+@import '../process/start-process/components/start-process-cloud.theme';
-@import './../task/start-task/components/start-task-cloud.component.scss';
+@import '../process/process-filters/components/process-filters-cloud.theme';
-@import './../task/task-filters/components/edit-task-filters/base-edit-task-filter-cloud.component.scss';
+@import '../task/task-form/components/task-form-cloud.theme';
-@import './../task/task-filters/components/base-task-filters-cloud.component.scss';
+@import '../task/start-task/components/start-task-cloud.theme';
-@import './../process/start-process/components/start-process-cloud.component';
+@import '../task/task-filters/components/edit-task-filters/base-edit-task-filter-cloud.theme';
-@import './../form/components/widgets/attach-file/attach-file-cloud-widget.component.scss';
+@import '../task/task-filters/components/base-task-filters-cloud.theme';
+@import '../task/task-header/components/task-header-cloud.theme';
+@import '../form/components/widgets/attach-file/attach-file-cloud-widget.theme';
 
 
 @mixin adf-process-services-cloud-theme($theme) {
@@ -21,4 +23,6 @@
     @include adf-cloud-task-form-theme($theme);
     @include adf-cloud-start-service-theme($theme);
     @include adf-cloud-attach-file-cloud-widget($theme);
+    @include adf-task-list-header-theme($theme);
+    @include adf-cloud-process-filters-theme($theme);
 }