Fix date-fns related exports for Core lib (#10102)

This commit is contained in:
Denys Vuika 2024-08-20 08:38:02 -04:00 committed by GitHub
parent 04e2b16f66
commit d56988b6a7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 14 additions and 14 deletions

View File

@ -27,7 +27,6 @@ import { AppComponent } from './app.component';
import { appRoutes } from './app.routes'; import { appRoutes } from './app.routes';
import { MonacoEditorModule } from 'ngx-monaco-editor-v2'; import { MonacoEditorModule } from 'ngx-monaco-editor-v2';
import { ContentModule } from '@alfresco/adf-content-services'; import { ContentModule } from '@alfresco/adf-content-services';
import { InsightsModule } from '@alfresco/adf-insights';
import { ProcessModule } from '@alfresco/adf-process-services'; import { ProcessModule } from '@alfresco/adf-process-services';
import { environment } from '../environments/environment'; import { environment } from '../environments/environment';
import { ProcessServicesCloudModule } from '@alfresco/adf-process-services-cloud'; import { ProcessServicesCloudModule } from '@alfresco/adf-process-services-cloud';
@ -44,7 +43,6 @@ import { CoreAutomationService } from '../testing/automation.service';
TranslateModule.forRoot(), TranslateModule.forRoot(),
CoreModule.forRoot(), CoreModule.forRoot(),
ContentModule.forRoot(), ContentModule.forRoot(),
InsightsModule.forRoot(),
ProcessModule.forRoot(), ProcessModule.forRoot(),
ProcessServicesCloudModule.forRoot(), ProcessServicesCloudModule.forRoot(),
ExtensionsModule.forRoot(), ExtensionsModule.forRoot(),
@ -54,7 +52,8 @@ import { CoreAutomationService } from '../testing/automation.service';
declarations: [AppComponent], declarations: [AppComponent],
providers: [ providers: [
{ provide: AppConfigService, useClass: DebugAppConfigService }, // not use this service in production { provide: AppConfigService, useClass: DebugAppConfigService }, // not use this service in production
provideTranslations('app', 'resources') provideTranslations('app', 'resources'),
provideTranslations('adf-insights', 'assets/adf-insights')
], ],
bootstrap: [AppComponent] bootstrap: [AppComponent]
}) })

View File

