diff --git a/lib/content-services/package.json b/lib/content-services/package.json index ed4d4c70dc..0f0a6f215b 100644 --- a/lib/content-services/package.json +++ b/lib/content-services/package.json @@ -22,7 +22,7 @@ "@angular/platform-browser-dynamic": ">=14.1.3", "@angular/router": ">=14.1.3", "@alfresco/js-api": ">=9.0.0", - "@ngx-translate/core": ">=14.0.0", + "@ngx-translate/core": ">=16.0.0", "@alfresco/adf-core": ">=8.0.0" }, "keywords": [ diff --git a/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.ts b/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.ts index 499cdc690e..da68e4e354 100644 --- a/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.ts +++ b/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.ts @@ -18,7 +18,7 @@ import { Component, Inject, OnInit, ViewEncapsulation } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { AspectListDialogComponentData } from './aspect-list-dialog-data.interface'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatButtonModule } from '@angular/material/button'; import { AspectListComponent } from './aspect-list.component'; import { AutoFocusDirective } from '../directives/auto-focus.directive'; @@ -27,7 +27,7 @@ import { CommonModule } from '@angular/common'; @Component({ selector: 'adf-aspect-list-dialog', standalone: true, - imports: [CommonModule, MatDialogModule, TranslateModule, MatButtonModule, AspectListComponent, AutoFocusDirective], + imports: [CommonModule, MatDialogModule, TranslatePipe, MatButtonModule, AspectListComponent, AutoFocusDirective], templateUrl: './aspect-list-dialog.component.html', styleUrls: ['./aspect-list-dialog.component.scss'], encapsulation: ViewEncapsulation.None diff --git a/lib/content-services/src/lib/aspect-list/aspect-list.component.ts b/lib/content-services/src/lib/aspect-list/aspect-list.component.ts index 0aa4ec3663..9598851e3c 100644 --- a/lib/content-services/src/lib/aspect-list/aspect-list.component.ts +++ b/lib/content-services/src/lib/aspect-list/aspect-list.component.ts @@ -25,14 +25,14 @@ import { AspectEntry } from '@alfresco/js-api'; import { CommonModule } from '@angular/common'; import { MatExpansionModule } from '@angular/material/expansion'; import { MatTableModule } from '@angular/material/table'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; @Component({ selector: 'adf-aspect-list', standalone: true, - imports: [CommonModule, MatExpansionModule, MatCheckboxModule, MatTableModule, TranslateModule, MatProgressSpinnerModule], + imports: [CommonModule, MatExpansionModule, MatCheckboxModule, MatTableModule, TranslatePipe, MatProgressSpinnerModule], templateUrl: './aspect-list.component.html', styleUrls: ['./aspect-list.component.scss'], encapsulation: ViewEncapsulation.None diff --git a/lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts b/lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts index 08f69a6373..ac3bc51b02 100644 --- a/lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts +++ b/lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts @@ -21,13 +21,13 @@ import { Node, PathElement } from '@alfresco/js-api'; import { DocumentListComponent } from '../document-list/components/document-list.component'; import { CommonModule } from '@angular/common'; import { MatIconModule } from '@angular/material/icon'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; @Component({ selector: 'adf-breadcrumb', standalone: true, - imports: [CommonModule, MatIconModule, TranslateModule, MatSelectModule], + imports: [CommonModule, MatIconModule, TranslatePipe, MatSelectModule], templateUrl: './breadcrumb.component.html', styleUrls: ['./breadcrumb.component.scss'], encapsulation: ViewEncapsulation.None, diff --git a/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.ts b/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.ts index 16ac051a75..0effb96ed1 100644 --- a/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.ts +++ b/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.ts @@ -21,12 +21,12 @@ import { PathElement, Node } from '@alfresco/js-api'; import { BreadcrumbComponent } from './breadcrumb.component'; import { CommonModule } from '@angular/common'; import { MatIconModule } from '@angular/material/icon'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; @Component({ selector: 'adf-dropdown-breadcrumb', standalone: true, - imports: [CommonModule, MatIconModule, MatSelectModule, TranslateModule], + imports: [CommonModule, MatIconModule, MatSelectModule, TranslatePipe], templateUrl: './dropdown-breadcrumb.component.html', styleUrls: ['./dropdown-breadcrumb.component.scss'], encapsulation: ViewEncapsulation.None, diff --git a/lib/content-services/src/lib/category/categories-management/categories-management.component.ts b/lib/content-services/src/lib/category/categories-management/categories-management.component.ts index dabdd32cb4..a6cc08aae8 100644 --- a/lib/content-services/src/lib/category/categories-management/categories-management.component.ts +++ b/lib/content-services/src/lib/category/categories-management/categories-management.component.ts @@ -35,7 +35,7 @@ import { debounce, first, map, tap } from 'rxjs/operators'; import { CategoriesManagementMode } from './categories-management-mode'; import { CategoryService } from '../services/category.service'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { AutoFocusDirective } from '../../directives'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatButtonModule } from '@angular/material/button'; @@ -56,7 +56,7 @@ interface CategoryNameControlErrors { standalone: true, imports: [ CommonModule, - TranslateModule, + TranslatePipe, AutoFocusDirective, ReactiveFormsModule, MatFormFieldModule, diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.ts b/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.ts index 2ff79af1ca..e590c38250 100644 --- a/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.ts +++ b/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.ts @@ -27,12 +27,12 @@ import { MatCardModule } from '@angular/material/card'; import { ContentMetadataComponent } from '../content-metadata/content-metadata.component'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; @Component({ selector: 'adf-content-metadata-card', standalone: true, - imports: [CommonModule, MatCardModule, ContentMetadataComponent, MatButtonModule, MatIconModule, TranslateModule], + imports: [CommonModule, MatCardModule, ContentMetadataComponent, MatButtonModule, MatIconModule, TranslatePipe], templateUrl: './content-metadata-card.component.html', styleUrls: ['./content-metadata-card.component.scss'], encapsulation: ViewEncapsulation.None, diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata-header.component.ts b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata-header.component.ts index c3af2f2085..0df9b38a1a 100644 --- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata-header.component.ts +++ b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata-header.component.ts @@ -19,30 +19,30 @@ import { CommonModule } from '@angular/common'; import { Component, Input, ViewEncapsulation } from '@angular/core'; import { MatExpansionModule } from '@angular/material/expansion'; import { MatIconModule } from '@angular/material/icon'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; @Component({ standalone: true, - imports: [CommonModule, MatIconModule, MatExpansionModule, TranslateModule], + imports: [CommonModule, MatIconModule, MatExpansionModule, TranslatePipe], selector: 'adf-content-metadata-header', encapsulation: ViewEncapsulation.None, styles: [ ` - adf-content-metadata-header { - display: flex; - align-items: center; - width: 100%; - } + adf-content-metadata-header { + display: flex; + align-items: center; + width: 100%; + } - .adf-metadata-properties-title { - display: block; - overflow: hidden; - text-overflow: ellipsis; - font-weight: 700; - font-size: 15px; - padding-left: 12px; - } - ` + .adf-metadata-properties-title { + display: block; + overflow: hidden; + text-overflow: ellipsis; + font-weight: 700; + font-size: 15px; + padding-left: 12px; + } + ` ], template: ` diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts index 27a7b777d3..c1d531e73e 100644 --- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts +++ b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts @@ -49,7 +49,7 @@ import { DynamicExtensionComponent } from '@alfresco/adf-extensions'; import { MatProgressBarModule } from '@angular/material/progress-bar'; import { TagsCreatorComponent } from '../../../tag'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { ContentMetadataHeaderComponent } from './content-metadata-header.component'; import { CategoriesManagementComponent } from '../../../category/categories-management/categories-management.component'; @@ -69,7 +69,7 @@ enum DefaultPanels { MatExpansionModule, ContentMetadataHeaderComponent, MatButtonModule, - TranslateModule, + TranslatePipe, MatIconModule, MatChipsModule, CategoriesManagementComponent, diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.ts b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.ts index 668c9f1b6f..e1394dde7f 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.ts +++ b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.ts @@ -43,7 +43,7 @@ import { debounceTime } from 'rxjs/operators'; import { ContentNodeSelectorPanelService } from './content-node-selector-panel.service'; import { CommonModule } from '@angular/common'; import { MatFormFieldModule } from '@angular/material/form-field'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatInputModule } from '@angular/material/input'; import { AutoFocusDirective } from '../../directives/auto-focus.directive'; import { NodeCounterDirective } from '../../directives/node-counter.directive'; @@ -66,7 +66,7 @@ export const defaultValidation = () => true; imports: [ CommonModule, MatFormFieldModule, - TranslateModule, + TranslatePipe, MatInputModule, ReactiveFormsModule, AutoFocusDirective, diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts index 97e6380b4f..a30788dd66 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts +++ b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts @@ -17,13 +17,7 @@ import { Component, DestroyRef, inject, Inject, OnInit, ViewEncapsulation } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; -import { - EmptyListComponent, - NotificationService, - ToolbarComponent, - ToolbarTitleComponent, - TranslationService -} from '@alfresco/adf-core'; +import { EmptyListComponent, NotificationService, ToolbarComponent, ToolbarTitleComponent, TranslationService } from '@alfresco/adf-core'; import { Node } from '@alfresco/js-api'; import { AllowableOperationsEnum } from '../common/models/allowable-operations.enum'; import { ContentService } from '../common/services/content.service'; @@ -34,7 +28,7 @@ import { NodeAction } from '../document-list/models/node-action.enum'; import { OverlayContainer } from '@angular/cdk/overlay'; import { CommonModule } from '@angular/common'; import { MatTabsModule } from '@angular/material/tabs'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { DropdownBreadcrumbComponent } from '../breadcrumb/dropdown-breadcrumb.component'; import { NodeCounterDirective } from '../directives/node-counter.directive'; import { MatIconModule } from '@angular/material/icon'; @@ -52,7 +46,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; CommonModule, MatDialogModule, MatTabsModule, - TranslateModule, + TranslatePipe, ToolbarTitleComponent, ToolbarComponent, DropdownBreadcrumbComponent, @@ -70,7 +64,6 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; encapsulation: ViewEncapsulation.None }) export class ContentNodeSelectorComponent implements OnInit { - title: string; action: NodeAction; buttonActionName: string; diff --git a/lib/content-services/src/lib/content-node-selector/site-dropdown/sites-dropdown.component.ts b/lib/content-services/src/lib/content-node-selector/site-dropdown/sites-dropdown.component.ts index 2c402bd46c..0552cd27da 100644 --- a/lib/content-services/src/lib/content-node-selector/site-dropdown/sites-dropdown.component.ts +++ b/lib/content-services/src/lib/content-node-selector/site-dropdown/sites-dropdown.component.ts @@ -20,7 +20,7 @@ import { InfiniteSelectScrollDirective, AuthenticationService } from '@alfresco/ import { SitePaging, SiteEntry, Site } from '@alfresco/js-api'; import { MatSelectChange, MatSelectModule } from '@angular/material/select'; import { LiveAnnouncer } from '@angular/cdk/a11y'; -import { TranslateModule, TranslateService } from '@ngx-translate/core'; +import { TranslatePipe, TranslateService } from '@ngx-translate/core'; import { SitesService } from '../../common/services/sites.service'; import { CommonModule } from '@angular/common'; import { MatFormFieldModule } from '@angular/material/form-field'; @@ -36,7 +36,7 @@ export enum Relations { @Component({ selector: 'adf-sites-dropdown', standalone: true, - imports: [CommonModule, TranslateModule, MatFormFieldModule, MatSelectModule, InfiniteSelectScrollDirective], + imports: [CommonModule, TranslatePipe, MatFormFieldModule, MatSelectModule, InfiniteSelectScrollDirective], templateUrl: './sites-dropdown.component.html', encapsulation: ViewEncapsulation.None, host: { class: 'adf-sites-dropdown' } 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 adaeb99d44..b941c580de 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 @@ -27,7 +27,7 @@ import { ContentNodeShareSettings } from './content-node-share.settings'; import { RenditionService } from '../common/services/rendition.service'; import { add, endOfDay, format, isBefore } from 'date-fns'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatIconModule } from '@angular/material/icon'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatDatepickerModule } from '@angular/material/datepicker'; @@ -44,7 +44,7 @@ interface SharedDialogFormProps { standalone: true, imports: [ CommonModule, - TranslateModule, + TranslatePipe, MatIconModule, MatDialogModule, ReactiveFormsModule, diff --git a/lib/content-services/src/lib/content-type/content-type-dialog.component.ts b/lib/content-services/src/lib/content-type/content-type-dialog.component.ts index d4495e88c8..b5ea688d1d 100644 --- a/lib/content-services/src/lib/content-type/content-type-dialog.component.ts +++ b/lib/content-services/src/lib/content-type/content-type-dialog.component.ts @@ -21,7 +21,7 @@ import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/materia import { ContentTypeDialogComponentData } from './content-type-metadata.interface'; import { ContentTypeService } from './content-type.service'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatExpansionModule } from '@angular/material/expansion'; import { MatTableModule } from '@angular/material/table'; import { MatButtonModule } from '@angular/material/button'; @@ -29,7 +29,7 @@ import { MatButtonModule } from '@angular/material/button'; @Component({ selector: 'adf-content-type-dialog', standalone: true, - imports: [CommonModule, MatDialogModule, TranslateModule, MatExpansionModule, MatTableModule, MatButtonModule], + imports: [CommonModule, MatDialogModule, TranslatePipe, MatExpansionModule, MatTableModule, MatButtonModule], templateUrl: './content-type-dialog.component.html', styleUrls: ['./content-type-dialog.component.scss'], encapsulation: ViewEncapsulation.None diff --git a/lib/content-services/src/lib/dialogs/category-selector/category-selector.dialog.ts b/lib/content-services/src/lib/dialogs/category-selector/category-selector.dialog.ts index 202f3e66d9..e1eb82a965 100644 --- a/lib/content-services/src/lib/dialogs/category-selector/category-selector.dialog.ts +++ b/lib/content-services/src/lib/dialogs/category-selector/category-selector.dialog.ts @@ -21,7 +21,7 @@ import { Subject } from 'rxjs'; import { Category } from '@alfresco/js-api'; import { CategoriesManagementComponent, CategoriesManagementMode } from '../../category'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatButtonModule } from '@angular/material/button'; export interface CategorySelectorDialogOptions { @@ -32,7 +32,7 @@ export interface CategorySelectorDialogOptions { @Component({ selector: 'adf-category-selector-dialog', standalone: true, - imports: [CommonModule, MatDialogModule, TranslateModule, CategoriesManagementComponent, MatButtonModule], + imports: [CommonModule, MatDialogModule, TranslatePipe, CategoriesManagementComponent, MatButtonModule], templateUrl: './category-selector.dialog.html', styleUrls: ['./category-selector.dialog.scss'], encapsulation: ViewEncapsulation.None diff --git a/lib/content-services/src/lib/dialogs/folder/folder.dialog.ts b/lib/content-services/src/lib/dialogs/folder/folder.dialog.ts index a1af433198..e8afa330bf 100644 --- a/lib/content-services/src/lib/dialogs/folder/folder.dialog.ts +++ b/lib/content-services/src/lib/dialogs/folder/folder.dialog.ts @@ -24,7 +24,7 @@ import { TranslationService } from '@alfresco/adf-core'; import { NodesApiService } from '../../common/services/nodes-api.service'; import { forbidEndingDot, forbidOnlySpaces, forbidSpecialCharacters } from './folder-name.validators'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; import { AutoFocusDirective } from '../../directives'; @@ -37,7 +37,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; imports: [ CommonModule, MatDialogModule, - TranslateModule, + TranslatePipe, ReactiveFormsModule, MatFormFieldModule, MatInputModule, @@ -54,13 +54,13 @@ export class FolderDialogComponent implements OnInit { * Emitted when the edit/create folder give error for example a folder with same name already exist */ @Output() - error: EventEmitter = new EventEmitter(); + error = new EventEmitter(); /** * Emitted when the edit/create folder is successfully created/modified */ @Output() - success: EventEmitter = new EventEmitter(); + success = new EventEmitter(); form: UntypedFormGroup; folder: Node = null; diff --git a/lib/content-services/src/lib/dialogs/library/library.dialog.ts b/lib/content-services/src/lib/dialogs/library/library.dialog.ts index 06ee961f55..b49feb97c7 100644 --- a/lib/content-services/src/lib/dialogs/library/library.dialog.ts +++ b/lib/content-services/src/lib/dialogs/library/library.dialog.ts @@ -32,7 +32,7 @@ import { NotificationService } from '@alfresco/adf-core'; import { debounceTime, finalize, mergeMap } from 'rxjs/operators'; import { SitesService } from '../../common/services/sites.service'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; import { AutoFocusDirective } from '../../directives'; @@ -47,7 +47,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; imports: [ CommonModule, MatDialogModule, - TranslateModule, + TranslatePipe, ReactiveFormsModule, MatFormFieldModule, MatInputModule, @@ -64,7 +64,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; export class LibraryDialogComponent implements OnInit { /** Emitted when an error occurs. */ @Output() - error: EventEmitter = new EventEmitter(); + error = new EventEmitter(); /** * Emitted when the new library is created successfully. The @@ -72,7 +72,7 @@ export class LibraryDialogComponent implements OnInit { * newly-created library. */ @Output() - success: EventEmitter = new EventEmitter(); + success = new EventEmitter(); createTitle = 'LIBRARY.DIALOG.CREATE_TITLE'; libraryTitleExists = false; diff --git a/lib/content-services/src/lib/dialogs/node-lock/node-lock.dialog.ts b/lib/content-services/src/lib/dialogs/node-lock/node-lock.dialog.ts index a11ba18650..a79ad07e06 100644 --- a/lib/content-services/src/lib/dialogs/node-lock/node-lock.dialog.ts +++ b/lib/content-services/src/lib/dialogs/node-lock/node-lock.dialog.ts @@ -21,7 +21,7 @@ import { ReactiveFormsModule, UntypedFormBuilder, UntypedFormGroup } from '@angu import { differenceInSeconds } from 'date-fns'; import { NodeBodyLock, Node, NodeEntry, NodesApi } from '@alfresco/js-api'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatDatetimepickerModule } from '@mat-datetimepicker/core'; @@ -34,7 +34,7 @@ import { AlfrescoApiService } from '../../services/alfresco-api.service'; standalone: true, imports: [ CommonModule, - TranslateModule, + TranslatePipe, MatDialogModule, ReactiveFormsModule, MatCheckboxModule, diff --git a/lib/content-services/src/lib/directives/node-counter.directive.ts b/lib/content-services/src/lib/directives/node-counter.directive.ts index e4564197d9..6766afb603 100644 --- a/lib/content-services/src/lib/directives/node-counter.directive.ts +++ b/lib/content-services/src/lib/directives/node-counter.directive.ts @@ -16,7 +16,7 @@ */ import { Directive, Input, Component, OnInit, OnChanges, ViewContainerRef } from '@angular/core'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; @Directive({ standalone: true, @@ -45,7 +45,7 @@ export class NodeCounterDirective implements OnInit, OnChanges { @Component({ standalone: true, - imports: [TranslateModule], + imports: [TranslatePipe], selector: 'adf-node-counter', template: `
{{ 'NODE_COUNTER.SELECTED_COUNT' | translate : { count: counter } }}
` }) diff --git a/lib/content-services/src/lib/document-list/components/document-list.component.ts b/lib/content-services/src/lib/document-list/components/document-list.component.ts index 222c5a901a..da1ea3054a 100644 --- a/lib/content-services/src/lib/document-list/components/document-list.component.ts +++ b/lib/content-services/src/lib/document-list/components/document-list.component.ts @@ -82,7 +82,7 @@ import { FileAutoDownloadComponent } from './file-auto-download/file-auto-downlo import { NodeEntityEvent, NodeEntryEvent } from './node.event'; import { CommonModule } from '@angular/common'; import { FilterHeaderComponent } from './filter-header/filter-header.component'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatIconModule } from '@angular/material/icon'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { AlfrescoApiService } from '../../services/alfresco-api.service'; @@ -99,7 +99,7 @@ const BYTES_TO_MB_CONVERSION_VALUE = 1048576; FilterHeaderComponent, NoContentTemplateDirective, EmptyListComponent, - TranslateModule, + TranslatePipe, NoPermissionTemplateDirective, MatIconModule, LoadingContentTemplateDirective, diff --git a/lib/content-services/src/lib/document-list/components/file-auto-download/file-auto-download.component.ts b/lib/content-services/src/lib/document-list/components/file-auto-download/file-auto-download.component.ts index c0067a2f60..4ce1de8b8a 100644 --- a/lib/content-services/src/lib/document-list/components/file-auto-download/file-auto-download.component.ts +++ b/lib/content-services/src/lib/document-list/components/file-auto-download/file-auto-download.component.ts @@ -19,14 +19,14 @@ import { Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog'; import { NodeEntry } from '@alfresco/js-api'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatButtonModule } from '@angular/material/button'; import { NodeDownloadDirective } from '../../../directives/node-download.directive'; @Component({ selector: 'adf-file-auto-download', standalone: true, - imports: [CommonModule, MatDialogModule, TranslateModule, MatButtonModule, NodeDownloadDirective], + imports: [CommonModule, MatDialogModule, TranslatePipe, MatButtonModule, NodeDownloadDirective], templateUrl: './file-auto-download.component.html' }) export class FileAutoDownloadComponent { diff --git a/lib/content-services/src/lib/document-list/components/library-name-column/library-name-column.component.ts b/lib/content-services/src/lib/document-list/components/library-name-column/library-name-column.component.ts index 9eb66c9871..e25af04ed7 100644 --- a/lib/content-services/src/lib/document-list/components/library-name-column/library-name-column.component.ts +++ b/lib/content-services/src/lib/document-list/components/library-name-column/library-name-column.component.ts @@ -19,16 +19,15 @@ import { ChangeDetectionStrategy, Component, DestroyRef, ElementRef, inject, Inp import { NodeEntry, Site } from '@alfresco/js-api'; import { ShareDataRow } from '../../data/share-data-row.model'; import { NodesApiService } from '../../../common/services/nodes-api.service'; - import { BehaviorSubject } from 'rxjs'; -import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { AsyncPipe } from '@angular/common'; +import { TranslatePipe } from '@ngx-translate/core'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; @Component({ selector: 'adf-library-name-column', standalone: true, - imports: [CommonModule, TranslateModule], + imports: [AsyncPipe, TranslatePipe], template: ` {{ displayText$ | async | translate }} diff --git a/lib/content-services/src/lib/document-list/components/library-status-column/library-status-column.component.ts b/lib/content-services/src/lib/document-list/components/library-status-column/library-status-column.component.ts index 071f1c8de8..c1c585cec9 100644 --- a/lib/content-services/src/lib/document-list/components/library-status-column/library-status-column.component.ts +++ b/lib/content-services/src/lib/document-list/components/library-status-column/library-status-column.component.ts @@ -20,14 +20,14 @@ import { NodesApiService } from '../../../common/services/nodes-api.service'; import { BehaviorSubject } from 'rxjs'; import { Site } from '@alfresco/js-api'; import { ShareDataRow } from '../../data/share-data-row.model'; -import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { AsyncPipe } from '@angular/common'; +import { TranslatePipe } from '@ngx-translate/core'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; @Component({ selector: 'adf-library-status-column', standalone: true, - imports: [CommonModule, TranslateModule], + imports: [AsyncPipe, TranslatePipe], template: ` {{ displayText$ | async | translate }} diff --git a/lib/content-services/src/lib/document-list/components/name-column/name-column.component.ts b/lib/content-services/src/lib/document-list/components/name-column/name-column.component.ts index 6d2b474d16..1cb66a5a13 100644 --- a/lib/content-services/src/lib/document-list/components/name-column/name-column.component.ts +++ b/lib/content-services/src/lib/document-list/components/name-column/name-column.component.ts @@ -20,15 +20,15 @@ import { NodeEntry } from '@alfresco/js-api'; import { BehaviorSubject } from 'rxjs'; import { NodesApiService } from '../../../common/services/nodes-api.service'; import { ShareDataRow } from '../../data/share-data-row.model'; -import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { AsyncPipe } from '@angular/common'; +import { TranslatePipe } from '@ngx-translate/core'; import { NodeNameTooltipPipe } from '../../../pipes/node-name-tooltip.pipe'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; @Component({ selector: 'adf-name-column', standalone: true, - imports: [CommonModule, TranslateModule, NodeNameTooltipPipe], + imports: [AsyncPipe, TranslatePipe, NodeNameTooltipPipe], template: ` UploadButtonComponent) }], diff --git a/lib/content-services/src/lib/upload/components/upload-version-button.component.ts b/lib/content-services/src/lib/upload/components/upload-version-button.component.ts index 8945d9cb9d..fd816e147c 100644 --- a/lib/content-services/src/lib/upload/components/upload-version-button.component.ts +++ b/lib/content-services/src/lib/upload/components/upload-version-button.component.ts @@ -23,13 +23,13 @@ import { AllowableOperationsEnum } from '../../common/models/allowable-operation import { FileModel } from '../../common/models/file.model'; import { CommonModule } from '@angular/common'; import { MatButtonModule } from '@angular/material/button'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatIconModule } from '@angular/material/icon'; @Component({ selector: 'adf-upload-version-button', standalone: true, - imports: [CommonModule, MatButtonModule, TranslateModule, MatIconModule], + imports: [CommonModule, MatButtonModule, TranslatePipe, MatIconModule], templateUrl: './upload-button.component.html', styleUrls: ['./upload-button.component.scss'], viewProviders: [{ provide: EXTENDIBLE_COMPONENT, useExisting: forwardRef(() => UploadVersionButtonComponent) }], diff --git a/lib/content-services/src/lib/version-manager/version-comparison.component.ts b/lib/content-services/src/lib/version-manager/version-comparison.component.ts index 603ced3e90..98d65bf91b 100644 --- a/lib/content-services/src/lib/version-manager/version-comparison.component.ts +++ b/lib/content-services/src/lib/version-manager/version-comparison.component.ts @@ -19,12 +19,12 @@ import { Component, Input, ViewEncapsulation } from '@angular/core'; import { Node } from '@alfresco/js-api'; import { FileTypePipe, ThumbnailService } from '@alfresco/adf-core'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; @Component({ selector: 'adf-version-comparison', standalone: true, - imports: [CommonModule, TranslateModule, FileTypePipe], + imports: [CommonModule, TranslatePipe, FileTypePipe], templateUrl: './version-comparison.component.html', styleUrls: ['./version-comparison.component.scss'], encapsulation: ViewEncapsulation.None 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 0a9f881bfb..8f460bbc31 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 @@ -17,18 +17,7 @@ import { ConfirmDialogComponent } from '@alfresco/adf-core'; import { AlfrescoApiService } from '../services/alfresco-api.service'; -import { - Component, - DestroyRef, - EventEmitter, - inject, - Input, - OnChanges, - OnInit, - Output, - ViewChild, - ViewEncapsulation -} from '@angular/core'; +import { Component, DestroyRef, EventEmitter, inject, Input, OnChanges, OnInit, Output, ViewChild, ViewEncapsulation } from '@angular/core'; import { ContentApi, ContentPagingQuery, Node, NodeEntry, NodesApi, VersionEntry, VersionsApi } from '@alfresco/js-api'; import { MatDialog } from '@angular/material/dialog'; import { ContentVersionService } from './content-version.service'; @@ -42,7 +31,7 @@ import { MatProgressBarModule } from '@angular/material/progress-bar'; import { MatListModule } from '@angular/material/list'; import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatButtonModule } from '@angular/material/button'; import { VersionCompatibilityDirective } from '../version-compatibility'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; @@ -72,7 +61,7 @@ export class VersionListDataSource extends InfiniteScrollDatasource 1; } diff --git a/lib/content-services/src/lib/version-manager/version-manager.component.ts b/lib/content-services/src/lib/version-manager/version-manager.component.ts index a7759a3b92..37f94eb3ab 100644 --- a/lib/content-services/src/lib/version-manager/version-manager.component.ts +++ b/lib/content-services/src/lib/version-manager/version-manager.component.ts @@ -26,12 +26,12 @@ import { CommonModule } from '@angular/common'; import { VersionComparisonComponent } from './version-comparison.component'; import { VersionUploadComponent } from './version-upload.component'; import { MatButtonModule } from '@angular/material/button'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; @Component({ selector: 'adf-version-manager', standalone: true, - imports: [CommonModule, VersionComparisonComponent, VersionUploadComponent, MatButtonModule, TranslateModule, VersionListComponent], + imports: [CommonModule, VersionComparisonComponent, VersionUploadComponent, MatButtonModule, TranslatePipe, VersionListComponent], templateUrl: './version-manager.component.html', styleUrls: ['./version-manager.component.scss'], animations: [ diff --git a/lib/content-services/src/lib/version-manager/version-upload.component.ts b/lib/content-services/src/lib/version-manager/version-upload.component.ts index d9b13ebe70..a5a6e1a30e 100644 --- a/lib/content-services/src/lib/version-manager/version-upload.component.ts +++ b/lib/content-services/src/lib/version-manager/version-upload.component.ts @@ -23,7 +23,7 @@ import { FileUploadErrorEvent, FileUploadEvent } from '../common/events/file.eve import { CommonModule } from '@angular/common'; import { MatRadioModule } from '@angular/material/radio'; import { FormsModule } from '@angular/forms'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; import { MatButtonModule } from '@angular/material/button'; @@ -37,7 +37,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; CommonModule, MatRadioModule, FormsModule, - TranslateModule, + TranslatePipe, MatFormFieldModule, MatInputModule, MatButtonModule, diff --git a/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.ts b/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.ts index be05d96e8c..d36004116d 100644 --- a/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.ts +++ b/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.ts @@ -54,7 +54,7 @@ import { UploadService } from '../../common/services/upload.service'; import { FileModel } from '../../common/models/file.model'; import { NodeActionsService } from '../../document-list'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { NodeDownloadDirective } from '../../directives'; @@ -63,7 +63,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; @Component({ selector: 'adf-alfresco-viewer', standalone: true, - imports: [CommonModule, TranslateModule, MatButtonModule, MatIconModule, ...VIEWER_DIRECTIVES, NodeDownloadDirective], + imports: [CommonModule, TranslatePipe, MatButtonModule, MatIconModule, ...VIEWER_DIRECTIVES, NodeDownloadDirective], templateUrl: './alfresco-viewer.component.html', styleUrls: ['./alfresco-viewer.component.scss'], host: { class: 'adf-alfresco-viewer' }, diff --git a/lib/core/breadcrumbs/src/components/breadcrumb/breadcrumb.component.ts b/lib/core/breadcrumbs/src/components/breadcrumb/breadcrumb.component.ts index 936a86752b..f906d13ed3 100644 --- a/lib/core/breadcrumbs/src/components/breadcrumb/breadcrumb.component.ts +++ b/lib/core/breadcrumbs/src/components/breadcrumb/breadcrumb.component.ts @@ -34,8 +34,7 @@ import { CommonModule } from '@angular/common'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { map, startWith } from 'rxjs/operators'; -import { TranslateModule } from '@ngx-translate/core'; - +import { TranslatePipe } from '@ngx-translate/core'; import { BreadcrumbFocusDirective } from '../../directives/breadcrumb-focus.directive'; import { BreadcrumbItemComponent } from '../breadcrumb-item/breadcrumb-item.component'; @@ -45,7 +44,7 @@ import { BreadcrumbItemComponent } from '../breadcrumb-item/breadcrumb-item.comp templateUrl: './breadcrumb.component.html', styleUrls: ['./breadcrumb.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, - imports: [CommonModule, MatIconModule, TranslateModule, MatButtonModule, BreadcrumbFocusDirective] + imports: [CommonModule, MatIconModule, TranslatePipe, MatButtonModule, BreadcrumbFocusDirective] }) export class BreadcrumbComponent implements AfterContentInit, OnChanges { private _breadcrumbTemplateRefs: Array> = []; diff --git a/lib/core/feature-flags/src/lib/components/flags/flags.component.ts b/lib/core/feature-flags/src/lib/components/flags/flags.component.ts index aaec3ede20..50b1eeb19f 100644 --- a/lib/core/feature-flags/src/lib/components/flags/flags.component.ts +++ b/lib/core/feature-flags/src/lib/components/flags/flags.component.ts @@ -36,7 +36,7 @@ import { MatInputModule } from '@angular/material/input'; import { FormsModule } from '@angular/forms'; import { FlagsOverrideComponent } from '../feature-override-indicator.component'; import { MatDialogModule } from '@angular/material/dialog'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; @Component({ @@ -53,7 +53,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; MatButtonModule, MatInputModule, MatDialogModule, - TranslateModule + TranslatePipe ], templateUrl: './flags.component.html', styleUrls: ['./flags.component.scss'], diff --git a/lib/core/package.json b/lib/core/package.json index d003569b8c..12b111cffd 100644 --- a/lib/core/package.json +++ b/lib/core/package.json @@ -37,7 +37,7 @@ "@angular/platform-browser": ">=16.0.0", "@angular/router": ">=16.0.0", "@mat-datetimepicker/core": ">=12.0.1", - "@ngx-translate/core": ">=14.0.0", + "@ngx-translate/core": ">=16.0.0", "@alfresco/js-api": ">=9.0.0", "@alfresco/adf-extensions": ">=8.0.0", "minimatch": ">=10.0.0", diff --git a/lib/core/src/lib/about/about-extension-list/about-extension-list.component.ts b/lib/core/src/lib/about/about-extension-list/about-extension-list.component.ts index 03c4ced83a..fb343af847 100644 --- a/lib/core/src/lib/about/about-extension-list/about-extension-list.component.ts +++ b/lib/core/src/lib/about/about-extension-list/about-extension-list.component.ts @@ -19,7 +19,7 @@ import { ChangeDetectionStrategy, Component, Input, ViewEncapsulation } from '@a import { ExtensionRef } from '@alfresco/adf-extensions'; import { CommonModule } from '@angular/common'; import { MatTableModule } from '@angular/material/table'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; @Component({ selector: 'adf-about-extension-list', @@ -27,7 +27,7 @@ import { TranslateModule } from '@ngx-translate/core'; encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, - imports: [CommonModule, MatTableModule, TranslateModule] + imports: [CommonModule, MatTableModule, TranslatePipe] }) export class AboutExtensionListComponent { columns = [ diff --git a/lib/core/src/lib/about/about-license-list/about-license-list.component.ts b/lib/core/src/lib/about/about-license-list/about-license-list.component.ts index cb1af560a3..219acae96a 100644 --- a/lib/core/src/lib/about/about-license-list/about-license-list.component.ts +++ b/lib/core/src/lib/about/about-license-list/about-license-list.component.ts @@ -18,7 +18,7 @@ import { ChangeDetectionStrategy, Component, Input, ViewEncapsulation } from '@angular/core'; import { LicenseData } from '../interfaces'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatTableModule } from '@angular/material/table'; @Component({ @@ -28,7 +28,7 @@ import { MatTableModule } from '@angular/material/table'; encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, - imports: [CommonModule, TranslateModule, MatTableModule] + imports: [CommonModule, TranslatePipe, MatTableModule] }) export class AboutLicenseListComponent { columns = [ diff --git a/lib/core/src/lib/about/about-module-list/module-list.component.ts b/lib/core/src/lib/about/about-module-list/module-list.component.ts index eacf1b796b..2b91caf5e9 100644 --- a/lib/core/src/lib/about/about-module-list/module-list.component.ts +++ b/lib/core/src/lib/about/about-module-list/module-list.component.ts @@ -17,7 +17,7 @@ import { ChangeDetectionStrategy, Component, Input, ViewEncapsulation } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatTableModule } from '@angular/material/table'; interface ModuleInfo { @@ -31,7 +31,7 @@ interface ModuleInfo { encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, - imports: [CommonModule, TranslateModule, MatTableModule] + imports: [CommonModule, TranslatePipe, MatTableModule] }) export class ModuleListComponent { columns = [ diff --git a/lib/core/src/lib/about/about-package/package-list.component.ts b/lib/core/src/lib/about/about-package/package-list.component.ts index 543c642431..fbb9e6a1ca 100644 --- a/lib/core/src/lib/about/about-package/package-list.component.ts +++ b/lib/core/src/lib/about/about-package/package-list.component.ts @@ -18,7 +18,7 @@ import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; import { PackageInfo } from '../interfaces'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatTableModule } from '@angular/material/table'; @Component({ @@ -27,7 +27,7 @@ import { MatTableModule } from '@angular/material/table'; styleUrls: ['./package-list.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, - imports: [CommonModule, TranslateModule, MatTableModule] + imports: [CommonModule, TranslatePipe, MatTableModule] }) export class PackageListComponent implements OnInit { @Input() diff --git a/lib/core/src/lib/about/about-repository-info/about-repository-info.component.ts b/lib/core/src/lib/about/about-repository-info/about-repository-info.component.ts index acc69410db..3bad111427 100644 --- a/lib/core/src/lib/about/about-repository-info/about-repository-info.component.ts +++ b/lib/core/src/lib/about/about-repository-info/about-repository-info.component.ts @@ -20,7 +20,7 @@ import { ObjectUtils, StringUtils } from '../../common/utils'; import { LicenseData, StatusData } from '../interfaces'; import { RepositoryInfo } from './repository-info.interface'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { AboutLicenseListComponent } from '../about-license-list/about-license-list.component'; import { ModuleListComponent } from '../about-module-list/module-list.component'; import { AboutStatusListComponent } from '../about-status-list/about-status-list.component'; @@ -31,7 +31,7 @@ import { AboutStatusListComponent } from '../about-status-list/about-status-list styleUrls: ['./about-repository-info.component.scss'], encapsulation: ViewEncapsulation.None, standalone: true, - imports: [CommonModule, TranslateModule, AboutLicenseListComponent, ModuleListComponent, AboutStatusListComponent] + imports: [CommonModule, TranslatePipe, AboutLicenseListComponent, ModuleListComponent, AboutStatusListComponent] }) export class AboutRepositoryInfoComponent implements OnInit { @Input() diff --git a/lib/core/src/lib/about/about-server-settings/about-server-settings.component.ts b/lib/core/src/lib/about/about-server-settings/about-server-settings.component.ts index 5fe2c286e3..8e450454a0 100644 --- a/lib/core/src/lib/about/about-server-settings/about-server-settings.component.ts +++ b/lib/core/src/lib/about/about-server-settings/about-server-settings.component.ts @@ -18,7 +18,7 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { AppConfigService, AppConfigValues } from '../../app-config/app-config.service'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatCardModule } from '@angular/material/card'; @Component({ @@ -27,7 +27,7 @@ import { MatCardModule } from '@angular/material/card'; styleUrls: ['./about-server-settings.component.scss'], encapsulation: ViewEncapsulation.None, standalone: true, - imports: [CommonModule, TranslateModule, MatCardModule] + imports: [CommonModule, TranslatePipe, MatCardModule] }) export class AboutServerSettingsComponent implements OnInit { ecmHost = ''; diff --git a/lib/core/src/lib/about/about-status-list/about-status-list.component.ts b/lib/core/src/lib/about/about-status-list/about-status-list.component.ts index a2f556a045..f57a2423ec 100644 --- a/lib/core/src/lib/about/about-status-list/about-status-list.component.ts +++ b/lib/core/src/lib/about/about-status-list/about-status-list.component.ts @@ -18,7 +18,7 @@ import { ChangeDetectionStrategy, Component, Input, ViewEncapsulation } from '@angular/core'; import { StatusData } from '../interfaces'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatTableModule } from '@angular/material/table'; @Component({ @@ -27,7 +27,7 @@ import { MatTableModule } from '@angular/material/table'; encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, - imports: [CommonModule, TranslateModule, MatTableModule] + imports: [CommonModule, TranslatePipe, MatTableModule] }) export class AboutStatusListComponent { columns = [ diff --git a/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.ts b/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.ts index 38725d504a..a324884f1c 100644 --- a/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.ts +++ b/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.ts @@ -20,7 +20,7 @@ import { CardViewArrayItemModel } from '../../models/card-view-arrayitem.model'; import { BaseCardView } from '../base-card-view'; import { CommonModule } from '@angular/common'; import { MatChipsModule } from '@angular/material/chips'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; import { MatCardModule } from '@angular/material/card'; @@ -29,7 +29,7 @@ import { MatButtonModule } from '@angular/material/button'; @Component({ selector: 'adf-card-view-arrayitem', standalone: true, - imports: [CommonModule, MatChipsModule, TranslateModule, MatIconModule, MatMenuModule, MatCardModule, MatButtonModule], + imports: [CommonModule, MatChipsModule, TranslatePipe, MatIconModule, MatMenuModule, MatCardModule, MatButtonModule], templateUrl: './card-view-arrayitem.component.html', styleUrls: ['./card-view-arrayitem.component.scss'], encapsulation: ViewEncapsulation.None diff --git a/lib/core/src/lib/card-view/components/card-view-boolitem/card-view-boolitem.component.ts b/lib/core/src/lib/card-view/components/card-view-boolitem/card-view-boolitem.component.ts index 9e3aa8cabb..829b3c6a90 100644 --- a/lib/core/src/lib/card-view/components/card-view-boolitem/card-view-boolitem.component.ts +++ b/lib/core/src/lib/card-view/components/card-view-boolitem/card-view-boolitem.component.ts @@ -20,12 +20,12 @@ import { MatCheckboxChange, MatCheckboxModule } from '@angular/material/checkbox import { CardViewBoolItemModel } from '../../models/card-view-boolitem.model'; import { BaseCardView } from '../base-card-view'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; @Component({ selector: 'adf-card-view-boolitem', standalone: true, - imports: [CommonModule, MatCheckboxModule, TranslateModule], + imports: [CommonModule, MatCheckboxModule, TranslatePipe], templateUrl: './card-view-boolitem.component.html', styles: [ ` diff --git a/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.ts b/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.ts index bb1ab89ecf..b23cc3ccaf 100644 --- a/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.ts +++ b/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.ts @@ -34,7 +34,7 @@ import { ADF_DATETIME_FORMATS, AdfDateTimeFnsAdapter } from '../../../common/uti import { isValid } from 'date-fns'; import { DateFnsUtils } from '../../../common/utils/date-fns-utils'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatIconModule } from '@angular/material/icon'; import { MatChipsModule } from '@angular/material/chips'; import { MatFormFieldModule } from '@angular/material/form-field'; @@ -55,7 +55,7 @@ import { MatInputModule } from '@angular/material/input'; standalone: true, imports: [ CommonModule, - TranslateModule, + TranslatePipe, MatIconModule, MatDatetimepickerModule, MatChipsModule, diff --git a/lib/core/src/lib/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.ts b/lib/core/src/lib/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.ts index faf1839c7f..846f068dde 100644 --- a/lib/core/src/lib/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.ts +++ b/lib/core/src/lib/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.ts @@ -21,7 +21,7 @@ import { CardViewKeyValuePairsItemType } from '../../interfaces/card-view.interf import { MatTableDataSource, MatTableModule } from '@angular/material/table'; import { BaseCardView } from '../base-card-view'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatInputModule } from '@angular/material/input'; import { FormsModule } from '@angular/forms'; import { MatButtonModule } from '@angular/material/button'; @@ -30,7 +30,7 @@ import { MatIconModule } from '@angular/material/icon'; @Component({ selector: 'adf-card-view-key-value-pairs-item', standalone: true, - imports: [CommonModule, TranslateModule, MatTableModule, MatInputModule, FormsModule, MatButtonModule, MatIconModule], + imports: [CommonModule, TranslatePipe, MatTableModule, MatInputModule, FormsModule, MatButtonModule, MatIconModule], templateUrl: './card-view-keyvaluepairsitem.component.html', styleUrls: ['./card-view-keyvaluepairsitem.component.scss'], encapsulation: ViewEncapsulation.None, diff --git a/lib/core/src/lib/card-view/components/card-view-mapitem/card-view-mapitem.component.ts b/lib/core/src/lib/card-view/components/card-view-mapitem/card-view-mapitem.component.ts index 29cd5ccfe0..0eb6266a66 100644 --- a/lib/core/src/lib/card-view/components/card-view-mapitem/card-view-mapitem.component.ts +++ b/lib/core/src/lib/card-view/components/card-view-mapitem/card-view-mapitem.component.ts @@ -19,12 +19,12 @@ import { Component, Input } from '@angular/core'; import { CardViewMapItemModel } from '../../models/card-view-mapitem.model'; import { BaseCardView } from '../base-card-view'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; @Component({ selector: 'adf-card-view-mapitem', standalone: true, - imports: [CommonModule, TranslateModule], + imports: [CommonModule, TranslatePipe], templateUrl: './card-view-mapitem.component.html', styleUrls: ['./card-view-mapitem.component.scss'] }) diff --git a/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.ts b/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.ts index 10df4da48f..60e0b562d9 100644 --- a/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.ts +++ b/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.ts @@ -24,7 +24,7 @@ import { BaseCardView } from '../base-card-view'; import { AppConfigService } from '../../../app-config/app-config.service'; import { map, debounceTime, filter, first } from 'rxjs/operators'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatFormFieldModule } from '@angular/material/form-field'; import { SelectFilterInputComponent } from './select-filter-input/select-filter-input.component'; import { MatAutocompleteModule, MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; @@ -37,7 +37,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; standalone: true, imports: [ CommonModule, - TranslateModule, + TranslatePipe, MatFormFieldModule, MatSelectModule, SelectFilterInputComponent, diff --git a/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.ts b/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.ts index 9cf04629de..af3ee5674a 100644 --- a/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.ts +++ b/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.ts @@ -15,18 +15,7 @@ * limitations under the License. */ -import { - Component, - DestroyRef, - ElementRef, - EventEmitter, - Inject, - inject, - OnInit, - Output, - ViewChild, - ViewEncapsulation -} from '@angular/core'; +import { Component, DestroyRef, ElementRef, EventEmitter, Inject, inject, OnInit, Output, ViewChild, ViewEncapsulation } from '@angular/core'; import { MatSelect } from '@angular/material/select'; import { CommonModule } from '@angular/common'; import { MatFormFieldModule } from '@angular/material/form-field'; @@ -34,13 +23,13 @@ import { MatInputModule } from '@angular/material/input'; import { FormsModule } from '@angular/forms'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; @Component({ selector: 'adf-select-filter-input', standalone: true, - imports: [CommonModule, MatFormFieldModule, MatInputModule, FormsModule, MatButtonModule, MatIconModule, TranslateModule], + imports: [CommonModule, MatFormFieldModule, MatInputModule, FormsModule, MatButtonModule, MatIconModule, TranslatePipe], templateUrl: './select-filter-input.component.html', styleUrls: ['./select-filter-input.component.scss'], host: { class: 'adf-select-filter-input' }, diff --git a/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.ts b/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.ts index 60543b0657..d915f94cc1 100644 --- a/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.ts +++ b/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.ts @@ -26,7 +26,7 @@ import { FormsModule, ReactiveFormsModule, UntypedFormControl } from '@angular/f import { debounceTime, filter } from 'rxjs/operators'; import { CommonModule } from '@angular/common'; import { MatFormFieldModule } from '@angular/material/form-field'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatInputModule } from '@angular/material/input'; import { MatIconModule } from '@angular/material/icon'; import { MatButtonModule } from '@angular/material/button'; @@ -48,7 +48,7 @@ const templateTypes = { imports: [ CommonModule, MatFormFieldModule, - TranslateModule, + TranslatePipe, MatInputModule, ReactiveFormsModule, MatChipsModule, diff --git a/lib/core/src/lib/clipboard/clipboard.directive.ts b/lib/core/src/lib/clipboard/clipboard.directive.ts index 347443d3c6..f782c62662 100644 --- a/lib/core/src/lib/clipboard/clipboard.directive.ts +++ b/lib/core/src/lib/clipboard/clipboard.directive.ts @@ -17,7 +17,7 @@ import { Directive, Input, HostListener, Component, ViewContainerRef, ViewEncapsulation, OnInit } from '@angular/core'; import { ClipboardService } from './clipboard.service'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; @Directive({ selector: '[adf-clipboard]', @@ -76,7 +76,7 @@ export class ClipboardDirective { @Component({ selector: 'adf-copy-content-tooltip', standalone: true, - imports: [TranslateModule], + imports: [TranslatePipe], template: `{{ placeholder | translate }} `, encapsulation: ViewEncapsulation.None }) diff --git a/lib/core/src/lib/comments/comment-list/comment-list.component.ts b/lib/core/src/lib/comments/comment-list/comment-list.component.ts index 0efff4adfc..1fec488f61 100644 --- a/lib/core/src/lib/comments/comment-list/comment-list.component.ts +++ b/lib/core/src/lib/comments/comment-list/comment-list.component.ts @@ -23,12 +23,12 @@ import { CommonModule } from '@angular/common'; import { MatListModule } from '@angular/material/list'; import { MatLineModule } from '@angular/material/core'; import { TimeAgoPipe } from '../../pipes'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; @Component({ selector: 'adf-comment-list', standalone: true, - imports: [CommonModule, MatListModule, MatLineModule, TimeAgoPipe, TranslateModule], + imports: [CommonModule, MatListModule, MatLineModule, TimeAgoPipe, TranslatePipe], templateUrl: './comment-list.component.html', styleUrls: ['./comment-list.component.scss'], encapsulation: ViewEncapsulation.None diff --git a/lib/core/src/lib/comments/comments.component.ts b/lib/core/src/lib/comments/comments.component.ts index dffc58ce81..8633c6e8d8 100644 --- a/lib/core/src/lib/comments/comments.component.ts +++ b/lib/core/src/lib/comments/comments.component.ts @@ -20,7 +20,7 @@ import { Component, EventEmitter, inject, Input, OnChanges, Output, SimpleChange import { ADF_COMMENTS_SERVICE } from './interfaces/comments.token'; import { CommentsService } from './interfaces/comments-service.interface'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; import { FormControl, FormsModule, ReactiveFormsModule, ValidationErrors } from '@angular/forms'; @@ -32,7 +32,7 @@ import { CommentListComponent } from './comment-list'; standalone: true, imports: [ CommonModule, - TranslateModule, + TranslatePipe, MatFormFieldModule, MatInputModule, FormsModule, diff --git a/lib/core/src/lib/context-menu/context-menu-list.component.ts b/lib/core/src/lib/context-menu/context-menu-list.component.ts index 63bade191a..7e5c8df758 100644 --- a/lib/core/src/lib/context-menu/context-menu-list.component.ts +++ b/lib/core/src/lib/context-menu/context-menu-list.component.ts @@ -24,7 +24,7 @@ import { CONTEXT_MENU_DATA } from './context-menu.tokens'; import { AfterViewInit, Component, HostListener, Inject, Optional, QueryList, ViewChildren, ViewEncapsulation } from '@angular/core'; import { MatIconModule } from '@angular/material/icon'; import { NgForOf, NgIf } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { DOWN_ARROW, UP_ARROW } from '@angular/cdk/keycodes'; @Component({ @@ -37,7 +37,7 @@ import { DOWN_ARROW, UP_ARROW } from '@angular/cdk/keycodes'; class: 'adf-context-menu' }, encapsulation: ViewEncapsulation.None, - imports: [MatIconModule, MatMenuModule, NgForOf, NgIf, TranslateModule], + imports: [MatIconModule, MatMenuModule, NgForOf, NgIf, TranslatePipe], animations: [trigger('panelAnimation', contextMenuAnimation)] }) export class ContextMenuListComponent implements AfterViewInit { diff --git a/lib/core/src/lib/datatable/components/columns-selector/columns-selector.component.ts b/lib/core/src/lib/datatable/components/columns-selector/columns-selector.component.ts index 803579e582..4cfa0765d2 100644 --- a/lib/core/src/lib/datatable/components/columns-selector/columns-selector.component.ts +++ b/lib/core/src/lib/datatable/components/columns-selector/columns-selector.component.ts @@ -21,7 +21,7 @@ import { MatMenuTrigger } from '@angular/material/menu'; import { debounceTime } from 'rxjs/operators'; import { DataColumn } from '../../data/data-column.model'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { MatDividerModule } from '@angular/material/divider'; @@ -34,7 +34,7 @@ import { ColumnsSearchFilterPipe } from './columns-search-filter.pipe'; standalone: true, imports: [ CommonModule, - TranslateModule, + TranslatePipe, MatButtonModule, MatIconModule, MatDividerModule, diff --git a/lib/core/src/lib/datatable/components/datatable/datatable.component.ts b/lib/core/src/lib/datatable/components/datatable/datatable.component.ts index 00dff344c2..57ff4819ea 100644 --- a/lib/core/src/lib/datatable/components/datatable/datatable.component.ts +++ b/lib/core/src/lib/datatable/components/datatable/datatable.component.ts @@ -64,7 +64,7 @@ import { MatIconModule, MatIconRegistry } from '@angular/material/icon'; import { DomSanitizer } from '@angular/platform-browser'; import { ResizeEvent } from '../../directives/resizable/types'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { FileTypePipe, LocalizedDatePipe } from '../../../pipes'; import { DropZoneDirective } from '../../directives/drop-zone.directive'; import { ResizableDirective } from '../../directives/resizable/resizable.directive'; @@ -98,7 +98,7 @@ export enum ShowHeaderMode { CommonModule, DataTableRowComponent, CdkDropList, - TranslateModule, + TranslatePipe, MatCheckboxModule, CdkDrag, DropZoneDirective, diff --git a/lib/core/src/lib/dialogs/dialog/dialog.component.ts b/lib/core/src/lib/dialogs/dialog/dialog.component.ts index 935784704b..16755fb99e 100644 --- a/lib/core/src/lib/dialogs/dialog/dialog.component.ts +++ b/lib/core/src/lib/dialogs/dialog/dialog.component.ts @@ -21,7 +21,7 @@ import { AdditionalDialogActionButton, DialogData } from './dialog-data.interfac import { BehaviorSubject } from 'rxjs'; import { DialogSize, DialogSizes } from './dialog.model'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatIconModule } from '@angular/material/icon'; import { MatButtonModule } from '@angular/material/button'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; @@ -33,7 +33,7 @@ export const DIALOG_COMPONENT_DATA = new InjectionToken('dialog component d selector: 'adf-dialog', templateUrl: './dialog.component.html', styleUrls: ['./dialog.component.scss'], - imports: [CommonModule, TranslateModule, MatIconModule, MatDialogModule, MatButtonModule], + imports: [CommonModule, TranslatePipe, MatIconModule, MatDialogModule, MatButtonModule], encapsulation: ViewEncapsulation.None }) export class DialogComponent { diff --git a/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.module.ts b/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.module.ts index 5dfae2ce4a..c0d5d8bcd6 100644 --- a/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.module.ts +++ b/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.module.ts @@ -17,14 +17,11 @@ import { NgModule } from '@angular/core'; import { EditJsonDialogComponent } from './edit-json.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'; + +/* @deprecated Use EditJsonDialogComponent directly */ @NgModule({ - declarations: [EditJsonDialogComponent], - imports: [CommonModule, FormsModule, ReactiveFormsModule, TranslateModule, MatDialogModule, MatButtonModule], + declarations: [], + imports: [EditJsonDialogComponent], exports: [EditJsonDialogComponent] }) export class EditJsonDialogModule {} diff --git a/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.stories.ts b/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.stories.ts index de0c9510d1..b46b3c8b0f 100644 --- a/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.stories.ts +++ b/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.stories.ts @@ -17,10 +17,10 @@ import { applicationConfig, Meta, moduleMetadata, StoryFn } from '@storybook/angular'; import { CoreStoryModule } from '../../testing/core.story.module'; -import { EditJsonDialogModule } from './edit-json.dialog.module'; import { EditJsonDialogStorybookComponent } from './edit-json.dialog.stories.component'; import { MatButtonModule } from '@angular/material/button'; import { importProvidersFrom } from '@angular/core'; +import { EditJsonDialogComponent } from './edit-json.dialog'; const jsonData = { maxValue: 50, @@ -35,7 +35,7 @@ export default { title: 'Core/Dialog/Edit JSON Dialog', decorators: [ moduleMetadata({ - imports: [EditJsonDialogModule, MatButtonModule] + imports: [EditJsonDialogComponent, MatButtonModule] }), applicationConfig({ providers: [importProvidersFrom(CoreStoryModule)] diff --git a/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.ts b/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.ts index 4d9fd85db3..b6f7f443c6 100644 --- a/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.ts +++ b/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.ts @@ -16,7 +16,10 @@ */ import { Component, Inject, OnInit, Input, ViewEncapsulation } from '@angular/core'; -import { MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog'; +import { FormsModule } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; +import { TranslatePipe } from '@ngx-translate/core'; export interface EditJsonDialogSettings { title?: string; @@ -25,6 +28,8 @@ export interface EditJsonDialogSettings { } @Component({ + standalone: true, + imports: [MatDialogModule, FormsModule, MatButtonModule, TranslatePipe], templateUrl: './edit-json.dialog.html', styleUrls: ['./edit-json.dialog.scss'], encapsulation: ViewEncapsulation.None, diff --git a/lib/core/src/lib/dialogs/unsaved-changes-dialog/unsaved-changes-dialog.component.ts b/lib/core/src/lib/dialogs/unsaved-changes-dialog/unsaved-changes-dialog.component.ts index b189589563..4106b065b3 100644 --- a/lib/core/src/lib/dialogs/unsaved-changes-dialog/unsaved-changes-dialog.component.ts +++ b/lib/core/src/lib/dialogs/unsaved-changes-dialog/unsaved-changes-dialog.component.ts @@ -20,7 +20,7 @@ import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog'; import { UnsavedChangesDialogData } from './unsaved-changes-dialog.model'; import { MatCheckboxChange, MatCheckboxModule } from '@angular/material/checkbox'; import { ReactiveFormsModule } from '@angular/forms'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { CommonModule } from '@angular/common'; @@ -42,7 +42,7 @@ import { AppConfigValues } from '../../app-config'; templateUrl: './unsaved-changes-dialog.component.html', styleUrls: ['./unsaved-changes-dialog.component.scss'], host: { class: 'adf-unsaved-changes-dialog' }, - imports: [MatDialogModule, TranslateModule, MatButtonModule, MatIconModule, CommonModule, MatCheckboxModule, ReactiveFormsModule] + imports: [MatDialogModule, TranslatePipe, MatButtonModule, MatIconModule, CommonModule, MatCheckboxModule, ReactiveFormsModule] }) export class UnsavedChangesDialogComponent implements OnInit { dialogData: UnsavedChangesDialogData; diff --git a/lib/core/src/lib/dynamic-chip-list/dynamic-chip-list.component.ts b/lib/core/src/lib/dynamic-chip-list/dynamic-chip-list.component.ts index e2de08298a..5e051b3b11 100644 --- a/lib/core/src/lib/dynamic-chip-list/dynamic-chip-list.component.ts +++ b/lib/core/src/lib/dynamic-chip-list/dynamic-chip-list.component.ts @@ -37,7 +37,7 @@ import { import { MatButtonModule } from '@angular/material/button'; import { MatChip, MatChipsModule } from '@angular/material/chips'; import { MatIconModule } from '@angular/material/icon'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { Chip } from './chip'; /** @@ -48,7 +48,7 @@ import { Chip } from './chip'; standalone: true, templateUrl: './dynamic-chip-list.component.html', styleUrls: ['./dynamic-chip-list.component.scss'], - imports: [MatChipsModule, TranslateModule, NgForOf, MatIconModule, NgIf, MatButtonModule], + imports: [MatChipsModule, TranslatePipe, NgForOf, MatIconModule, NgIf, MatButtonModule], encapsulation: ViewEncapsulation.None }) export class DynamicChipListComponent implements OnChanges, OnInit, AfterViewInit, OnDestroy { diff --git a/lib/core/src/lib/form/components/form-renderer.component.ts b/lib/core/src/lib/form/components/form-renderer.component.ts index ee143b7c7f..139d5fccc6 100644 --- a/lib/core/src/lib/form/components/form-renderer.component.ts +++ b/lib/core/src/lib/form/components/form-renderer.component.ts @@ -21,7 +21,7 @@ import { FormsModule } from '@angular/forms'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { MatTabsModule } from '@angular/material/tabs'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { FormRulesManager, formRulesManagerFactory } from '../models/form-rules.model'; import { FormService } from '../services/form.service'; import { FormFieldComponent } from './form-field/form-field.component'; @@ -47,7 +47,7 @@ import { FormSectionComponent } from './form-section/form-section.component'; MatTabsModule, NgForOf, NgTemplateOutlet, - TranslateModule, + TranslatePipe, MatButtonModule, MatIconModule, NgStyle, diff --git a/lib/core/src/lib/form/components/widgets/amount/amount.widget.ts b/lib/core/src/lib/form/components/widgets/amount/amount.widget.ts index 0c295f5087..50504444ae 100644 --- a/lib/core/src/lib/form/components/widgets/amount/amount.widget.ts +++ b/lib/core/src/lib/form/components/widgets/amount/amount.widget.ts @@ -22,7 +22,7 @@ import { Component, OnInit, ViewEncapsulation, InjectionToken, Inject, Optional import { FormsModule } from '@angular/forms'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { FormService } from '../../../services/form.service'; import { ErrorWidgetComponent } from '../error/error.component'; import { WidgetComponent } from '../widget.component'; @@ -49,7 +49,7 @@ export const ADF_AMOUNT_SETTINGS = new InjectionToken('adf '(invalid)': 'event($event)', '(select)': 'event($event)' }, - imports: [MatFormFieldModule, MatInputModule, FormsModule, ErrorWidgetComponent, TranslateModule, NgIf], + imports: [MatFormFieldModule, MatInputModule, FormsModule, ErrorWidgetComponent, TranslatePipe, NgIf], encapsulation: ViewEncapsulation.None }) export class AmountWidgetComponent extends WidgetComponent implements OnInit { diff --git a/lib/core/src/lib/form/components/widgets/base-viewer/base-viewer.widget.ts b/lib/core/src/lib/form/components/widgets/base-viewer/base-viewer.widget.ts index a4f5f0a052..32cc36b831 100644 --- a/lib/core/src/lib/form/components/widgets/base-viewer/base-viewer.widget.ts +++ b/lib/core/src/lib/form/components/widgets/base-viewer/base-viewer.widget.ts @@ -17,7 +17,7 @@ import { NgIf } from '@angular/common'; import { Component, OnInit, ViewEncapsulation } from '@angular/core'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { ViewerComponent } from '../../../../viewer'; import { FormService } from '../../../services/form.service'; import { ErrorWidgetComponent } from '../error/error.component'; @@ -41,7 +41,7 @@ import { WidgetComponent } from '../widget.component'; '(invalid)': 'event($event)', '(select)': 'event($event)' }, - imports: [NgIf, TranslateModule, ViewerComponent, ErrorWidgetComponent], + imports: [NgIf, TranslatePipe, ViewerComponent, ErrorWidgetComponent], encapsulation: ViewEncapsulation.None }) export class BaseViewerWidgetComponent extends WidgetComponent implements OnInit { diff --git a/lib/core/src/lib/form/components/widgets/checkbox/checkbox.widget.ts b/lib/core/src/lib/form/components/widgets/checkbox/checkbox.widget.ts index a3d0b01862..78bc359cba 100644 --- a/lib/core/src/lib/form/components/widgets/checkbox/checkbox.widget.ts +++ b/lib/core/src/lib/form/components/widgets/checkbox/checkbox.widget.ts @@ -21,7 +21,7 @@ import { NgClass, NgIf } from '@angular/common'; import { Component, ViewEncapsulation } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { MatCheckboxModule } from '@angular/material/checkbox'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { FormService } from '../../../services/form.service'; import { ErrorWidgetComponent } from '../error/error.component'; import { WidgetComponent } from '../widget.component'; @@ -48,7 +48,7 @@ import { WidgetComponent } from '../widget.component'; '(invalid)': 'event($event)', '(select)': 'event($event)' }, - imports: [NgClass, MatCheckboxModule, FormsModule, TranslateModule, ErrorWidgetComponent, NgIf], + imports: [NgClass, MatCheckboxModule, FormsModule, TranslatePipe, ErrorWidgetComponent, NgIf], encapsulation: ViewEncapsulation.None }) export class CheckboxWidgetComponent extends WidgetComponent { diff --git a/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.ts b/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.ts index 7762387064..faf826047e 100644 --- a/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.ts +++ b/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.ts @@ -24,7 +24,7 @@ import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material/core'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; import { DatetimeAdapter, MAT_DATETIME_FORMATS, MatDatetimepickerModule } from '@mat-datetimepicker/core'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { ADF_DATE_FORMATS, ADF_DATETIME_FORMATS, AdfDateFnsAdapter, AdfDateTimeFnsAdapter, DateFnsUtils } from '../../../../common'; import { FormService } from '../../../services/form.service'; import { ErrorWidgetComponent } from '../error/error.component'; @@ -44,7 +44,7 @@ import { ReactiveFormWidget } from '../reactive-widget.interface'; ], templateUrl: './date-time.widget.html', styleUrls: ['./date-time.widget.scss'], - imports: [NgIf, TranslateModule, MatFormFieldModule, MatInputModule, MatDatetimepickerModule, ReactiveFormsModule, ErrorWidgetComponent], + imports: [NgIf, TranslatePipe, MatFormFieldModule, MatInputModule, MatDatetimepickerModule, ReactiveFormsModule, ErrorWidgetComponent], encapsulation: ViewEncapsulation.None }) export class DateTimeWidgetComponent extends WidgetComponent implements OnInit, ReactiveFormWidget { diff --git a/lib/core/src/lib/form/components/widgets/date/date.widget.ts b/lib/core/src/lib/form/components/widgets/date/date.widget.ts index a40a2dc945..4ed1cfa135 100644 --- a/lib/core/src/lib/form/components/widgets/date/date.widget.ts +++ b/lib/core/src/lib/form/components/widgets/date/date.widget.ts @@ -24,7 +24,7 @@ import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material/core'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { ADF_DATE_FORMATS, AdfDateFnsAdapter, DateFnsUtils, DEFAULT_DATE_FORMAT } from '../../../../common'; import { FormService } from '../../../services/form.service'; import { ErrorWidgetComponent } from '../error/error.component'; @@ -53,7 +53,7 @@ import { ReactiveFormWidget } from '../reactive-widget.interface'; '(invalid)': 'event($event)', '(select)': 'event($event)' }, - imports: [MatFormFieldModule, TranslateModule, MatInputModule, MatDatepickerModule, ReactiveFormsModule, ErrorWidgetComponent, NgIf], + imports: [MatFormFieldModule, TranslatePipe, MatInputModule, MatDatepickerModule, ReactiveFormsModule, ErrorWidgetComponent, NgIf], encapsulation: ViewEncapsulation.None }) export class DateWidgetComponent extends WidgetComponent implements OnInit, ReactiveFormWidget { diff --git a/lib/core/src/lib/form/components/widgets/decimal/decimal.component.ts b/lib/core/src/lib/form/components/widgets/decimal/decimal.component.ts index 62c05747c9..9e2e0dc1c6 100644 --- a/lib/core/src/lib/form/components/widgets/decimal/decimal.component.ts +++ b/lib/core/src/lib/form/components/widgets/decimal/decimal.component.ts @@ -20,7 +20,7 @@ import { Component, ViewEncapsulation } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { FormService } from '../../../services/form.service'; import { ErrorWidgetComponent } from '../error/error.component'; import { WidgetComponent } from '../widget.component'; @@ -41,7 +41,7 @@ import { WidgetComponent } from '../widget.component'; '(invalid)': 'event($event)', '(select)': 'event($event)' }, - imports: [NgIf, TranslateModule, MatFormFieldModule, MatInputModule, FormsModule, ErrorWidgetComponent], + imports: [NgIf, TranslatePipe, MatFormFieldModule, MatInputModule, FormsModule, ErrorWidgetComponent], encapsulation: ViewEncapsulation.None }) export class DecimalWidgetComponent extends WidgetComponent { diff --git a/lib/core/src/lib/form/components/widgets/display-text/display-text.widget.ts b/lib/core/src/lib/form/components/widgets/display-text/display-text.widget.ts index 3629add9a7..5a76f0c1a6 100644 --- a/lib/core/src/lib/form/components/widgets/display-text/display-text.widget.ts +++ b/lib/core/src/lib/form/components/widgets/display-text/display-text.widget.ts @@ -18,7 +18,7 @@ /* eslint-disable @angular-eslint/component-selector */ import { Component, ViewEncapsulation } from '@angular/core'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { FormService } from '../../../services/form.service'; import { WidgetComponent } from '../widget.component'; @@ -38,7 +38,7 @@ import { WidgetComponent } from '../widget.component'; '(invalid)': 'event($event)', '(select)': 'event($event)' }, - imports: [TranslateModule], + imports: [TranslatePipe], encapsulation: ViewEncapsulation.None }) export class DisplayTextWidgetComponent extends WidgetComponent { diff --git a/lib/core/src/lib/form/components/widgets/error/error.component.ts b/lib/core/src/lib/form/components/widgets/error/error.component.ts index 33ee5b61f2..f2c786207f 100644 --- a/lib/core/src/lib/form/components/widgets/error/error.component.ts +++ b/lib/core/src/lib/form/components/widgets/error/error.component.ts @@ -21,7 +21,7 @@ import { animate, state, style, transition, trigger } from '@angular/animations' import { NgIf } from '@angular/common'; import { Component, Input, OnChanges, SimpleChanges, ViewEncapsulation } from '@angular/core'; import { MatIconModule } from '@angular/material/icon'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { FormService } from '../../../services/form.service'; import { ErrorMessageModel } from '../core'; import { WidgetComponent } from '../widget.component'; @@ -54,7 +54,7 @@ import { WidgetComponent } from '../widget.component'; '(invalid)': 'event($event)', '(select)': 'event($event)' }, - imports: [NgIf, MatIconModule, TranslateModule], + imports: [NgIf, MatIconModule, TranslatePipe], encapsulation: ViewEncapsulation.None }) export class ErrorWidgetComponent extends WidgetComponent implements OnChanges { diff --git a/lib/core/src/lib/form/components/widgets/header/header.widget.html b/lib/core/src/lib/form/components/widgets/header/header.widget.html index ea2ae9acc7..276242e9ce 100644 --- a/lib/core/src/lib/form/components/widgets/header/header.widget.html +++ b/lib/core/src/lib/form/components/widgets/header/header.widget.html @@ -1,37 +1,38 @@ -
-
- -
-

- - - {{ element.name | translate }} - -

+@if (element?.isTypeFieldGroup) { +
+ @if (element?.hideHeader) { +
+ +
+ } @else { +

+ + + {{ element.name | translate }} + +

+ } - - - -
+ + @if (element?.isCollapsible) { + + } + +
+} diff --git a/lib/core/src/lib/form/components/widgets/header/header.widget.ts b/lib/core/src/lib/form/components/widgets/header/header.widget.ts index 0655c7d6d4..257acfd82b 100644 --- a/lib/core/src/lib/form/components/widgets/header/header.widget.ts +++ b/lib/core/src/lib/form/components/widgets/header/header.widget.ts @@ -19,8 +19,8 @@ import { Component, Input, ViewEncapsulation } from '@angular/core'; import { ContainerModel } from '../core/container.model'; import { FieldStylePipe } from './../../../pipes/field-style.pipe'; import { MatIconModule } from '@angular/material/icon'; -import { NgIf, NgTemplateOutlet } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { NgTemplateOutlet } from '@angular/common'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatButtonModule } from '@angular/material/button'; @Component({ @@ -29,7 +29,7 @@ import { MatButtonModule } from '@angular/material/button'; styleUrls: ['./header.widget.scss'], standalone: true, encapsulation: ViewEncapsulation.None, - imports: [FieldStylePipe, MatIconModule, MatButtonModule, TranslateModule, NgIf, NgTemplateOutlet] + imports: [FieldStylePipe, MatIconModule, MatButtonModule, TranslatePipe, NgTemplateOutlet] }) export class HeaderWidgetComponent { @Input() element: ContainerModel; diff --git a/lib/core/src/lib/form/components/widgets/hyperlink/hyperlink.widget.ts b/lib/core/src/lib/form/components/widgets/hyperlink/hyperlink.widget.ts index b90a71e0b8..947acbd5cc 100644 --- a/lib/core/src/lib/form/components/widgets/hyperlink/hyperlink.widget.ts +++ b/lib/core/src/lib/form/components/widgets/hyperlink/hyperlink.widget.ts @@ -17,9 +17,8 @@ /* eslint-disable @angular-eslint/component-selector */ -import { NgIf } from '@angular/common'; import { Component, OnInit, ViewEncapsulation } from '@angular/core'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { FormService } from '../../../services/form.service'; import { FormFieldModel } from '../core'; import { WidgetComponent } from '../widget.component'; @@ -40,7 +39,7 @@ import { WidgetComponent } from '../widget.component'; '(invalid)': 'event($event)', '(select)': 'event($event)' }, - imports: [TranslateModule, NgIf], + imports: [TranslatePipe], encapsulation: ViewEncapsulation.None }) export class HyperlinkWidgetComponent extends WidgetComponent implements OnInit { diff --git a/lib/core/src/lib/form/components/widgets/json/json.widget.ts b/lib/core/src/lib/form/components/widgets/json/json.widget.ts index 8da93a9080..35c28855dd 100644 --- a/lib/core/src/lib/form/components/widgets/json/json.widget.ts +++ b/lib/core/src/lib/form/components/widgets/json/json.widget.ts @@ -22,7 +22,7 @@ import { EditJsonDialogSettings, EditJsonDialogComponent } from '../../../../dia import { FormService } from '../../../services/form.service'; import { WidgetComponent } from '../widget.component'; import { MatFormFieldModule } from '@angular/material/form-field'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; @Component({ standalone: true, @@ -39,7 +39,7 @@ import { TranslateModule } from '@ngx-translate/core'; '(invalid)': 'event($event)', '(select)': 'event($event)' }, - imports: [TranslateModule, MatFormFieldModule, MatButtonModule], + imports: [TranslatePipe, MatFormFieldModule, MatButtonModule], encapsulation: ViewEncapsulation.None }) export class JsonWidgetComponent extends WidgetComponent { diff --git a/lib/core/src/lib/form/components/widgets/multiline-text/multiline-text.widget.ts b/lib/core/src/lib/form/components/widgets/multiline-text/multiline-text.widget.ts index 5b0f7d3e12..d889a5a7e8 100644 --- a/lib/core/src/lib/form/components/widgets/multiline-text/multiline-text.widget.ts +++ b/lib/core/src/lib/form/components/widgets/multiline-text/multiline-text.widget.ts @@ -22,7 +22,7 @@ import { Component, ViewEncapsulation } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { FormService } from '../../../services/form.service'; import { ErrorWidgetComponent } from '../error/error.component'; import { WidgetComponent } from '../widget.component'; @@ -43,7 +43,7 @@ import { WidgetComponent } from '../widget.component'; '(invalid)': 'event($event)', '(select)': 'event($event)' }, - imports: [MatFormFieldModule, NgIf, TranslateModule, MatInputModule, FormsModule, ErrorWidgetComponent], + imports: [MatFormFieldModule, NgIf, TranslatePipe, MatInputModule, FormsModule, ErrorWidgetComponent], encapsulation: ViewEncapsulation.None }) export class MultilineTextWidgetComponentComponent extends WidgetComponent { diff --git a/lib/core/src/lib/form/components/widgets/number/number.widget.ts b/lib/core/src/lib/form/components/widgets/number/number.widget.ts index d26e93f246..e431c33268 100644 --- a/lib/core/src/lib/form/components/widgets/number/number.widget.ts +++ b/lib/core/src/lib/form/components/widgets/number/number.widget.ts @@ -22,7 +22,7 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { DecimalNumberPipe } from '../../../../pipes'; import { FormService } from '../../../services/form.service'; import { ErrorWidgetComponent } from '../error/error.component'; @@ -44,7 +44,7 @@ import { WidgetComponent } from '../widget.component'; '(invalid)': 'event($event)', '(select)': 'event($event)' }, - imports: [NgIf, TranslateModule, MatFormFieldModule, MatInputModule, FormsModule, ErrorWidgetComponent], + imports: [NgIf, TranslatePipe, MatFormFieldModule, MatInputModule, FormsModule, ErrorWidgetComponent], providers: [DecimalNumberPipe], encapsulation: ViewEncapsulation.None }) diff --git a/lib/core/src/lib/form/components/widgets/text/text.widget.ts b/lib/core/src/lib/form/components/widgets/text/text.widget.ts index b7883d1d68..6a5d4c32aa 100644 --- a/lib/core/src/lib/form/components/widgets/text/text.widget.ts +++ b/lib/core/src/lib/form/components/widgets/text/text.widget.ts @@ -22,7 +22,7 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { FormService } from '../../../services/form.service'; import { ErrorWidgetComponent } from '../error/error.component'; import { WidgetComponent } from '../widget.component'; @@ -44,7 +44,7 @@ import { InputMaskDirective } from './text-mask.component'; '(invalid)': 'event($event)', '(select)': 'event($event)' }, - imports: [NgIf, TranslateModule, MatFormFieldModule, MatInputModule, FormsModule, ErrorWidgetComponent, InputMaskDirective], + imports: [NgIf, TranslatePipe, MatFormFieldModule, MatInputModule, FormsModule, ErrorWidgetComponent, InputMaskDirective], encapsulation: ViewEncapsulation.None }) export class TextWidgetComponent extends WidgetComponent implements OnInit { diff --git a/lib/core/src/lib/identity-user-info/identity-user-info.component.ts b/lib/core/src/lib/identity-user-info/identity-user-info.component.ts index 519c528d32..5764f7f43f 100644 --- a/lib/core/src/lib/identity-user-info/identity-user-info.component.ts +++ b/lib/core/src/lib/identity-user-info/identity-user-info.component.ts @@ -22,12 +22,12 @@ import { CommonModule } from '@angular/common'; import { FullNamePipe, InitialUsernamePipe } from '../pipes'; import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; @Component({ selector: 'adf-identity-user-info', standalone: true, - imports: [CommonModule, FullNamePipe, MatMenuModule, InitialUsernamePipe, MatButtonModule, MatCardModule, TranslateModule], + imports: [CommonModule, FullNamePipe, MatMenuModule, InitialUsernamePipe, MatButtonModule, MatCardModule, TranslatePipe], templateUrl: './identity-user-info.component.html', styleUrls: ['./identity-user-info.component.scss'], encapsulation: ViewEncapsulation.None diff --git a/lib/core/src/lib/info-drawer/info-drawer.component.ts b/lib/core/src/lib/info-drawer/info-drawer.component.ts index bed038367f..f80132ea9e 100644 --- a/lib/core/src/lib/info-drawer/info-drawer.component.ts +++ b/lib/core/src/lib/info-drawer/info-drawer.component.ts @@ -35,8 +35,9 @@ import { InfoDrawerLayoutComponent, InfoDrawerTitleDirective } from './info-drawer-layout.component'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatIconModule } from '@angular/material/icon'; + @Component({ selector: 'adf-info-drawer-tab', standalone: true, @@ -62,7 +63,7 @@ export class InfoDrawerTabComponent { imports: [ CommonModule, InfoDrawerLayoutComponent, - TranslateModule, + TranslatePipe, MatTabsModule, MatIconModule, InfoDrawerButtonsDirective, diff --git a/lib/core/src/lib/language-menu/language-picker.component.ts b/lib/core/src/lib/language-menu/language-picker.component.ts index 869db82546..deb3dda764 100644 --- a/lib/core/src/lib/language-menu/language-picker.component.ts +++ b/lib/core/src/lib/language-menu/language-picker.component.ts @@ -19,14 +19,14 @@ import { AfterViewInit, Component, EventEmitter, Output, QueryList, ViewChild } import { LanguageItem } from '../common/services/language-item.interface'; import { CommonModule } from '@angular/common'; import { MatMenu, MatMenuItem, MatMenuModule } from '@angular/material/menu'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { LanguageMenuComponent } from './language-menu.component'; import { MatIconModule } from '@angular/material/icon'; @Component({ selector: 'adf-picker-button', standalone: true, - imports: [CommonModule, MatMenuModule, TranslateModule, LanguageMenuComponent, MatIconModule], + imports: [CommonModule, MatMenuModule, TranslatePipe, LanguageMenuComponent, MatIconModule], template: ` - - + + +@if (data.showAction) { + +} diff --git a/lib/core/src/lib/snackbar-content/snackbar-content.component.spec.ts b/lib/core/src/lib/snackbar-content/snackbar-content.component.spec.ts index f20adadf32..381bb09801 100644 --- a/lib/core/src/lib/snackbar-content/snackbar-content.component.spec.ts +++ b/lib/core/src/lib/snackbar-content/snackbar-content.component.spec.ts @@ -30,8 +30,7 @@ describe('SnackbarContentComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - declarations: [SnackbarContentComponent], - imports: [NoopTranslateModule, CoreTestingModule], + imports: [NoopTranslateModule, CoreTestingModule, SnackbarContentComponent], providers: [ { provide: MatSnackBarRef, diff --git a/lib/core/src/lib/snackbar-content/snackbar-content.component.ts b/lib/core/src/lib/snackbar-content/snackbar-content.component.ts index d9b71f7078..fdcfc5af7e 100644 --- a/lib/core/src/lib/snackbar-content/snackbar-content.component.ts +++ b/lib/core/src/lib/snackbar-content/snackbar-content.component.ts @@ -18,9 +18,14 @@ import { Component, Inject } from '@angular/core'; import { MAT_SNACK_BAR_DATA, MatSnackBarRef } from '@angular/material/snack-bar'; import { SnackBarData } from './snack-bar-data'; +import { MatIconModule } from '@angular/material/icon'; +import { TranslatePipe } from '@ngx-translate/core'; +import { MatButtonModule } from '@angular/material/button'; @Component({ selector: 'adf-snackbar-content', + standalone: true, + imports: [MatIconModule, TranslatePipe, MatButtonModule], templateUrl: './snackbar-content.component.html', styleUrls: ['./snackbar-content.component.scss'], host: { diff --git a/lib/core/src/lib/snackbar-content/snackbar-content.module.ts b/lib/core/src/lib/snackbar-content/snackbar-content.module.ts index 5aaeaf6c11..16775529d0 100644 --- a/lib/core/src/lib/snackbar-content/snackbar-content.module.ts +++ b/lib/core/src/lib/snackbar-content/snackbar-content.module.ts @@ -16,16 +16,11 @@ */ import { NgModule } from '@angular/core'; -import { MatIconModule } from '@angular/material/icon'; -import { CommonModule } from '@angular/common'; import { SnackbarContentComponent } from './snackbar-content.component'; -import { MatSnackBarModule } from '@angular/material/snack-bar'; -import { MatButtonModule } from '@angular/material/button'; -import { TranslateModule } from '@ngx-translate/core'; +/** @deprecated use `SnackbarContentComponent` directly instead */ @NgModule({ - imports: [CommonModule, MatIconModule, MatSnackBarModule, MatButtonModule, TranslateModule], - declarations: [SnackbarContentComponent], + imports: [SnackbarContentComponent], exports: [SnackbarContentComponent] }) export class SnackbarContentModule {} diff --git a/lib/core/src/lib/sorting-picker/sorting-picker.component.ts b/lib/core/src/lib/sorting-picker/sorting-picker.component.ts index 3b9f078fa9..ade331aec0 100644 --- a/lib/core/src/lib/sorting-picker/sorting-picker.component.ts +++ b/lib/core/src/lib/sorting-picker/sorting-picker.component.ts @@ -18,7 +18,7 @@ import { Component, ViewEncapsulation, Input, EventEmitter, Output } from '@angular/core'; import { MatSelectChange, MatSelectModule } from '@angular/material/select'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; @@ -26,7 +26,7 @@ import { MatIconModule } from '@angular/material/icon'; @Component({ selector: 'adf-sorting-picker', standalone: true, - imports: [CommonModule, TranslateModule, MatFormFieldModule, MatSelectModule, MatButtonModule, MatIconModule], + imports: [CommonModule, TranslatePipe, MatFormFieldModule, MatSelectModule, MatButtonModule, MatIconModule], templateUrl: './sorting-picker.component.html', encapsulation: ViewEncapsulation.None, host: { class: 'adf-sorting-picker' } diff --git a/lib/core/src/lib/templates/empty-content/empty-content.component.ts b/lib/core/src/lib/templates/empty-content/empty-content.component.ts index 9480b8fa29..db7373cacf 100644 --- a/lib/core/src/lib/templates/empty-content/empty-content.component.ts +++ b/lib/core/src/lib/templates/empty-content/empty-content.component.ts @@ -16,13 +16,13 @@ */ import { Component, ChangeDetectionStrategy, ViewEncapsulation, Input } from '@angular/core'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { IconComponent } from '../../icon'; @Component({ selector: 'adf-empty-content', standalone: true, - imports: [TranslateModule, IconComponent], + imports: [TranslatePipe, IconComponent], templateUrl: './empty-content.component.html', styleUrls: ['./empty-content.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, diff --git a/lib/core/src/lib/templates/error-content/error-content.component.ts b/lib/core/src/lib/templates/error-content/error-content.component.ts index 369470ee6d..2d58cc17be 100644 --- a/lib/core/src/lib/templates/error-content/error-content.component.ts +++ b/lib/core/src/lib/templates/error-content/error-content.component.ts @@ -22,12 +22,12 @@ import { Observable } from 'rxjs'; import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout'; import { map } from 'rxjs/operators'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; @Component({ selector: 'adf-error-content', standalone: true, - imports: [CommonModule, TranslateModule], + imports: [CommonModule, TranslatePipe], templateUrl: './error-content.component.html', styleUrls: ['./error-content.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, diff --git a/lib/core/src/lib/toolbar/toolbar.component.ts b/lib/core/src/lib/toolbar/toolbar.component.ts index b7001fd51a..5761bb0e61 100644 --- a/lib/core/src/lib/toolbar/toolbar.component.ts +++ b/lib/core/src/lib/toolbar/toolbar.component.ts @@ -18,7 +18,7 @@ import { ChangeDetectionStrategy, Component, Input, ViewEncapsulation } from '@angular/core'; import { ThemePalette } from '@angular/material/core'; import { MatToolbarModule } from '@angular/material/toolbar'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { NgIf } from '@angular/common'; @Component({ @@ -28,7 +28,7 @@ import { NgIf } from '@angular/common'; styleUrls: ['./toolbar.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, encapsulation: ViewEncapsulation.None, - imports: [MatToolbarModule, TranslateModule, NgIf], + imports: [MatToolbarModule, TranslatePipe, NgIf], host: { class: 'adf-toolbar' } }) export class ToolbarComponent { diff --git a/lib/core/src/lib/viewer/components/download-prompt-dialog/download-prompt-dialog.component.ts b/lib/core/src/lib/viewer/components/download-prompt-dialog/download-prompt-dialog.component.ts index 7943112475..b3647cc898 100644 --- a/lib/core/src/lib/viewer/components/download-prompt-dialog/download-prompt-dialog.component.ts +++ b/lib/core/src/lib/viewer/components/download-prompt-dialog/download-prompt-dialog.component.ts @@ -18,13 +18,13 @@ import { Component } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { DownloadPromptActions } from '../../models/download-prompt.actions'; @Component({ selector: 'adf-download-prompt-dialog', standalone: true, - imports: [MatDialogModule, TranslateModule, MatButtonModule], + imports: [MatDialogModule, TranslatePipe, MatButtonModule], templateUrl: './download-prompt-dialog.component.html' }) export class DownloadPromptDialogComponent { diff --git a/lib/core/src/lib/viewer/components/img-viewer/img-viewer.component.ts b/lib/core/src/lib/viewer/components/img-viewer/img-viewer.component.ts index 1f535b3d3f..9e4ebbea0f 100644 --- a/lib/core/src/lib/viewer/components/img-viewer/img-viewer.component.ts +++ b/lib/core/src/lib/viewer/components/img-viewer/img-viewer.component.ts @@ -32,7 +32,7 @@ import { } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import Cropper from 'cropperjs'; import { AppConfigService } from '../../../app-config'; import { UrlService } from '../../../common'; @@ -44,7 +44,7 @@ import { ToolbarComponent } from '../../../toolbar'; templateUrl: './img-viewer.component.html', styleUrls: ['./img-viewer.component.scss'], host: { class: 'adf-image-viewer' }, - imports: [ToolbarComponent, TranslateModule, MatIconModule, MatButtonModule, NgIf], + imports: [ToolbarComponent, TranslatePipe, MatIconModule, MatButtonModule, NgIf], encapsulation: ViewEncapsulation.None }) export class ImgViewerComponent implements AfterViewInit, OnChanges, OnDestroy { diff --git a/lib/core/src/lib/viewer/components/pdf-viewer-password-dialog/pdf-viewer-password-dialog.ts b/lib/core/src/lib/viewer/components/pdf-viewer-password-dialog/pdf-viewer-password-dialog.ts index b9378aeaca..c4525f8cb9 100644 --- a/lib/core/src/lib/viewer/components/pdf-viewer-password-dialog/pdf-viewer-password-dialog.ts +++ b/lib/core/src/lib/viewer/components/pdf-viewer-password-dialog/pdf-viewer-password-dialog.ts @@ -23,7 +23,7 @@ import { ReactiveFormsModule, UntypedFormControl, Validators } from '@angular/fo import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; declare const pdfjsLib: any; @@ -32,7 +32,7 @@ declare const pdfjsLib: any; standalone: true, templateUrl: './pdf-viewer-password-dialog.html', styleUrls: ['./pdf-viewer-password-dialog.scss'], - imports: [MatDialogModule, MatIconModule, MatFormFieldModule, MatInputModule, ReactiveFormsModule, TranslateModule, NgIf, MatButtonModule], + imports: [MatDialogModule, MatIconModule, MatFormFieldModule, MatInputModule, ReactiveFormsModule, TranslatePipe, NgIf, MatButtonModule], encapsulation: ViewEncapsulation.None }) export class PdfPasswordDialogComponent implements OnInit { diff --git a/lib/core/src/lib/viewer/components/pdf-viewer-thumb/pdf-viewer-thumb.component.ts b/lib/core/src/lib/viewer/components/pdf-viewer-thumb/pdf-viewer-thumb.component.ts index f753fd2ecf..02136fadf9 100644 --- a/lib/core/src/lib/viewer/components/pdf-viewer-thumb/pdf-viewer-thumb.component.ts +++ b/lib/core/src/lib/viewer/components/pdf-viewer-thumb/pdf-viewer-thumb.component.ts @@ -19,14 +19,14 @@ import { FocusableOption } from '@angular/cdk/a11y'; import { AsyncPipe, NgIf } from '@angular/common'; import { Component, ElementRef, Input, OnInit, ViewEncapsulation } from '@angular/core'; import { DomSanitizer } from '@angular/platform-browser'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; @Component({ selector: 'adf-pdf-thumb', standalone: true, templateUrl: './pdf-viewer-thumb.component.html', encapsulation: ViewEncapsulation.None, - imports: [AsyncPipe, TranslateModule, NgIf], + imports: [AsyncPipe, TranslatePipe, NgIf], host: { tabindex: '0' } }) export class PdfThumbComponent implements OnInit, FocusableOption { diff --git a/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.ts b/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.ts index bdd600d132..56b74783cd 100644 --- a/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.ts +++ b/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.ts @@ -38,7 +38,7 @@ import { MatButtonModule } from '@angular/material/button'; import { MatDialog } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; import { MatProgressBarModule } from '@angular/material/progress-bar'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { from, Subject, switchMap } from 'rxjs'; import { catchError } from 'rxjs/operators'; import { AppConfigService } from '../../../app-config'; @@ -65,7 +65,7 @@ export const PDFJS_VIEWER_MODULE = new InjectionToken('PDFJS_VIEWER_MODULE', { f imports: [ MatButtonModule, MatIconModule, - TranslateModule, + TranslatePipe, PdfThumbListComponent, NgIf, NgTemplateOutlet, diff --git a/lib/core/src/lib/viewer/components/unknown-format/unknown-format.component.ts b/lib/core/src/lib/viewer/components/unknown-format/unknown-format.component.ts index 565d364a6a..b1d0177069 100644 --- a/lib/core/src/lib/viewer/components/unknown-format/unknown-format.component.ts +++ b/lib/core/src/lib/viewer/components/unknown-format/unknown-format.component.ts @@ -17,14 +17,14 @@ import { Component, Input, ViewEncapsulation } from '@angular/core'; import { MatIconModule } from '@angular/material/icon'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; @Component({ selector: 'adf-viewer-unknown-format', standalone: true, templateUrl: './unknown-format.component.html', styleUrls: ['./unknown-format.component.scss'], - imports: [MatIconModule, TranslateModule], + imports: [MatIconModule, TranslatePipe], encapsulation: ViewEncapsulation.None }) export class UnknownFormatComponent { diff --git a/lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.ts b/lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.ts index fda556f654..587926f8c0 100644 --- a/lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.ts +++ b/lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.ts @@ -20,7 +20,7 @@ import { NgForOf, NgIf, NgSwitch, NgSwitchCase, NgSwitchDefault, NgTemplateOutle import { Component, EventEmitter, Injector, Input, OnChanges, OnInit, Output, TemplateRef, ViewEncapsulation } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { Track } from '../../models/viewer.model'; import { ViewUtilService } from '../../services/view-util.service'; import { ImgViewerComponent } from '../img-viewer/img-viewer.component'; @@ -37,7 +37,7 @@ import { UnknownFormatComponent } from '../unknown-format/unknown-format.compone host: { class: 'adf-viewer-render' }, encapsulation: ViewEncapsulation.None, imports: [ - TranslateModule, + TranslatePipe, MatProgressSpinnerModule, NgSwitch, NgSwitchCase, diff --git a/lib/core/src/lib/viewer/components/viewer.component.ts b/lib/core/src/lib/viewer/components/viewer.component.ts index f5fdfd52b5..cec098a338 100644 --- a/lib/core/src/lib/viewer/components/viewer.component.ts +++ b/lib/core/src/lib/viewer/components/viewer.component.ts @@ -39,7 +39,7 @@ import { MatButtonModule } from '@angular/material/button'; import { MatDialog } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { fromEvent } from 'rxjs'; import { filter, first, skipWhile } from 'rxjs/operators'; import { AppConfigService } from '../../app-config'; @@ -79,7 +79,7 @@ const DEFAULT_NON_PREVIEW_CONFIG = { ToolbarComponent, ToolbarTitleComponent, MatButtonModule, - TranslateModule, + TranslatePipe, MatIconModule, MatMenuModule, ToolbarDividerComponent, diff --git a/lib/insights/src/lib/analytics-process/components/analytics-generator.component.ts b/lib/insights/src/lib/analytics-process/components/analytics-generator.component.ts index d9fce2d174..c19ead9597 100644 --- a/lib/insights/src/lib/analytics-process/components/analytics-generator.component.ts +++ b/lib/insights/src/lib/analytics-process/components/analytics-generator.component.ts @@ -23,7 +23,7 @@ import { CommonModule } from '@angular/common'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { NgChartsModule } from 'ng2-charts'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatCheckboxModule } from '@angular/material/checkbox'; import { FormsModule } from '@angular/forms'; import { AnalyticsReportHeatMapComponent } from './analytics-report-heat-map.component'; @@ -36,7 +36,7 @@ import { AnalyticsReportHeatMapComponent } from './analytics-report-heat-map.com MatButtonModule, MatIconModule, NgChartsModule, - TranslateModule, + TranslatePipe, MatCheckboxModule, FormsModule, AnalyticsReportHeatMapComponent diff --git a/lib/insights/src/lib/analytics-process/components/analytics-report-parameters.component.ts b/lib/insights/src/lib/analytics-process/components/analytics-report-parameters.component.ts index 786f8d39a2..aa6a958d6b 100644 --- a/lib/insights/src/lib/analytics-process/components/analytics-report-parameters.component.ts +++ b/lib/insights/src/lib/analytics-process/components/analytics-report-parameters.component.ts @@ -37,7 +37,7 @@ import { ReportParametersModel } from '../../diagram/models/report/report-parame import { ReportQuery } from '../../diagram/models/report/report-query.model'; import { AnalyticsService } from '../services/analytics.service'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatIconModule } from '@angular/material/icon'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; @@ -111,7 +111,7 @@ export interface ReportFormValues { standalone: true, imports: [ CommonModule, - TranslateModule, + TranslatePipe, MatIconModule, ReactiveFormsModule, ToolbarComponent, diff --git a/lib/insights/src/lib/analytics-process/components/widgets/checkbox/checkbox.widget.ts b/lib/insights/src/lib/analytics-process/components/widgets/checkbox/checkbox.widget.ts index 80663c70f8..2610407ae3 100644 --- a/lib/insights/src/lib/analytics-process/components/widgets/checkbox/checkbox.widget.ts +++ b/lib/insights/src/lib/analytics-process/components/widgets/checkbox/checkbox.widget.ts @@ -21,13 +21,13 @@ import { Component, Input, ViewEncapsulation } from '@angular/core'; import { ReactiveFormsModule, UntypedFormGroup } from '@angular/forms'; import { WidgetComponent } from '../widget.component'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatCheckboxModule } from '@angular/material/checkbox'; @Component({ selector: 'analytics-checkbox-widget', standalone: true, - imports: [CommonModule, TranslateModule, ReactiveFormsModule, MatCheckboxModule], + imports: [CommonModule, TranslatePipe, ReactiveFormsModule, MatCheckboxModule], templateUrl: './checkbox.widget.html', encapsulation: ViewEncapsulation.None }) diff --git a/lib/insights/src/lib/analytics-process/components/widgets/date-range/date-range.widget.ts b/lib/insights/src/lib/analytics-process/components/widgets/date-range/date-range.widget.ts index a4914a774c..fddc866f96 100644 --- a/lib/insights/src/lib/analytics-process/components/widgets/date-range/date-range.widget.ts +++ b/lib/insights/src/lib/analytics-process/components/widgets/date-range/date-range.widget.ts @@ -24,7 +24,7 @@ import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material/core'; import { ReportParameterDetailsModel } from '../../../../diagram/models/report/report-parameter-details.model'; import { isAfter } from 'date-fns'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatGridListModule } from '@angular/material/grid-list'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; @@ -41,7 +41,7 @@ interface DateRangeProps { @Component({ selector: 'adf-date-range-widget', standalone: true, - imports: [CommonModule, TranslateModule, ReactiveFormsModule, MatGridListModule, MatFormFieldModule, MatInputModule, MatDatepickerModule], + imports: [CommonModule, TranslatePipe, ReactiveFormsModule, MatGridListModule, MatFormFieldModule, MatInputModule, MatDatepickerModule], templateUrl: './date-range.widget.html', styleUrls: ['./date-range.widget.scss'], providers: [ diff --git a/lib/insights/src/lib/analytics-process/components/widgets/dropdown/dropdown.widget.ts b/lib/insights/src/lib/analytics-process/components/widgets/dropdown/dropdown.widget.ts index e79b4a77c9..9fdc72086a 100644 --- a/lib/insights/src/lib/analytics-process/components/widgets/dropdown/dropdown.widget.ts +++ b/lib/insights/src/lib/analytics-process/components/widgets/dropdown/dropdown.widget.ts @@ -21,12 +21,12 @@ import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core'; import { ReactiveFormsModule, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms'; import { WidgetComponent } from '../widget.component'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; @Component({ selector: 'analytics-dropdown-widget', standalone: true, - imports: [CommonModule, TranslateModule, ReactiveFormsModule], + imports: [CommonModule, TranslatePipe, ReactiveFormsModule], templateUrl: './dropdown.widget.html', styleUrls: ['./dropdown.widget.scss'], encapsulation: ViewEncapsulation.None diff --git a/lib/insights/src/lib/analytics-process/components/widgets/duration/duration.widget.ts b/lib/insights/src/lib/analytics-process/components/widgets/duration/duration.widget.ts index 34720f5abe..2b992b4f74 100644 --- a/lib/insights/src/lib/analytics-process/components/widgets/duration/duration.widget.ts +++ b/lib/insights/src/lib/analytics-process/components/widgets/duration/duration.widget.ts @@ -24,14 +24,14 @@ import { ReportParameterDetailsModel } from '../../../../diagram/models/report/r import { NumberWidgetAnalyticsComponent } from '../number/number.widget'; import { CommonModule } from '@angular/common'; import { MatFormFieldModule } from '@angular/material/form-field'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { DropdownWidgetAnalyticsComponent } from '../dropdown/dropdown.widget'; import { MatInputModule } from '@angular/material/input'; @Component({ selector: 'duration-widget', standalone: true, - imports: [CommonModule, MatFormFieldModule, TranslateModule, FormsModule, DropdownWidgetAnalyticsComponent, MatInputModule], + imports: [CommonModule, MatFormFieldModule, TranslatePipe, FormsModule, DropdownWidgetAnalyticsComponent, MatInputModule], templateUrl: './duration.widget.html', styleUrls: ['./duration.widget.scss'], encapsulation: ViewEncapsulation.None diff --git a/lib/insights/src/lib/analytics-process/components/widgets/number/number.widget.ts b/lib/insights/src/lib/analytics-process/components/widgets/number/number.widget.ts index a37307cb98..cf5ca77306 100644 --- a/lib/insights/src/lib/analytics-process/components/widgets/number/number.widget.ts +++ b/lib/insights/src/lib/analytics-process/components/widgets/number/number.widget.ts @@ -21,14 +21,14 @@ import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core'; import { ReactiveFormsModule, UntypedFormGroup, Validators } from '@angular/forms'; import { WidgetComponent } from '../widget.component'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; @Component({ selector: 'analytics-number-widget', standalone: true, - imports: [CommonModule, TranslateModule, ReactiveFormsModule, MatFormFieldModule, MatInputModule], + imports: [CommonModule, TranslatePipe, ReactiveFormsModule, MatFormFieldModule, MatInputModule], templateUrl: './number.widget.html', styleUrls: ['./number.widget.scss'], encapsulation: ViewEncapsulation.None diff --git a/lib/process-services-cloud/src/lib/app/components/app-details-cloud/app-details-cloud.component.ts b/lib/process-services-cloud/src/lib/app/components/app-details-cloud/app-details-cloud.component.ts index 6e045ed60a..9ed66230f3 100644 --- a/lib/process-services-cloud/src/lib/app/components/app-details-cloud/app-details-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/app/components/app-details-cloud/app-details-cloud.component.ts @@ -18,14 +18,14 @@ import { Component, EventEmitter, Input, Output, ViewEncapsulation } from '@angular/core'; import { ApplicationInstanceModel, DEFAULT_APP_INSTANCE_ICON, DEFAULT_APP_INSTANCE_THEME } from '../../models/application-instance.model'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatIconModule } from '@angular/material/icon'; import { MatCardModule } from '@angular/material/card'; @Component({ selector: 'adf-cloud-app-details', standalone: true, - imports: [CommonModule, TranslateModule, MatIconModule, MatCardModule], + imports: [CommonModule, TranslatePipe, MatIconModule, MatCardModule], templateUrl: './app-details-cloud.component.html', styleUrls: ['./app-details-cloud.component.scss'], encapsulation: ViewEncapsulation.None diff --git a/lib/process-services-cloud/src/lib/app/components/app-list-cloud/app-list-cloud.component.ts b/lib/process-services-cloud/src/lib/app/components/app-list-cloud/app-list-cloud.component.ts index 6cfbb81c9f..f5c9b0f55f 100644 --- a/lib/process-services-cloud/src/lib/app/components/app-list-cloud/app-list-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/app/components/app-list-cloud/app-list-cloud.component.ts @@ -22,7 +22,7 @@ import { AppsProcessCloudService } from '../../services/apps-process-cloud.servi import { ApplicationInstanceModel } from '../../models/application-instance.model'; import { catchError } from 'rxjs/operators'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { AppDetailsCloudComponent } from '../app-details-cloud/app-details-cloud.component'; import { MatIconModule } from '@angular/material/icon'; import { MatLineModule } from '@angular/material/core'; @@ -38,7 +38,7 @@ export const DEPLOYED_STATUS: string = 'DEPLOYED'; standalone: true, imports: [ CommonModule, - TranslateModule, + TranslatePipe, AppDetailsCloudComponent, MatIconModule, MatLineModule, diff --git a/lib/process-services-cloud/src/lib/common/date-range-filter/date-range-filter.component.ts b/lib/process-services-cloud/src/lib/common/date-range-filter/date-range-filter.component.ts index 89ca4c0a1e..a19c8884c7 100644 --- a/lib/process-services-cloud/src/lib/common/date-range-filter/date-range-filter.component.ts +++ b/lib/process-services-cloud/src/lib/common/date-range-filter/date-range-filter.component.ts @@ -24,7 +24,7 @@ import { endOfDay, isValid, startOfDay } from 'date-fns'; import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material/core'; import { ADF_DATE_FORMATS, AdfDateFnsAdapter } from '@alfresco/adf-core'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatFormFieldModule } from '@angular/material/form-field'; @@ -36,7 +36,7 @@ interface DateRangeFormProps { @Component({ selector: 'adf-cloud-date-range-filter', standalone: true, - imports: [CommonModule, TranslateModule, MatDatepickerModule, MatFormFieldModule, ReactiveFormsModule, MatSelectModule], + imports: [CommonModule, TranslatePipe, MatDatepickerModule, MatFormFieldModule, ReactiveFormsModule, MatSelectModule], styleUrls: ['./date-range-filter.component.scss'], templateUrl: './date-range-filter.component.html', providers: [ diff --git a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts index 08687cbdf6..843e609863 100644 --- a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts @@ -33,7 +33,8 @@ import { provideTranslations, AuthModule, FormFieldEvent, - NoopTranslateModule + NoopTranslateModule, + NoopAuthModule } from '@alfresco/adf-core'; import { Node } from '@alfresco/js-api'; import { ESCAPE } from '@angular/cdk/keycodes'; @@ -45,7 +46,7 @@ import { MatDialog } from '@angular/material/dialog'; import { MatDialogHarness } from '@angular/material/dialog/testing'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { TranslateModule, TranslateService } from '@ngx-translate/core'; +import { TranslateLoader, TranslateService, provideTranslateService } from '@ngx-translate/core'; import { Observable, of, throwError } from 'rxjs'; import { cloudFormMock, @@ -65,8 +66,6 @@ import { FormCloudDisplayMode } from '../../services/form-fields.interfaces'; import { CloudFormRenderingService } from './cloud-form-rendering.service'; import { ProcessServiceCloudTestingModule } from '../../testing/process-service-cloud.testing.module'; import { TaskVariableCloud } from '../models/task-variable-cloud.model'; -import { ProcessServicesCloudModule } from '../../process-services-cloud.module'; -import { FormFieldValidator } from '../../../../../core/src/public-api'; import { MatCheckboxHarness } from '@angular/material/checkbox/testing'; const mockOauth2Auth: any = { @@ -81,7 +80,7 @@ const fakeValidator = { supportedTypes: ['test'], isSupported: () => true, validate: () => true -} as FormFieldValidator; +} as any; describe('FormCloudComponent', () => { let formCloudService: FormCloudService; @@ -1592,16 +1591,54 @@ describe('Multilingual Form', () => { let formComponent: FormCloudComponent; let fixture: ComponentFixture; + class FakeLoader implements TranslateLoader { + getTranslation(lang: string) { + const translations = { + en: { + FILE_UPLOAD_FIELD: { + TITLE: 'File Upload' + }, + TEXT_FIELD: { + TITLE: 'Text field' + }, + AMOUNT_FIELD: { + TITLE: 'Amount field' + }, + DATE_FIELD: { + TITLE: 'Date field' + } + }, + fr: { + FILE_UPLOAD_FIELD: { + TITLE: 'Téléchargement de fichiers' + }, + TEXT_FIELD: { + TITLE: 'Champ de texte' + }, + AMOUNT_FIELD: { + TITLE: 'Champ Montant' + }, + DATE_FIELD: { + TITLE: 'Champ de date' + } + } + }; + + return of(translations[lang]); + } + } + beforeEach(() => { TestBed.configureTestingModule({ - imports: [ - AuthModule.forRoot({ useHash: true }), - NoopAnimationsModule, - TranslateModule.forRoot(), - CoreModule.forRoot(), - ProcessServicesCloudModule.forRoot() - ], - providers: [provideTranslations('app', 'resources')] + imports: [NoopAnimationsModule, NoopAuthModule], + providers: [ + provideTranslateService({ + loader: { + provide: TranslateLoader, + useClass: FakeLoader + } + }) + ] }); translateService = TestBed.inject(TranslateService); formCloudService = TestBed.inject(FormCloudService); 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 be42b21ab2..d5610bd5ea 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 @@ -62,7 +62,7 @@ import { FormCloudSpinnerService } from '../services/spinner/form-cloud-spinner. import { DisplayModeService } from '../services/display-mode.service'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslatePipe } from '@ngx-translate/core'; import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; import { MatIconModule } from '@angular/material/icon'; @@ -76,7 +76,7 @@ export const FORM_CLOUD_FIELD_VALIDATORS_TOKEN = new InjectionToken=13.0.0", - "rxjs": "^6.5.3 || ^7.4.0" + "@angular/common": ">=16", + "@angular/core": ">=16" } }, "node_modules/@noble/hashes": { diff --git a/package.json b/package.json index 26e1c9a01b..8eb87b8b4c 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "@apollo/client": "3.13.1", "@cspell/eslint-plugin": "8.16.1", "@mat-datetimepicker/core": "14.0.0", - "@ngx-translate/core": "^14.0.0", + "@ngx-translate/core": "^16.0.4", "@nx/webpack": "^20.0.0", "angular-oauth2-oidc": "17.0.2", "angular-oauth2-oidc-jwks": "^17.0.2",