From 9d4d3c556d322f8dfcf9ca13dc12cf9ad79d5f34 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Fri, 20 Sep 2024 12:35:42 -0400 Subject: [PATCH] migrate cloud components --- .../components/form-cloud.component.spec.ts | 3 +- ...nition-selector-cloud.component.stories.ts | 4 +- .../src/lib/form/form-cloud.module.ts | 82 +++++-------------- .../src/lib/process-services-cloud.module.ts | 6 +- 4 files changed, 26 insertions(+), 69 deletions(-) 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 1b4ca29772..6b4c5893e5 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 @@ -46,7 +46,6 @@ import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { Observable, of, throwError } from 'rxjs'; -import { FormCloudModule } from '../form-cloud.module'; import { cloudFormMock, conditionalUploadWidgetsMock, @@ -1539,7 +1538,7 @@ describe('retrieve metadata on submit', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [AuthModule.forRoot({ useHash: true }), NoopAnimationsModule, TranslateModule.forRoot(), CoreModule.forRoot(), FormCloudModule], + imports: [ProcessServiceCloudTestingModule, FormCloudComponent], providers: [ provideTranslations('app', 'resources'), { diff --git a/lib/process-services-cloud/src/lib/form/components/form-definition-selector-cloud.component.stories.ts b/lib/process-services-cloud/src/lib/form/components/form-definition-selector-cloud.component.stories.ts index b20513e9dd..58522e7683 100644 --- a/lib/process-services-cloud/src/lib/form/components/form-definition-selector-cloud.component.stories.ts +++ b/lib/process-services-cloud/src/lib/form/components/form-definition-selector-cloud.component.stories.ts @@ -16,7 +16,7 @@ */ import { applicationConfig, Meta, moduleMetadata, StoryFn } from '@storybook/angular'; -import { FormCloudModule } from '../form-cloud.module'; +import { FORM_CLOUD_DIRECTIVES } from '../form-cloud.module'; import { FormDefinitionSelectorCloudComponent } from './form-definition-selector-cloud.component'; import { ProcessServicesCloudStoryModule } from '../../testing/process-services-cloud-story.module'; import { FormDefinitionSelectorCloudService } from '../services/form-definition-selector-cloud.service'; @@ -28,7 +28,7 @@ export default { title: 'Process Services Cloud/Form Cloud/Form Definition Selector Cloud', decorators: [ moduleMetadata({ - imports: [FormCloudModule], + imports: [...FORM_CLOUD_DIRECTIVES], providers: [{ provide: FormDefinitionSelectorCloudService, useClass: FormDefinitionSelectorCloudServiceMock }] }), applicationConfig({ diff --git a/lib/process-services-cloud/src/lib/form/form-cloud.module.ts b/lib/process-services-cloud/src/lib/form/form-cloud.module.ts index 8f6e42328f..c09775f51e 100644 --- a/lib/process-services-cloud/src/lib/form/form-cloud.module.ts +++ b/lib/process-services-cloud/src/lib/form/form-cloud.module.ts @@ -16,19 +16,9 @@ */ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { CoreModule, FormatSpacePipe, TOOLBAR_DIRECTIVES, FormStylePipe } from '@alfresco/adf-core'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { MaterialModule } from '../material.module'; import { FormCloudComponent } from './components/form-cloud.component'; import { FormDefinitionSelectorCloudComponent } from './components/form-definition-selector-cloud.component'; import { FormCustomOutcomesComponent } from './components/form-cloud-custom-outcomes.component'; -import { - AlfrescoViewerComponent, - CONTENT_METADATA_DIRECTIVES, - CONTENT_UPLOAD_DIRECTIVES, - ContentNodeSelectorModule -} from '@alfresco/adf-content-services'; import { GroupCloudWidgetComponent } from './components/widgets/group/group-cloud.widget'; import { PeopleCloudWidgetComponent } from './components/widgets/people/people-cloud.widget'; import { AttachFileCloudWidgetComponent } from './components/widgets/attach-file/attach-file-cloud-widget.component'; @@ -39,60 +29,28 @@ import { RadioButtonsCloudWidgetComponent } from './components/widgets/radio-but import { FilePropertiesTableCloudComponent } from './components/widgets/attach-file/file-properties-table-cloud.component'; import { FileViewerWidgetComponent } from './components/widgets/file-viewer/file-viewer.widget'; import { DisplayRichTextWidgetComponent } from './components/widgets/display-rich-text/display-rich-text.widget'; -import { RichTextEditorComponent } from '../rich-text-editor'; -import { A11yModule } from '@angular/cdk/a11y'; -import { OverlayModule } from '@angular/cdk/overlay'; import { FormSpinnerComponent } from './components/spinner/form-spinner.component'; -import { PeopleCloudComponent } from '../people/components/people-cloud.component'; -import { GroupCloudComponent } from '../group/components/group-cloud.component'; +export const FORM_CLOUD_DIRECTIVES = [ + FormSpinnerComponent, + UploadCloudWidgetComponent, + AttachFileCloudWidgetComponent, + FilePropertiesTableCloudComponent, + DisplayRichTextWidgetComponent, + FileViewerWidgetComponent, + GroupCloudWidgetComponent, + PeopleCloudWidgetComponent, + FormCustomOutcomesComponent, + RadioButtonsCloudWidgetComponent, + FormDefinitionSelectorCloudComponent, + PropertiesViewerWrapperComponent, + PropertiesViewerWidgetComponent, + FormCloudComponent +] as const; + +/** @deprecated use individual standalone components instead */ @NgModule({ - imports: [ - CommonModule, - OverlayModule, - MaterialModule, - FormsModule, - ReactiveFormsModule, - CoreModule, - ContentNodeSelectorModule, - PeopleCloudComponent, - GroupCloudComponent, - RichTextEditorComponent, - ...TOOLBAR_DIRECTIVES, - A11yModule, - FormatSpacePipe, - AlfrescoViewerComponent, - ...CONTENT_UPLOAD_DIRECTIVES, - ...CONTENT_METADATA_DIRECTIVES, - FormStylePipe, - FormSpinnerComponent, - UploadCloudWidgetComponent, - AttachFileCloudWidgetComponent, - FilePropertiesTableCloudComponent, - DisplayRichTextWidgetComponent, - FileViewerWidgetComponent, - GroupCloudWidgetComponent, - PeopleCloudWidgetComponent, - FormCustomOutcomesComponent, - RadioButtonsCloudWidgetComponent, - FormDefinitionSelectorCloudComponent, - PropertiesViewerWrapperComponent, - PropertiesViewerWidgetComponent, - FormCloudComponent - ], - exports: [ - FormCloudComponent, - UploadCloudWidgetComponent, - FormDefinitionSelectorCloudComponent, - FormCustomOutcomesComponent, - RadioButtonsCloudWidgetComponent, - AttachFileCloudWidgetComponent, - PeopleCloudWidgetComponent, - GroupCloudWidgetComponent, - PropertiesViewerWidgetComponent, - FileViewerWidgetComponent, - DisplayRichTextWidgetComponent, - FilePropertiesTableCloudComponent - ] + imports: [...FORM_CLOUD_DIRECTIVES], + exports: [...FORM_CLOUD_DIRECTIVES] }) export class FormCloudModule {} diff --git a/lib/process-services-cloud/src/lib/process-services-cloud.module.ts b/lib/process-services-cloud/src/lib/process-services-cloud.module.ts index bb59f51dd4..50537b8669 100644 --- a/lib/process-services-cloud/src/lib/process-services-cloud.module.ts +++ b/lib/process-services-cloud/src/lib/process-services-cloud.module.ts @@ -20,7 +20,7 @@ import { CoreModule, FormRenderingService, provideTranslations } from '@alfresco import { APP_LIST_CLOUD_DIRECTIVES } from './app/app-list-cloud.module'; import { TASK_CLOUD_DIRECTIVES } from './task/task-cloud.module'; import { PROCESS_CLOUD_DIRECTIVES } from './process/process-cloud.module'; -import { FormCloudModule } from './form/form-cloud.module'; +import { FORM_CLOUD_DIRECTIVES } from './form/form-cloud.module'; import { LocalPreferenceCloudService, PreferenceCloudServiceInterface, @@ -51,7 +51,7 @@ import { TaskListCloudService } from './task/task-list/services/task-list-cloud. ...TASK_CLOUD_DIRECTIVES, GroupCloudComponent, PeopleCloudComponent, - FormCloudModule, + ...FORM_CLOUD_DIRECTIVES, TaskFormCloudComponent, ProcessNameCloudPipe, ApolloModule, @@ -63,7 +63,7 @@ import { TaskListCloudService } from './task/task-list/services/task-list-cloud. ...PROCESS_CLOUD_DIRECTIVES, ...TASK_CLOUD_DIRECTIVES, GroupCloudComponent, - FormCloudModule, + ...FORM_CLOUD_DIRECTIVES, TaskFormCloudComponent, PeopleCloudComponent, ProcessNameCloudPipe,