@ -65,7 +65,7 @@ export const ADF_DATE_FORMATS: MatDateFormats = {
} }
}; };
@Injectable() @Injectable({ providedIn: 'root' })
export class AdfDateFnsAdapter extends DateFnsAdapter { export class AdfDateFnsAdapter extends DateFnsAdapter {
private _displayFormat?: string = null; private _displayFormat?: string = null;

View File

@ -58,7 +58,7 @@ function range<T>(length: number, valueFunction: (index: number) => T): T[] {
return valuesArray; return valuesArray;
} }
@Injectable() @Injectable({ providedIn: 'root' })
export class AdfDateTimeFnsAdapter extends DatetimeAdapter<Date> { export class AdfDateTimeFnsAdapter extends DatetimeAdapter<Date> {
private _displayFormat?: string = null; private _displayFormat?: string = null;

View File

@ -51,9 +51,7 @@ import { loadAppConfig } from './app-config/app-config.loader';
import { AppConfigService } from './app-config/app-config.service'; import { AppConfigService } from './app-config/app-config.service';
import { StorageService } from './common/services/storage.service'; import { StorageService } from './common/services/storage.service';
import { AlfrescoApiLoaderService, createAlfrescoApiInstance } from './api-factories/alfresco-api-v2-loader.service'; import { AlfrescoApiLoaderService, createAlfrescoApiInstance } from './api-factories/alfresco-api-v2-loader.service';
import { AdfDateFnsAdapter } from './common/utils/date-fns-adapter';
import { MomentDateAdapter } from './common/utils/moment-date-adapter'; import { MomentDateAdapter } from './common/utils/moment-date-adapter';
import { AdfDateTimeFnsAdapter } from './common/utils/datetime-fns-adapter';
import { AppConfigPipe, StoragePrefixFactory } from './app-config'; import { AppConfigPipe, StoragePrefixFactory } from './app-config';
import { IconComponent } from './icon'; import { IconComponent } from './icon';
import { SortingPickerComponent } from './sorting-picker'; import { SortingPickerComponent } from './sorting-picker';
@ -140,8 +138,6 @@ export class CoreModule {
TranslateStore, TranslateStore,
TranslateService, TranslateService,
{ provide: TranslateLoader, useClass: TranslateLoaderService }, { provide: TranslateLoader, useClass: TranslateLoaderService },
AdfDateFnsAdapter,
AdfDateTimeFnsAdapter,
MomentDateAdapter, MomentDateAdapter,
StoragePrefixFactory, StoragePrefixFactory,
{ {

View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
import { AdfDateFnsAdapter, DownloadService, ToolbarComponent, ToolbarTitleComponent } from '@alfresco/adf-core'; import { ADF_DATE_FORMATS, AdfDateFnsAdapter, DownloadService, ToolbarComponent, ToolbarTitleComponent } from '@alfresco/adf-core';
import { import {
AfterContentChecked, AfterContentChecked,
Component, Component,
@ -46,6 +46,7 @@ import { MatMenuModule } from '@angular/material/menu';
import { WIDGET_DIRECTIVES } from './widgets'; import { WIDGET_DIRECTIVES } from './widgets';
import { MatButtonModule } from '@angular/material/button'; import { MatButtonModule } from '@angular/material/button';
import { ButtonsMenuComponent } from './buttons-menu/buttons-menu.component'; import { ButtonsMenuComponent } from './buttons-menu/buttons-menu.component';
import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material/core';
const FORMAT_DATE_ACTIVITI = 'YYYY-MM-DD'; const FORMAT_DATE_ACTIVITI = 'YYYY-MM-DD';
@ -124,6 +125,10 @@ export interface ReportFormValues {
MatButtonModule, MatButtonModule,
ButtonsMenuComponent ButtonsMenuComponent
], ],
providers: [
{ provide: MAT_DATE_FORMATS, useValue: ADF_DATE_FORMATS },
{ provide: DateAdapter, useClass: AdfDateFnsAdapter }
],
templateUrl: './analytics-report-parameters.component.html', templateUrl: './analytics-report-parameters.component.html',
styleUrls: ['./analytics-report-parameters.component.scss'], styleUrls: ['./analytics-report-parameters.component.scss'],
encapsulation: ViewEncapsulation.None encapsulation: ViewEncapsulation.None

View File

@ -20,6 +20,7 @@ import { provideTranslations } from '@alfresco/adf-core';
import { ANALYTICS_PROCESS_DIRECTIVES } from './analytics-process/public-api'; import { ANALYTICS_PROCESS_DIRECTIVES } from './analytics-process/public-api';
import { DIAGRAM_DIRECTIVES } from './diagram/public-api'; import { DIAGRAM_DIRECTIVES } from './diagram/public-api';
/** @deprecated This module is deprecated and will be removed in a future release. */
@NgModule({ @NgModule({
imports: [...ANALYTICS_PROCESS_DIRECTIVES, ...DIAGRAM_DIRECTIVES], imports: [...ANALYTICS_PROCESS_DIRECTIVES, ...DIAGRAM_DIRECTIVES],
exports: [...ANALYTICS_PROCESS_DIRECTIVES, ...DIAGRAM_DIRECTIVES] exports: [...ANALYTICS_PROCESS_DIRECTIVES, ...DIAGRAM_DIRECTIVES]

View File

@ -18,7 +18,6 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { InsightsModule } from '../insights.module';
import { import {
AlfrescoApiService, AlfrescoApiService,
AlfrescoApiServiceMock, AlfrescoApiServiceMock,
@ -26,17 +25,17 @@ import {
AppConfigServiceMock, AppConfigServiceMock,
TranslationService, TranslationService,
TranslationMock, TranslationMock,
CoreModule,
AuthModule AuthModule
} from '@alfresco/adf-core'; } from '@alfresco/adf-core';
import { HttpClientTestingModule } from '@angular/common/http/testing';
@NgModule({ @NgModule({
imports: [AuthModule.forRoot({ useHash: true }), NoopAnimationsModule, TranslateModule.forRoot(), CoreModule.forRoot(), InsightsModule], imports: [AuthModule.forRoot({ useHash: true }), NoopAnimationsModule, HttpClientTestingModule, TranslateModule.forRoot()],
providers: [ providers: [
{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }, { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock },
{ provide: AppConfigService, useClass: AppConfigServiceMock }, { provide: AppConfigService, useClass: AppConfigServiceMock },
{ provide: TranslationService, useClass: TranslationMock } { provide: TranslationService, useClass: TranslationMock }
], ],
exports: [NoopAnimationsModule, TranslateModule, CoreModule, InsightsModule] exports: [NoopAnimationsModule, TranslateModule]
}) })
export class InsightsTestingModule {} export class InsightsTestingModule {}