diff --git a/demo-shell/src/app/components/process-list-demo/process-list.module.ts b/demo-shell/src/app/components/process-list-demo/process-list.module.ts index f3c9d33c08..083668b8a5 100644 --- a/demo-shell/src/app/components/process-list-demo/process-list.module.ts +++ b/demo-shell/src/app/components/process-list-demo/process-list.module.ts @@ -24,8 +24,8 @@ import { ProcessModule } from '@alfresco/adf-process-services'; const routes: Routes = [ { - path: '', - component: ProcessListDemoComponent + path: '', + component: ProcessListDemoComponent }, { path: ':id', @@ -34,12 +34,7 @@ const routes: Routes = [ ]; @NgModule({ - imports: [ - CommonModule, - RouterModule.forChild(routes), - CoreModule, - ProcessModule.forChild() - ], + imports: [CommonModule, RouterModule.forChild(routes), CoreModule, ProcessModule], declarations: [ProcessListDemoComponent] }) export class AppProcessListModule {} diff --git a/demo-shell/src/app/components/task-list-demo/task-list.module.ts b/demo-shell/src/app/components/task-list-demo/task-list.module.ts index 314f09109c..7196e67536 100644 --- a/demo-shell/src/app/components/task-list-demo/task-list.module.ts +++ b/demo-shell/src/app/components/task-list-demo/task-list.module.ts @@ -34,7 +34,7 @@ const routes: Routes = [ ]; @NgModule({ - imports: [CommonModule, RouterModule.forChild(routes), CoreModule, ProcessModule.forChild(), LocalizedDatePipe, FullNamePipe], + imports: [CommonModule, RouterModule.forChild(routes), CoreModule, ProcessModule, LocalizedDatePipe, FullNamePipe], declarations: [TaskListDemoComponent] }) export class AppTaskListModule {} diff --git a/docs/README.md b/docs/README.md index 63b2bfa986..2eb6a51f0a 100644 --- a/docs/README.md +++ b/docs/README.md @@ -120,7 +120,7 @@ for more information about installing and using the source code. | [Sidenav Layout component](core/components/sidenav-layout.component.md) | Displays the standard three-region ADF application layout. | [Source](../lib/core/src/lib/layout/components/sidenav-layout/sidenav-layout.component.ts) | | [Snackbar Content Component](core/components/snackbar-content.component.md) | Custom content for Snackbar which allows use icon as action. | [Source](../lib/core/src/lib/snackbar-content/snackbar-content.component.ts) | | [Sorting Picker Component](core/components/sorting-picker.component.md) | Selects from a set of predefined sorting definitions and directions. | [Source](../lib/core/src/lib/sorting-picker/sorting-picker.component.ts) | -| [Start Form component](core/components/start-form.component.md) | Displays the Start Form for a process. | [Source](../lib/process-services/src/lib/form/start-form.component.ts) | +| [Start Form component](core/components/start-form.component.md) | Displays the Start Form for a process. | [Source](../lib/process-services/src/lib/form/start-form/start-form.component.ts) | | [Text Mask directive](core/components/text-mask.component.md) | Implements text field input masks. | [Source](../lib/core/src/lib/form/components/widgets/text/text-mask.component.ts) | | [Toolbar Divider Component](core/components/toolbar-divider.component.md) | Divides groups of elements in a Toolbar with a visual separator. | [Source](../lib/core/src/lib/toolbar/toolbar-divider.component.ts) | | [Toolbar Title Component](core/components/toolbar-title.component.md) | Supplies custom HTML to be included in a Toolbar component title. | [Source](../lib/core/src/lib/toolbar/toolbar-title.component.ts) | @@ -192,7 +192,7 @@ for more information about installing and using the source code. | [APS Alfresco Content Service](core/services/activiti-alfresco.service.md) | Gets Alfresco Repository folder content based on a Repository account configured in Alfresco Process Services (APS). | [Source](../lib/process-services/src/lib/form/services/activiti-alfresco.service.ts) | | [Alfresco Api Service](core/services/alfresco-api.service.md) | Provides access to an initialized AlfrescoJSApi instance. | [Source](../lib/core/src/lib/services/alfresco-api.service.ts) | | [App Config service](core/services/app-config.service.md) | Supports app configuration settings, stored server side. | [Source](../lib/core/src/lib/app-config/app-config.service.ts) | -| [Apps Process service](core/services/apps-process.service.md) | Gets details of the Process Services apps that are deployed for the user. | [Source](../lib/process-services/src/lib/app-list/services/apps-process.service.ts) | +| [Apps Process service](core/services/apps-process.service.md) | Gets details of the Process Services apps that are deployed for the user. | [Source](../lib/process-services/src/lib/services/apps-process.service.ts) | | [Auth Guard Bpm service](core/services/auth-guard-bpm.service.md) | Adds authentication with Process Services to a route within the app. | [Source](../lib/core/src/lib/auth/guard/auth-guard-bpm.service.ts) | | [Auth Guard Ecm service](core/services/auth-guard-ecm.service.md) | Adds authentication with Content Services to a route within the app. | [Source](../lib/core/src/lib/auth/guard/auth-guard-ecm.service.ts) | | [Auth Guard SSO Role service](core/services/auth-guard-sso-role.service.md) | Checks the user roles of a user. | [Source](../lib/core/src/lib/auth/guard/auth-guard-sso-role.service.ts) | @@ -394,7 +394,7 @@ for more information about installing and using the source code. | [Security Controls service](content-services/services/security-controls.service.md) | Manages security groups & marks in Content Services. | [Source](../lib/content-services/src/lib/security/services/security-controls-groups-marks-security.service.ts) | | [Sites service](content-services/services/sites.service.md) | Accesses and manipulates sites from a Content Services repository. | [Source](../lib/content-services/src/lib/common/services/sites.service.ts) | | [Tag service](content-services/services/tag.service.md) | Manages tags in Content Services. | [Source](../lib/content-services/src/lib/tag/services/tag.service.ts) | -| [Task Comments service](content-services/services/task-comments.service.md) | Adds and retrieves comments for task and process instances in Process Services. | [Source](../lib/process-services/src/lib/task-comments/services/task-comments.service.ts) | +| [Task Comments service](content-services/services/task-comments.service.md) | Adds and retrieves comments for task and process instances in Process Services. | [Source](../lib/process-services/src/lib/task-comments/task-comments.service.ts) | @@ -414,8 +414,8 @@ for more information about installing and using the source code. | Name | Description | Source link | | ---- | ----------- | ----------- | | [Apps List Component](process-services/components/apps-list.component.md) | Shows all available apps. | [Source](../lib/process-services/src/lib/app-list/apps-list.component.ts) | -| [Attach Form component](process-services/components/attach-form.component.md) | This component can be used when there is no form attached to a task and you want to add one. | [Source](../lib/process-services/src/lib/task-list/components/attach-form.component.ts) | -| [Checklist Component](process-services/components/checklist.component.md) | Shows the checklist task functionality. | [Source](../lib/process-services/src/lib/task-list/components/checklist.component.ts) | +| [Attach Form component](process-services/components/attach-form.component.md) | This component can be used when there is no form attached to a task and you want to add one. | [Source](../lib/process-services/src/lib/task-list/components/attach-form/attach-form.component.ts) | +| [Checklist Component](process-services/components/checklist.component.md) | Shows the checklist task functionality. | [Source](../lib/process-services/src/lib/task-list/components/checklist/checklist.component.ts) | | [Create Process Attachment component](process-services/components/create-process-attachment.component.md) | Displays an Upload Component (Drag and Click) to upload the attachment to a specified process instance. | [Source](../lib/process-services/src/lib/attachment/create-process-attachment/create-process-attachment.component.ts) | | [Create Task Attachment Component](process-services/components/create-task-attachment.component.md) | Displays an Upload Component (Drag and Click) to upload the attachment to a specified task. | [Source](../lib/process-services/src/lib/attachment/create-task-attachment/create-task-attachment.component.ts) | | [Form custom outcomes component](process-services/components/form-custom-outcome.component.md) | Supplies custom outcome buttons to be included in Form component. | [Source](../lib/process-services/src/lib/form/form-custom-outcomes.component.ts) | @@ -425,31 +425,31 @@ for more information about installing and using the source code. | [People Component](process-services/components/people.component.md) | Displays users involved with a specified task | [Source](../lib/process-services/src/lib/people/components/people/people.component.ts) | | [Process Attachment List component](process-services/components/process-attachment-list.component.md) | Displays documents attached to a specified process instance. | [Source](../lib/process-services/src/lib/attachment/process-attachment-list/process-attachment-list.component.ts) | | [Process Instance Comments component](process-services/components/process-comments.component.md) | Displays comments associated with a particular process instance and allows the user to add new comments. | [Source](../lib/process-services/src/lib/process-comments/process-comments.component.ts) | -| [Process Filters Component](process-services/components/process-filters.component.md) | Collection of criteria used to filter process instances, which may be customized by users. | [Source](../lib/process-services/src/lib/process-list/components/process-filters.component.ts) | -| [Process Details component](process-services/components/process-instance-details.component.md) | Displays detailed information about a specified process instance | [Source](../lib/process-services/src/lib/process-list/components/process-instance-details.component.ts) | -| [Process Instance Details Header component](process-services/components/process-instance-header.component.md) | Sub-component of the process details component, which renders some general information about the selected process. | [Source](../lib/process-services/src/lib/process-list/components/process-instance-header.component.ts) | -| [Process Instance Tasks component](process-services/components/process-instance-tasks.component.md) | Lists both the active and completed tasks associated with a particular process instance | [Source](../lib/process-services/src/lib/process-list/components/process-instance-tasks.component.ts) | -| [Process Instance List](process-services/components/process-list.component.md) | Renders a list containing all the process instances matched by the parameters specified. | [Source](../lib/process-services/src/lib/process-list/components/process-list.component.ts) | +| [Process Filters Component](process-services/components/process-filters.component.md) | Collection of criteria used to filter process instances, which may be customized by users. | [Source](../lib/process-services/src/lib/process-list/components/process-filters/process-filters.component.ts) | +| [Process Details component](process-services/components/process-instance-details.component.md) | Displays detailed information about a specified process instance | [Source](../lib/process-services/src/lib/process-list/components/process-instance-details/process-instance-details.component.ts) | +| [Process Instance Details Header component](process-services/components/process-instance-header.component.md) | Sub-component of the process details component, which renders some general information about the selected process. | [Source](../lib/process-services/src/lib/process-list/components/process-instance-header/process-instance-header.component.ts) | +| [Process Instance Tasks component](process-services/components/process-instance-tasks.component.md) | Lists both the active and completed tasks associated with a particular process instance | [Source](../lib/process-services/src/lib/process-list/components/process-instance-tasks/process-instance-tasks.component.ts) | +| [Process Instance List](process-services/components/process-list.component.md) | Renders a list containing all the process instances matched by the parameters specified. | [Source](../lib/process-services/src/lib/process-list/components/process-list/process-list.component.ts) | | [Process User Info component](process-services/components/process-user-info.component.md) | Shows user information for PROCESS and ALL mode. | [Source](../lib/process-services/src/lib/process-user-info/process-user-info.component.ts) | | [Select App Component](process-services/components/select-apps-dialog.component.md) | Shows all available apps and returns the selected app. | [Source](../lib/process-services/src/lib/app-list/select-apps-dialog/select-apps-dialog.component.ts) | -| [Start Process component](process-services/components/start-process.component.md) | Starts a process. | [Source](../lib/process-services/src/lib/process-list/components/start-process.component.ts) | -| [Start Task Component](process-services/components/start-task.component.md) | Creates/Starts a new task for the specified app. | [Source](../lib/process-services/src/lib/task-list/components/start-task.component.ts) | +| [Start Process component](process-services/components/start-process.component.md) | Starts a process. | [Source](../lib/process-services/src/lib/process-list/components/start-process/start-process.component.ts) | +| [Start Task Component](process-services/components/start-task.component.md) | Creates/Starts a new task for the specified app. | [Source](../lib/process-services/src/lib/task-list/components/start-task/start-task.component.ts) | | [Task Attachment List Component](process-services/components/task-attachment-list.component.md) | Displays documents attached to a specified task. | [Source](../lib/process-services/src/lib/attachment/task-attachment-list/task-attachment-list.component.ts) | | [Task Comments Component](process-services/components/task-comments.component.md) | Displays comments from users involved in a specified task and allows an involved user to add a comment to a task. | [Source](../lib/process-services/src/lib/task-comments/task-comments.component.ts) | -| [Task Details component](process-services/components/task-details.component.md) | Shows the details of the task ID passed in as input. | [Source](../lib/process-services/src/lib/task-list/components/task-details.component.ts) | -| [Task Filters component](process-services/components/task-filters.component.md) | Shows all available filters. | [Source](../lib/process-services/src/lib/task-list/components/task-filters.component.ts) | +| [Task Details component](process-services/components/task-details.component.md) | Shows the details of the task ID passed in as input. | [Source](../lib/process-services/src/lib/task-list/components/task-details/task-details.component.ts) | +| [Task Filters component](process-services/components/task-filters.component.md) | Shows all available filters. | [Source](../lib/process-services/src/lib/task-list/components/task-filters/task-filters.component.ts) | | [Task Form component](process-services/components/task-form.component.md) | Shows a form for a task. | [Source](../lib/process-services/src/lib/task-list/components/task-form/task-form.component.ts) | -| [Task Header component](process-services/components/task-header.component.md) | Shows all the information related to a task. | [Source](../lib/process-services/src/lib/task-list/components/task-header.component.ts) | -| [Task List component](process-services/components/task-list.component.md) | Renders a list containing all the tasks matched by the parameters specified. | [Source](../lib/process-services/src/lib/task-list/components/task-list.component.ts) | -| [Task Standalone component](process-services/components/task-standalone.component.md) | This component can be used when the task doesn't belong to any processes. | [Source](../lib/process-services/src/lib/task-list/components/task-standalone.component.ts) | +| [Task Header component](process-services/components/task-header.component.md) | Shows all the information related to a task. | [Source](../lib/process-services/src/lib/task-list/components/task-header/task-header.component.ts) | +| [Task List component](process-services/components/task-list.component.md) | Renders a list containing all the tasks matched by the parameters specified. | [Source](../lib/process-services/src/lib/task-list/components/task-list/task-list.component.ts) | +| [Task Standalone component](process-services/components/task-standalone.component.md) | This component can be used when the task doesn't belong to any processes. | [Source](../lib/process-services/src/lib/task-list/components/task-standalone/task-standalone.component.ts) | ### Directives | Name | Description | Source link | | ---- | ----------- | ----------- | | [Claim Task Directive](process-services/directives/claim-task.directive.md) ![Experimental](docassets/images/ExperimentalIcon.png) | Claims a task | [Source](../lib/process-services/src/lib/task-list/components/task-form/claim-task.directive.ts) | -| [Process Audit Directive](process-services/directives/process-audit.directive.md) | Fetches the Process Audit information in PDF or JSON format. | [Source](../lib/process-services/src/lib/process-list/components/process-audit.directive.ts) | -| [Task Audit Directive](process-services/directives/task-audit.directive.md) | Fetches the Task Audit information in PDF or JSON format. | [Source](../lib/process-services/src/lib/task-list/components/task-audit.directive.ts) | +| [Process Audit Directive](process-services/directives/process-audit.directive.md) | Fetches the Process Audit information in PDF or JSON format. | [Source](../lib/process-services/src/lib/process-list/components/process-audit/process-audit.directive.ts) | +| [Task Audit Directive](process-services/directives/task-audit.directive.md) | Fetches the Task Audit information in PDF or JSON format. | [Source](../lib/process-services/src/lib/task-list/components/task-audit/task-audit.directive.ts) | | [Unclaim Task Directive](process-services/directives/unclaim-task.directive.md) ![Experimental](docassets/images/ExperimentalIcon.png) | Unclaims a task | [Source](../lib/process-services/src/lib/task-list/components/task-form/unclaim-task.directive.ts) | ### Services diff --git a/docs/core/components/start-form.component.md b/docs/core/components/start-form.component.md index f833b66df3..24da995e30 100644 --- a/docs/core/components/start-form.component.md +++ b/docs/core/components/start-form.component.md @@ -5,7 +5,7 @@ Status: Active Last reviewed: 2018-06-08 --- -# [Start Form component](../../../lib/process-services/src/lib/form/start-form.component.ts "Defined in start-form.component.ts") +# [Start Form component](../../../lib/process-services/src/lib/form/start-form/start-form.component.ts "Defined in start-form.component.ts") Displays the Start [`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts) for a process. diff --git a/docs/core/services/apps-process.service.md b/docs/core/services/apps-process.service.md index 401319d6a4..20909281fe 100644 --- a/docs/core/services/apps-process.service.md +++ b/docs/core/services/apps-process.service.md @@ -5,7 +5,7 @@ Status: Active Last reviewed: 2018-11-16 --- -# [Apps Process service](../../../lib/process-services/src/lib/app-list/services/apps-process.service.ts "Defined in apps-process.service.ts") +# [Apps Process service](../../../lib/process-services/src/lib/services/apps-process.service.ts "Defined in apps-process.service.ts") Gets details of the Process Services apps that are deployed for the user. diff --git a/docs/process-services/components/attach-form.component.md b/docs/process-services/components/attach-form.component.md index b78b686065..dd05e22208 100644 --- a/docs/process-services/components/attach-form.component.md +++ b/docs/process-services/components/attach-form.component.md @@ -5,7 +5,7 @@ Status: Active Last reviewed: 2018-11-20 --- -# [Attach Form component](../../../lib/process-services/src/lib/task-list/components/attach-form.component.ts "Defined in attach-form.component.ts") +# [Attach Form component](../../../lib/process-services/src/lib/task-list/components/attach-form/attach-form.component.ts "Defined in attach-form.component.ts") This component can be used when there is no form attached to a task and you want to add one. diff --git a/docs/process-services/components/process-instance-details.component.md b/docs/process-services/components/process-instance-details.component.md index bd96498023..a3e8eefdd5 100644 --- a/docs/process-services/components/process-instance-details.component.md +++ b/docs/process-services/components/process-instance-details.component.md @@ -5,7 +5,7 @@ Status: Active Last reviewed: 2018-11-19 --- -# [Process Details component](../../../lib/process-services/src/lib/process-list/components/process-instance-details.component.ts "Defined in process-instance-details.component.ts") +# [Process Details component](../../../lib/process-services/src/lib/process-list/components/process-instance-details/process-instance-details.component.ts "Defined in process-instance-details.component.ts") Displays detailed information about a specified process instance diff --git a/docs/process-services/components/process-instance-header.component.md b/docs/process-services/components/process-instance-header.component.md index 241394accc..668717d49b 100644 --- a/docs/process-services/components/process-instance-header.component.md +++ b/docs/process-services/components/process-instance-header.component.md @@ -5,7 +5,7 @@ Status: Active Last reviewed: 2019-01-14 --- -# [Process Instance Details Header component](../../../lib/process-services/src/lib/process-list/components/process-instance-header.component.ts "Defined in process-instance-header.component.ts") +# [Process Instance Details Header component](../../../lib/process-services/src/lib/process-list/components/process-instance-header/process-instance-header.component.ts "Defined in process-instance-header.component.ts") Sub-component of the process details component, which renders some general information about the selected process. diff --git a/docs/process-services/components/process-instance-tasks.component.md b/docs/process-services/components/process-instance-tasks.component.md index 80b30122f3..1522798d83 100644 --- a/docs/process-services/components/process-instance-tasks.component.md +++ b/docs/process-services/components/process-instance-tasks.component.md @@ -5,7 +5,7 @@ Status: Active Last reviewed: 2018-11-19 --- -# [Process Instance Tasks component](../../../lib/process-services/src/lib/process-list/components/process-instance-tasks.component.ts "Defined in process-instance-tasks.component.ts") +# [Process Instance Tasks component](../../../lib/process-services/src/lib/process-list/components/process-instance-tasks/process-instance-tasks.component.ts "Defined in process-instance-tasks.component.ts") Lists both the active and completed tasks associated with a particular process instance diff --git a/docs/process-services/components/process-list.component.md b/docs/process-services/components/process-list.component.md index 1d2a7c0cda..242cdf486e 100644 --- a/docs/process-services/components/process-list.component.md +++ b/docs/process-services/components/process-list.component.md @@ -5,7 +5,7 @@ Status: Active Last reviewed: 2019-01-16 --- -# [Process Instance List](../../../lib/process-services/src/lib/process-list/components/process-list.component.ts "Defined in process-list.component.ts") +# [Process Instance List](../../../lib/process-services/src/lib/process-list/components/process-list/process-list.component.ts "Defined in process-list.component.ts") Renders a list containing all the process instances matched by the parameters specified. @@ -195,7 +195,7 @@ The Process Instance List also supports pagination: Emitted before the context menu is displayed for a row. -Note that the [`ProcessInstanceListComponent`](../../../lib/process-services/src/lib/process-list/components/process-list.component.ts) itself does not populate the context menu with items. You can provide all necessary content via the handler. +Note that the [`ProcessInstanceListComponent`](../../../lib/process-services/src/lib/process-list/components/process-list/process-list.component.ts) itself does not populate the context menu with items. You can provide all necessary content via the handler. ```html { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ - TranslateModule.forRoot() - ], - declarations: [ FileViewerWidgetComponent ], - providers: [ { provide: FormService, useValue: formServiceStub } ], + imports: [TranslateModule.forRoot()], + declarations: [FileViewerWidgetComponent], + providers: [{ provide: FormService, useValue: formServiceStub }], schemas: [CUSTOM_ELEMENTS_SCHEMA] - }); + }); formServiceStub = TestBed.inject(FormService); fixture = TestBed.createComponent(FileViewerWidgetComponent); diff --git a/lib/process-services/src/lib/app-list/apps-list.component.spec.ts b/lib/process-services/src/lib/app-list/apps-list.component.spec.ts index fa6c42cb4b..c39be2875b 100644 --- a/lib/process-services/src/lib/app-list/apps-list.component.spec.ts +++ b/lib/process-services/src/lib/app-list/apps-list.component.spec.ts @@ -18,7 +18,7 @@ import { DebugElement, Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { AppsProcessService } from './services/apps-process.service'; +import { AppsProcessService } from '../services/apps-process.service'; import { of, throwError } from 'rxjs'; import { defaultApp, deployedApps, nonDeployedApps } from '../mock/apps-list.mock'; import { AppsListComponent, APP_LIST_LAYOUT_GRID, APP_LIST_LAYOUT_LIST } from './apps-list.component'; diff --git a/lib/process-services/src/lib/app-list/apps-list.component.ts b/lib/process-services/src/lib/app-list/apps-list.component.ts index 6701c1716f..682e3c9801 100644 --- a/lib/process-services/src/lib/app-list/apps-list.component.ts +++ b/lib/process-services/src/lib/app-list/apps-list.component.ts @@ -16,7 +16,7 @@ */ import { CustomEmptyContentTemplateDirective, EmptyContentComponent } from '@alfresco/adf-core'; -import { AppsProcessService } from './services/apps-process.service'; +import { AppsProcessService } from '../services/apps-process.service'; import { AfterContentInit, Component, EventEmitter, Input, OnInit, Output, ContentChild, OnDestroy, ViewEncapsulation } from '@angular/core'; import { Subject } from 'rxjs'; import { IconModel } from './icon.model'; diff --git a/lib/process-services/src/lib/app-list/public-api.ts b/lib/process-services/src/lib/app-list/public-api.ts index cd78f66557..d95c359476 100644 --- a/lib/process-services/src/lib/app-list/public-api.ts +++ b/lib/process-services/src/lib/app-list/public-api.ts @@ -20,6 +20,6 @@ import { SelectAppsDialogComponent } from './select-apps-dialog/select-apps-dial export * from './apps-list.component'; export * from './select-apps-dialog/select-apps-dialog.component'; -export * from './services/apps-process.service'; +export * from '../services/apps-process.service'; export const APPS_LIST_DIRECTIVES = [AppsListComponent, SelectAppsDialogComponent] as const; diff --git a/lib/process-services/src/lib/app-list/select-apps-dialog/select-apps-dialog.component.spec.ts b/lib/process-services/src/lib/app-list/select-apps-dialog/select-apps-dialog.component.spec.ts index fb47501cb5..f8d2d0a57f 100644 --- a/lib/process-services/src/lib/app-list/select-apps-dialog/select-apps-dialog.component.spec.ts +++ b/lib/process-services/src/lib/app-list/select-apps-dialog/select-apps-dialog.component.spec.ts @@ -19,7 +19,7 @@ import { Component } from '@angular/core'; import { TestBed, ComponentFixture } from '@angular/core/testing'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { OverlayContainer } from '@angular/cdk/overlay'; -import { AppsProcessService } from '../services/apps-process.service'; +import { AppsProcessService } from '../../services/apps-process.service'; import { deployedApps } from '../../mock/apps-list.mock'; import { of } from 'rxjs'; import { SelectAppsDialogComponent } from './select-apps-dialog.component'; diff --git a/lib/process-services/src/lib/app-list/select-apps-dialog/select-apps-dialog.component.ts b/lib/process-services/src/lib/app-list/select-apps-dialog/select-apps-dialog.component.ts index dfe18e88e6..4e967d7fb2 100644 --- a/lib/process-services/src/lib/app-list/select-apps-dialog/select-apps-dialog.component.ts +++ b/lib/process-services/src/lib/app-list/select-apps-dialog/select-apps-dialog.component.ts @@ -17,7 +17,7 @@ import { Component, Inject, ViewEncapsulation } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; -import { AppsProcessService } from '../services/apps-process.service'; +import { AppsProcessService } from '../../services/apps-process.service'; import { CommonModule } from '@angular/common'; import { TranslateModule } from '@ngx-translate/core'; import { MatSelectModule } from '@angular/material/select'; diff --git a/lib/process-services/src/lib/compat/types.ts b/lib/process-services/src/lib/compat/types.ts index eaa8bc5fcb..fbe9e77e5a 100644 --- a/lib/process-services/src/lib/compat/types.ts +++ b/lib/process-services/src/lib/compat/types.ts @@ -20,7 +20,6 @@ import { LightUserRepresentation, ProcessInstanceRepresentation, RestVariable, - TaskRepresentation, UserRepresentation, UserTaskFilterRepresentation } from '@alfresco/js-api'; @@ -45,8 +44,3 @@ export type UserProcessModel = LightUserRepresentation; /** @deprecated use js-api/RestVariable instead */ export type ProcessInstanceVariable = RestVariable; - -/** @deprecated use js-api/TaskRepresentation instead */ -export type TaskDetailsModel = TaskRepresentation; - -export { ProcessDefinitionRepresentation } from '@alfresco/js-api'; diff --git a/lib/process-services/src/lib/form/form-custom-outcomes.component.ts b/lib/process-services/src/lib/form/form-custom-outcomes.component.ts index 49f0fe7542..c1fdac0c7a 100644 --- a/lib/process-services/src/lib/form/form-custom-outcomes.component.ts +++ b/lib/process-services/src/lib/form/form-custom-outcomes.component.ts @@ -19,6 +19,7 @@ import { Component } from '@angular/core'; @Component({ selector: 'adf-form-custom-outcomes', + standalone: true, template: '' }) export class FormCustomOutcomesComponent {} diff --git a/lib/process-services/src/lib/form/form-list/form-list.component.spec.ts b/lib/process-services/src/lib/form/form-list/form-list.component.spec.ts index 7cf82ead8b..ef4dd32782 100644 --- a/lib/process-services/src/lib/form/form-list/form-list.component.spec.ts +++ b/lib/process-services/src/lib/form/form-list/form-list.component.spec.ts @@ -22,7 +22,6 @@ import { FormListComponent } from './form-list.component'; import { ModelService } from '../services/model.service'; describe('TaskAttachmentList', () => { - let component: FormListComponent; let fixture: ComponentFixture; let modelService: ModelService; @@ -30,9 +29,7 @@ describe('TaskAttachmentList', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ - CoreTestingModule - ] + imports: [CoreTestingModule, FormListComponent] }); fixture = TestBed.createComponent(FormListComponent); component = fixture.componentInstance; @@ -41,10 +38,12 @@ describe('TaskAttachmentList', () => { }); it('should show the forms as a list', async () => { - spyOn(modelService, 'getForms').and.returnValue(of([ - {name: 'FakeName-1', lastUpdatedByFullName: 'FakeUser-1', lastUpdated: '2017-01-02'}, - {name: 'FakeName-2', lastUpdatedByFullName: 'FakeUser-2', lastUpdated: '2017-01-03'} - ])); + spyOn(modelService, 'getForms').and.returnValue( + of([ + { name: 'FakeName-1', lastUpdatedByFullName: 'FakeUser-1', lastUpdated: '2017-01-02' }, + { name: 'FakeName-2', lastUpdatedByFullName: 'FakeUser-2', lastUpdated: '2017-01-03' } + ]) + ); component.ngOnChanges(); diff --git a/lib/process-services/src/lib/form/form-list/form-list.component.ts b/lib/process-services/src/lib/form/form-list/form-list.component.ts index 3c6e14371c..ca88fb458e 100644 --- a/lib/process-services/src/lib/form/form-list/form-list.component.ts +++ b/lib/process-services/src/lib/form/form-list/form-list.component.ts @@ -17,20 +17,22 @@ import { Component, Input, OnChanges, ViewEncapsulation } from '@angular/core'; import { ModelService } from '../services/model.service'; +import { CommonModule } from '@angular/common'; +import { DataTableModule } from '@alfresco/adf-core'; @Component({ selector: 'adf-form-list', + standalone: true, + imports: [CommonModule, DataTableModule], templateUrl: './form-list.component.html', encapsulation: ViewEncapsulation.None }) export class FormListComponent implements OnChanges { - /** The array that contains the information to show inside the list. */ @Input() - forms: any [] = []; + forms: any[] = []; - constructor(protected modelService: ModelService) { - } + constructor(protected modelService: ModelService) {} ngOnChanges() { this.getForms(); @@ -45,5 +47,4 @@ export class FormListComponent implements OnChanges { this.forms.push(...forms); }); } - } diff --git a/lib/process-services/src/lib/form/form.component.ts b/lib/process-services/src/lib/form/form.component.ts index 8c010cd0c6..9ca3388f7f 100644 --- a/lib/process-services/src/lib/form/form.component.ts +++ b/lib/process-services/src/lib/form/form.component.ts @@ -28,7 +28,9 @@ import { FormOutcomeEvent, FormValues, ContentLinkModel, - TaskProcessVariableModel + TaskProcessVariableModel, + FormRendererComponent, + FormatSpacePipe } from '@alfresco/adf-core'; import { from, Observable, of, Subject } from 'rxjs'; import { switchMap, takeUntil } from 'rxjs/operators'; @@ -39,9 +41,17 @@ import { TaskService } from './services/task.service'; import { TaskFormService } from './services/task-form.service'; import { NodesApiService } from '@alfresco/adf-content-services'; import { FormDefinitionModel } from './model/form-definition.model'; +import { CommonModule } from '@angular/common'; +import { MatCardModule } from '@angular/material/card'; +import { MatButtonModule } from '@angular/material/button'; +import { MatIconModule } from '@angular/material/icon'; +import { MatTooltipModule } from '@angular/material/tooltip'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'adf-form', + standalone: true, + imports: [CommonModule, MatCardModule, MatButtonModule, MatIconModule, MatTooltipModule, TranslateModule, FormRendererComponent, FormatSpacePipe], templateUrl: './form.component.html', encapsulation: ViewEncapsulation.None }) diff --git a/lib/process-services/src/lib/form/form.module.ts b/lib/process-services/src/lib/form/form.module.ts deleted file mode 100644 index 24d42f568f..0000000000 --- a/lib/process-services/src/lib/form/form.module.ts +++ /dev/null @@ -1,67 +0,0 @@ -/*! - * @license - * Copyright © 2005-2024 Hyland Software, Inc. and its affiliates. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { NgModule } from '@angular/core'; -import { MaterialModule } from '../material.module'; -import { CoreModule, FormatSpacePipe, InitialUsernamePipe } from '@alfresco/adf-core'; -import { FormComponent } from './form.component'; -import { StartFormComponent } from './start-form.component'; -import { FormCustomOutcomesComponent } from './form-custom-outcomes.component'; -import { DocumentWidgetComponent } from './widgets/document/document.widget'; -import { ContentWidgetComponent } from './widgets/document/content.widget'; -import { UploadWidgetComponent } from './widgets/upload/upload.widget'; -import { FormListComponent } from './form-list/form-list.component'; -import { FunctionalGroupWidgetComponent } from './widgets/functional-group/functional-group.widget'; -import { PeopleWidgetComponent } from './widgets/people/people.widget'; -import { RadioButtonsWidgetComponent } from './widgets/radio-buttons/radio-buttons.widget'; -import { TypeaheadWidgetComponent } from './widgets/typeahead/typeahead.widget'; -import { DropdownWidgetComponent } from './widgets/dropdown/dropdown.widget'; -import { DynamicTableModule } from './widgets/dynamic-table/dynamic-table.module'; -import { FileViewerWidgetComponent } from './widgets/file-viewer/file-viewer.widget'; -import { AlfrescoViewerModule } from '@alfresco/adf-content-services'; - -@NgModule({ - imports: [DynamicTableModule, CoreModule, AlfrescoViewerModule, MaterialModule, FormatSpacePipe, InitialUsernamePipe], - declarations: [ - UploadWidgetComponent, - FormComponent, - StartFormComponent, - FormCustomOutcomesComponent, - DocumentWidgetComponent, - ContentWidgetComponent, - PeopleWidgetComponent, - FunctionalGroupWidgetComponent, - FormListComponent, - RadioButtonsWidgetComponent, - DropdownWidgetComponent, - TypeaheadWidgetComponent, - FileViewerWidgetComponent - ], - exports: [ - FormComponent, - StartFormComponent, - FormCustomOutcomesComponent, - PeopleWidgetComponent, - FunctionalGroupWidgetComponent, - RadioButtonsWidgetComponent, - TypeaheadWidgetComponent, - DropdownWidgetComponent, - FormListComponent, - FileViewerWidgetComponent - ] -}) -export class FormModule {} diff --git a/lib/process-services/src/lib/form/public-api.ts b/lib/process-services/src/lib/form/public-api.ts index adbb911d96..76b2f90e4f 100644 --- a/lib/process-services/src/lib/form/public-api.ts +++ b/lib/process-services/src/lib/form/public-api.ts @@ -15,18 +15,20 @@ * limitations under the License. */ -export * from './widgets/index'; -export * from './services'; - -export * from './process-form-rendering.service'; +import { FormListComponent } from './form-list/form-list.component'; +import { FormCustomOutcomesComponent } from './form-custom-outcomes.component'; +import { StartFormComponent } from './start-form/start-form.component'; +import { WIDGET_DIRECTIVES } from './widgets'; +import { FormComponent } from './form.component'; export * from './events/validate-dynamic-table-row.event'; - -export * from './model/form-definition.model'; - export * from './form-list/form-list.component'; +export * from './model/form-definition.model'; +export * from './services'; +export * from './start-form/start-form.component'; +export * from './widgets/public-api'; export * from './form.component'; -export * from './start-form.component'; export * from './form-custom-outcomes.component'; +export * from './process-form-rendering.service'; -export * from './form.module'; +export const FORM_DIRECTIVES = [FormListComponent, FormCustomOutcomesComponent, StartFormComponent, FormComponent, ...WIDGET_DIRECTIVES]; diff --git a/lib/process-services/src/lib/form/services/editor.service.ts b/lib/process-services/src/lib/form/services/editor.service.ts index 890f8107db..5aea1642c3 100644 --- a/lib/process-services/src/lib/form/services/editor.service.ts +++ b/lib/process-services/src/lib/form/services/editor.service.ts @@ -18,7 +18,7 @@ import { AlfrescoApiService } from '@alfresco/adf-core'; import { Injectable } from '@angular/core'; import { Observable, from, throwError } from 'rxjs'; -import { FormModelsApi } from '@alfresco/js-api'; +import { FormModelsApi, FormRepresentation } from '@alfresco/js-api'; import { catchError, map } from 'rxjs/operators'; import { FormDefinitionModel } from '../model/form-definition.model'; @@ -44,7 +44,7 @@ export class EditorService { * @param formModel Model data for the form * @returns Data for the saved form */ - saveForm(formId: number, formModel: FormDefinitionModel): Observable { + saveForm(formId: number, formModel: FormDefinitionModel): Observable { return from(this.editorApi.saveForm(formId, formModel)); } diff --git a/lib/process-services/src/lib/form/start-form.component.html b/lib/process-services/src/lib/form/start-form/start-form.component.html similarity index 100% rename from lib/process-services/src/lib/form/start-form.component.html rename to lib/process-services/src/lib/form/start-form/start-form.component.html diff --git a/lib/process-services/src/lib/form/start-form.component.mock.ts b/lib/process-services/src/lib/form/start-form/start-form.component.mock.ts similarity index 100% rename from lib/process-services/src/lib/form/start-form.component.mock.ts rename to lib/process-services/src/lib/form/start-form/start-form.component.mock.ts diff --git a/lib/process-services/src/lib/form/start-form.component.scss b/lib/process-services/src/lib/form/start-form/start-form.component.scss similarity index 100% rename from lib/process-services/src/lib/form/start-form.component.scss rename to lib/process-services/src/lib/form/start-form/start-form.component.scss diff --git a/lib/process-services/src/lib/form/start-form.component.spec.ts b/lib/process-services/src/lib/form/start-form/start-form.component.spec.ts similarity index 99% rename from lib/process-services/src/lib/form/start-form.component.spec.ts rename to lib/process-services/src/lib/form/start-form/start-form.component.spec.ts index 5af7dc40a5..a6bef4f51f 100644 --- a/lib/process-services/src/lib/form/start-form.component.spec.ts +++ b/lib/process-services/src/lib/form/start-form/start-form.component.spec.ts @@ -35,8 +35,8 @@ import { import { StartFormComponent } from './start-form.component'; import { WidgetVisibilityService, FormModel, FormOutcomeModel } from '@alfresco/adf-core'; import { TranslateService } from '@ngx-translate/core'; -import { ProcessTestingModule } from '../testing/process.testing.module'; -import { ProcessService } from '../process-list/services/process.service'; +import { ProcessTestingModule } from '../../testing/process.testing.module'; +import { ProcessService } from '../../process-list/services/process.service'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatSelectHarness } from '@angular/material/select/testing'; diff --git a/lib/process-services/src/lib/form/start-form.component.ts b/lib/process-services/src/lib/form/start-form/start-form.component.ts similarity index 89% rename from lib/process-services/src/lib/form/start-form.component.ts rename to lib/process-services/src/lib/form/start-form/start-form.component.ts index e1099026b6..0acb308d01 100644 --- a/lib/process-services/src/lib/form/start-form.component.ts +++ b/lib/process-services/src/lib/form/start-form/start-form.component.ts @@ -29,12 +29,19 @@ import { OnDestroy, inject } from '@angular/core'; -import { FormComponent } from './form.component'; -import { ContentLinkModel, FormOutcomeModel } from '@alfresco/adf-core'; -import { ProcessService } from '../process-list/services/process.service'; +import { FormComponent } from '../form.component'; +import { ContentLinkModel, FormOutcomeModel, FormRendererComponent } from '@alfresco/adf-core'; +import { ProcessService } from '../../process-list/services/process.service'; +import { CommonModule } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatIconModule } from '@angular/material/icon'; @Component({ selector: 'adf-start-form', + standalone: true, + imports: [CommonModule, TranslateModule, MatButtonModule, MatCardModule, FormRendererComponent, MatIconModule], templateUrl: './start-form.component.html', styleUrls: ['./start-form.component.scss'], encapsulation: ViewEncapsulation.None diff --git a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.spec.ts b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.spec.ts index 7f33ed10e1..45761ae380 100644 --- a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.spec.ts +++ b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.spec.ts @@ -51,7 +51,7 @@ describe('AttachFileWidgetDialogComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentModule.forRoot(), ProcessTestingModule], + imports: [ContentModule.forRoot(), ProcessTestingModule, AttachFileWidgetDialogComponent], providers: [ { provide: OidcAuthenticationService, useValue: {} }, { provide: MAT_DIALOG_DATA, useValue: data }, diff --git a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.ts b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.ts index 2a61ca576a..a108ca3c1e 100644 --- a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.ts +++ b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.ts @@ -16,15 +16,20 @@ */ import { Component, Inject, ViewEncapsulation, ViewChild } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { AlfrescoApiService, LoginDialogPanelComponent, TranslationService, AuthenticationService } from '@alfresco/adf-core'; import { AttachFileWidgetDialogComponentData } from './attach-file-widget-dialog-component.interface'; -import { DocumentListService, SitesService, SearchService } from '@alfresco/adf-content-services'; +import { DocumentListService, SitesService, SearchService, ContentNodeSelectorModule } from '@alfresco/adf-content-services'; import { ExternalAlfrescoApiService } from '../../services/external-alfresco-api.service'; import { Node } from '@alfresco/js-api'; +import { CommonModule } from '@angular/common'; +import { MatButtonModule } from '@angular/material/button'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'adf-attach-file-widget-dialog', + standalone: true, + imports: [CommonModule, MatDialogModule, LoginDialogPanelComponent, ContentNodeSelectorModule, MatButtonModule, TranslateModule], templateUrl: './attach-file-widget-dialog.component.html', styleUrls: ['./attach-file-widget-dialog.component.scss'], encapsulation: ViewEncapsulation.None, diff --git a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget.component.ts b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget.component.ts index a06a1bc942..7fff3594c3 100644 --- a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget.component.ts +++ b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget.component.ts @@ -18,7 +18,7 @@ /* eslint-disable @angular-eslint/component-selector */ import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; -import { AppConfigService, AppConfigValues, DownloadService, FormService, ThumbnailService } from '@alfresco/adf-core'; +import { AppConfigService, AppConfigValues, DownloadService, ErrorWidgetComponent, FormService, ThumbnailService } from '@alfresco/adf-core'; import { ContentNodeDialogService, ContentService } from '@alfresco/adf-content-services'; import { AlfrescoEndpointRepresentation, Node, NodeChildAssociation, RelatedContentRepresentation } from '@alfresco/js-api'; import { from, of, Subject, zip } from 'rxjs'; @@ -27,9 +27,18 @@ import { AttachFileWidgetDialogService } from './attach-file-widget-dialog.servi import { UploadWidgetComponent } from '../upload/upload.widget'; import { ProcessContentService } from '../../services/process-content.service'; import { ActivitiContentService } from '../../services/activiti-alfresco.service'; +import { CommonModule } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatIconModule } from '@angular/material/icon'; +import { MatButtonModule } from '@angular/material/button'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatListModule } from '@angular/material/list'; +import { MatTooltipModule } from '@angular/material/tooltip'; @Component({ selector: 'attach-widget', + standalone: true, + imports: [CommonModule, TranslateModule, MatIconModule, MatButtonModule, MatMenuModule, MatListModule, MatTooltipModule, ErrorWidgetComponent], templateUrl: './attach-file-widget.component.html', styleUrls: ['./attach-file-widget.component.scss'], host: { diff --git a/lib/process-services/src/lib/form/widgets/content-widget/attach-folder-widget.component.spec.ts b/lib/process-services/src/lib/form/widgets/content-widget/attach-folder-widget.component.spec.ts index e9e7983b29..d96d97712d 100644 --- a/lib/process-services/src/lib/form/widgets/content-widget/attach-folder-widget.component.spec.ts +++ b/lib/process-services/src/lib/form/widgets/content-widget/attach-folder-widget.component.spec.ts @@ -49,7 +49,7 @@ describe('AttachFolderWidgetComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ProcessTestingModule] + imports: [ProcessTestingModule, AttachFolderWidgetComponent] }); fixture = TestBed.createComponent(AttachFolderWidgetComponent); widget = fixture.componentInstance; diff --git a/lib/process-services/src/lib/form/widgets/content-widget/attach-folder-widget.component.ts b/lib/process-services/src/lib/form/widgets/content-widget/attach-folder-widget.component.ts index d251eddf64..f50eb600cd 100644 --- a/lib/process-services/src/lib/form/widgets/content-widget/attach-folder-widget.component.ts +++ b/lib/process-services/src/lib/form/widgets/content-widget/attach-folder-widget.component.ts @@ -18,12 +18,19 @@ /* eslint-disable @angular-eslint/component-selector */ import { Component, ViewEncapsulation, OnInit } from '@angular/core'; -import { WidgetComponent, FormService } from '@alfresco/adf-core'; +import { WidgetComponent, FormService, ErrorWidgetComponent } from '@alfresco/adf-core'; import { ContentNodeDialogService, NodesApiService } from '@alfresco/adf-content-services'; import { Node } from '@alfresco/js-api'; +import { CommonModule } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatIconModule } from '@angular/material/icon'; +import { MatLineModule } from '@angular/material/core'; +import { MatButtonModule } from '@angular/material/button'; @Component({ selector: 'attach-folder-widget', + standalone: true, + imports: [CommonModule, TranslateModule, MatIconModule, MatLineModule, MatButtonModule, ErrorWidgetComponent], templateUrl: './attach-folder-widget.component.html', styleUrls: ['./attach-folder-widget.component.scss'], host: { diff --git a/lib/process-services/src/lib/form/widgets/content-widget/content-widget.module.ts b/lib/process-services/src/lib/form/widgets/content-widget/content-widget.module.ts deleted file mode 100644 index e87339c8b8..0000000000 --- a/lib/process-services/src/lib/form/widgets/content-widget/content-widget.module.ts +++ /dev/null @@ -1,44 +0,0 @@ -/*! - * @license - * Copyright © 2005-2024 Hyland Software, Inc. and its affiliates. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { NgModule } from '@angular/core'; -import { MaterialModule } from '../../../material.module'; -import { CoreModule } from '@alfresco/adf-core'; -import { ContentNodeSelectorModule } from '@alfresco/adf-content-services'; - -import { AttachFileWidgetComponent } from './attach-file-widget.component'; -import { AttachFolderWidgetComponent } from './attach-folder-widget.component'; -import { AttachFileWidgetDialogComponent } from './attach-file-widget-dialog.component'; - -@NgModule({ - imports: [ - CoreModule, - ContentNodeSelectorModule, - MaterialModule - ], - declarations: [ - AttachFileWidgetComponent, - AttachFolderWidgetComponent, - AttachFileWidgetDialogComponent - ], - exports: [ - AttachFileWidgetComponent, - AttachFolderWidgetComponent, - AttachFileWidgetDialogComponent - ] -}) -export class ContentWidgetModule {} diff --git a/lib/process-services/src/lib/form/widgets/content-widget/public-api.ts b/lib/process-services/src/lib/form/widgets/content-widget/public-api.ts index 1545300a27..31d03ced13 100644 --- a/lib/process-services/src/lib/form/widgets/content-widget/public-api.ts +++ b/lib/process-services/src/lib/form/widgets/content-widget/public-api.ts @@ -20,5 +20,3 @@ export * from './attach-folder-widget.component'; export * from './attach-file-widget-dialog-component.interface'; export * from './attach-file-widget-dialog.component'; export * from './attach-file-widget-dialog.service'; - -export * from './content-widget.module'; diff --git a/lib/process-services/src/lib/form/widgets/document/content.widget.spec.ts b/lib/process-services/src/lib/form/widgets/document/content.widget.spec.ts index f36aa4926d..f188e99d51 100644 --- a/lib/process-services/src/lib/form/widgets/document/content.widget.spec.ts +++ b/lib/process-services/src/lib/form/widgets/document/content.widget.spec.ts @@ -59,7 +59,7 @@ describe('ContentWidgetComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [CoreTestingModule] + imports: [CoreTestingModule, ContentWidgetComponent] }); downloadService = TestBed.inject(DownloadService); processContentService = TestBed.inject(ProcessContentService); diff --git a/lib/process-services/src/lib/form/widgets/document/content.widget.ts b/lib/process-services/src/lib/form/widgets/document/content.widget.ts index 892f4ca3ae..9e017e805a 100644 --- a/lib/process-services/src/lib/form/widgets/document/content.widget.ts +++ b/lib/process-services/src/lib/form/widgets/document/content.widget.ts @@ -19,9 +19,16 @@ import { UrlService, ContentLinkModel, FormService, DownloadService } from '@alf import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges, ViewEncapsulation } from '@angular/core'; import { Observable } from 'rxjs'; import { ProcessContentService } from '../../services/process-content.service'; +import { CommonModule } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatCardModule } from '@angular/material/card'; +import { MatIconModule } from '@angular/material/icon'; +import { MatButtonModule } from '@angular/material/button'; @Component({ selector: 'adf-content', + standalone: true, + imports: [CommonModule, TranslateModule, MatCardModule, MatIconModule, MatButtonModule], templateUrl: './content.widget.html', styleUrls: ['./content.widget.scss'], encapsulation: ViewEncapsulation.None diff --git a/lib/process-services/src/lib/form/widgets/document/document.widget.ts b/lib/process-services/src/lib/form/widgets/document/document.widget.ts index 77bd1df43b..1c432f5f74 100644 --- a/lib/process-services/src/lib/form/widgets/document/document.widget.ts +++ b/lib/process-services/src/lib/form/widgets/document/document.widget.ts @@ -17,9 +17,13 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { FormService, WidgetComponent } from '@alfresco/adf-core'; +import { CommonModule } from '@angular/common'; +import { ContentWidgetComponent } from './content.widget'; @Component({ selector: 'adf-form-document-widget', + standalone: true, + imports: [CommonModule, ContentWidgetComponent], templateUrl: './document.widget.html', host: { '(click)': 'event($event)', @@ -35,7 +39,6 @@ import { FormService, WidgetComponent } from '@alfresco/adf-core'; encapsulation: ViewEncapsulation.None }) export class DocumentWidgetComponent extends WidgetComponent implements OnInit { - fileId: string = null; hasFile: boolean = false; diff --git a/lib/process-services/src/lib/form/widgets/dropdown/dropdown.widget.spec.ts b/lib/process-services/src/lib/form/widgets/dropdown/dropdown.widget.spec.ts index 02efa02984..08047fa2cf 100644 --- a/lib/process-services/src/lib/form/widgets/dropdown/dropdown.widget.spec.ts +++ b/lib/process-services/src/lib/form/widgets/dropdown/dropdown.widget.spec.ts @@ -42,7 +42,7 @@ describe('DropdownWidgetComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [CoreTestingModule] + imports: [CoreTestingModule, DropdownWidgetComponent] }); fixture = TestBed.createComponent(DropdownWidgetComponent); widget = fixture.componentInstance; diff --git a/lib/process-services/src/lib/form/widgets/dropdown/dropdown.widget.ts b/lib/process-services/src/lib/form/widgets/dropdown/dropdown.widget.ts index 6f7ded746e..47d578dbbb 100644 --- a/lib/process-services/src/lib/form/widgets/dropdown/dropdown.widget.ts +++ b/lib/process-services/src/lib/form/widgets/dropdown/dropdown.widget.ts @@ -18,12 +18,19 @@ /* eslint-disable @angular-eslint/component-selector */ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; -import { FormService, FormFieldOption, WidgetComponent } from '@alfresco/adf-core'; +import { FormService, FormFieldOption, WidgetComponent, ErrorWidgetComponent } from '@alfresco/adf-core'; import { ProcessDefinitionService } from '../../services/process-definition.service'; import { TaskFormService } from '../../services/task-form.service'; +import { CommonModule } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatSelectModule } from '@angular/material/select'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'dropdown-widget', + standalone: true, + imports: [CommonModule, TranslateModule, MatFormFieldModule, MatSelectModule, FormsModule, ErrorWidgetComponent], templateUrl: './dropdown.widget.html', styleUrls: ['./dropdown.widget.scss'], host: { diff --git a/lib/process-services/src/lib/form/widgets/dynamic-table/dynamic-table.module.ts b/lib/process-services/src/lib/form/widgets/dynamic-table/dynamic-table.module.ts deleted file mode 100644 index acb87d7842..0000000000 --- a/lib/process-services/src/lib/form/widgets/dynamic-table/dynamic-table.module.ts +++ /dev/null @@ -1,51 +0,0 @@ -/*! - * @license - * Copyright © 2005-2024 Hyland Software, Inc. and its affiliates. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { NgModule } from '@angular/core'; -import { MaterialModule } from '../../../material.module'; -import { CoreModule } from '@alfresco/adf-core'; -import { RowEditorComponent } from './editors/row-editor/row.editor'; -import { DynamicTableWidgetComponent } from './dynamic-table.widget'; -import { DropdownEditorComponent } from './editors/dropdown/dropdown.editor'; -import { DateTimeEditorComponent } from './editors/datetime/datetime.editor'; -import { DateEditorComponent } from './editors/date/date.editor'; -import { BooleanEditorComponent } from './editors/boolean/boolean.editor'; -import { AmountEditorComponent } from './editors/amount/amount.editor'; -import { TextEditorComponent } from './editors/text/text.editor'; - -@NgModule({ - imports: [ - CoreModule, - MaterialModule - ], - declarations: [ - AmountEditorComponent, - BooleanEditorComponent, - DateEditorComponent, - DateTimeEditorComponent, - DropdownEditorComponent, - RowEditorComponent, - DynamicTableWidgetComponent, - TextEditorComponent - ], - exports: [ - DynamicTableWidgetComponent, - RowEditorComponent - ] -}) -export class DynamicTableModule { -} diff --git a/lib/process-services/src/lib/form/widgets/dynamic-table/dynamic-table.widget.ts b/lib/process-services/src/lib/form/widgets/dynamic-table/dynamic-table.widget.ts index ae8cd8fc1e..ce7964c095 100644 --- a/lib/process-services/src/lib/form/widgets/dynamic-table/dynamic-table.widget.ts +++ b/lib/process-services/src/lib/form/widgets/dynamic-table/dynamic-table.widget.ts @@ -17,14 +17,22 @@ /* eslint-disable @angular-eslint/component-selector */ -import { WidgetVisibilityService, WidgetComponent, FormService } from '@alfresco/adf-core'; +import { WidgetVisibilityService, WidgetComponent, FormService, ErrorWidgetComponent } from '@alfresco/adf-core'; import { ChangeDetectorRef, Component, ElementRef, OnInit, ViewEncapsulation } from '@angular/core'; import { DynamicTableColumn } from './editors/models/dynamic-table-column.model'; import { DynamicTableRow } from './editors/models/dynamic-table-row.model'; import { DynamicTableModel } from './editors/models/dynamic-table.widget.model'; +import { CommonModule } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatButtonModule } from '@angular/material/button'; +import { MatIconModule } from '@angular/material/icon'; +import { RowEditorComponent } from './editors/row-editor/row.editor'; @Component({ selector: 'dynamic-table-widget', + standalone: true, + imports: [CommonModule, TranslateModule, MatCheckboxModule, MatButtonModule, MatIconModule, RowEditorComponent, ErrorWidgetComponent], templateUrl: './dynamic-table.widget.html', styleUrls: ['./dynamic-table.widget.scss'], host: { diff --git a/lib/process-services/src/lib/form/widgets/dynamic-table/editors/amount/amount.editor.ts b/lib/process-services/src/lib/form/widgets/dynamic-table/editors/amount/amount.editor.ts index e6c16daa0c..bb238dcb87 100644 --- a/lib/process-services/src/lib/form/widgets/dynamic-table/editors/amount/amount.editor.ts +++ b/lib/process-services/src/lib/form/widgets/dynamic-table/editors/amount/amount.editor.ts @@ -21,14 +21,18 @@ import { Component, Input, OnInit } from '@angular/core'; import { DynamicTableColumn } from '../models/dynamic-table-column.model'; import { DynamicTableRow } from '../models/dynamic-table-row.model'; import { DynamicTableModel } from '../models/dynamic-table.widget.model'; +import { CommonModule } from '@angular/common'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; @Component({ selector: 'adf-amount-editor', + standalone: true, + imports: [CommonModule, MatFormFieldModule, MatInputModule], templateUrl: './amount.editor.html', styleUrls: ['./amount.editor.scss'] }) export class AmountEditorComponent implements OnInit { - @Input() table: DynamicTableModel; @@ -48,5 +52,4 @@ export class AmountEditorComponent implements OnInit { const value: number = Number(event.target.value); row.value[column.id] = value; } - } diff --git a/lib/process-services/src/lib/form/widgets/dynamic-table/editors/boolean/boolean.editor.ts b/lib/process-services/src/lib/form/widgets/dynamic-table/editors/boolean/boolean.editor.ts index 3543c4afd1..1cd1d3bdf9 100644 --- a/lib/process-services/src/lib/form/widgets/dynamic-table/editors/boolean/boolean.editor.ts +++ b/lib/process-services/src/lib/form/widgets/dynamic-table/editors/boolean/boolean.editor.ts @@ -21,14 +21,17 @@ import { Component, Input } from '@angular/core'; import { DynamicTableColumn } from '../models/dynamic-table-column.model'; import { DynamicTableRow } from '../models/dynamic-table-row.model'; import { DynamicTableModel } from '../models/dynamic-table.widget.model'; +import { CommonModule } from '@angular/common'; +import { MatCheckboxModule } from '@angular/material/checkbox'; @Component({ selector: 'adf-boolean-editor', + standalone: true, + imports: [CommonModule, MatCheckboxModule], templateUrl: './boolean.editor.html', styleUrls: ['./boolean.editor.scss'] }) export class BooleanEditorComponent { - @Input() table: DynamicTableModel; @@ -42,5 +45,4 @@ export class BooleanEditorComponent { const value: boolean = event.checked; row.value[column.id] = value; } - } diff --git a/lib/process-services/src/lib/form/widgets/dynamic-table/editors/date/date.editor.ts b/lib/process-services/src/lib/form/widgets/dynamic-table/editors/date/date.editor.ts index e4b082fdc7..0ece3b80a3 100644 --- a/lib/process-services/src/lib/form/widgets/dynamic-table/editors/date/date.editor.ts +++ b/lib/process-services/src/lib/form/widgets/dynamic-table/editors/date/date.editor.ts @@ -15,17 +15,23 @@ * limitations under the License. */ -import { ADF_DATE_FORMATS, AdfDateFnsAdapter, DateFnsUtils } from '@alfresco/adf-core'; +import { ADF_DATE_FORMATS, AdfDateFnsAdapter, DateFnsUtils } from '@alfresco/adf-core'; import { Component, Input, OnInit } from '@angular/core'; import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material/core'; -import { MatDatepickerInputEvent } from '@angular/material/datepicker'; +import { MatDatepickerInputEvent, MatDatepickerModule } from '@angular/material/datepicker'; import { DynamicTableColumn } from '../models/dynamic-table-column.model'; import { DynamicTableRow } from '../models/dynamic-table-row.model'; import { DynamicTableModel } from '../models/dynamic-table.widget.model'; import { isValid } from 'date-fns'; +import { CommonModule } from '@angular/common'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'adf-date-editor', + standalone: true, + imports: [CommonModule, MatFormFieldModule, MatDatepickerModule, MatInputModule, FormsModule], templateUrl: './date.editor.html', providers: [ { provide: MAT_DATE_FORMATS, useValue: ADF_DATE_FORMATS }, @@ -73,7 +79,7 @@ export class DateEditorComponent implements OnInit { } else if (newDateValue?.value) { this.row.value[this.column.id] = `${DateFnsUtils.formatDate(newDateValue?.value, 'yyyy-MM-dd')}T00:00:00.000Z`; this.table.flushValue(); - } else { + } else { this.row.value[this.column.id] = ''; } } diff --git a/lib/process-services/src/lib/form/widgets/dynamic-table/editors/datetime/datetime.editor.ts b/lib/process-services/src/lib/form/widgets/dynamic-table/editors/datetime/datetime.editor.ts index 5e22efe9bd..a62c6dbbda 100644 --- a/lib/process-services/src/lib/form/widgets/dynamic-table/editors/datetime/datetime.editor.ts +++ b/lib/process-services/src/lib/form/widgets/dynamic-table/editors/datetime/datetime.editor.ts @@ -15,17 +15,28 @@ * limitations under the License. */ -import { ADF_DATETIME_FORMATS, ADF_DATE_FORMATS, AdfDateFnsAdapter, AdfDateTimeFnsAdapter, /*MOMENT_DATE_FORMATS, MomentDateAdapter*/ -DateFnsUtils} from '@alfresco/adf-core'; +import { + ADF_DATETIME_FORMATS, + ADF_DATE_FORMATS, + AdfDateFnsAdapter, + AdfDateTimeFnsAdapter /*MOMENT_DATE_FORMATS, MomentDateAdapter*/, + DateFnsUtils +} from '@alfresco/adf-core'; import { Component, Input, OnInit } from '@angular/core'; import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material/core'; import { DynamicTableColumn } from '../models/dynamic-table-column.model'; import { DynamicTableRow } from '../models/dynamic-table-row.model'; import { DynamicTableModel } from '../models/dynamic-table.widget.model'; -import { DatetimeAdapter, MAT_DATETIME_FORMATS, MatDatetimepickerInputEvent } from '@mat-datetimepicker/core'; +import { DatetimeAdapter, MAT_DATETIME_FORMATS, MatDatetimepickerInputEvent, MatDatetimepickerModule } from '@mat-datetimepicker/core'; +import { CommonModule } from '@angular/common'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'adf-datetime-editor', + standalone: true, + imports: [CommonModule, MatFormFieldModule, MatInputModule, MatDatetimepickerModule, FormsModule], templateUrl: './datetime.editor.html', providers: [ { provide: MAT_DATE_FORMATS, useValue: ADF_DATE_FORMATS }, diff --git a/lib/process-services/src/lib/form/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts b/lib/process-services/src/lib/form/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts index 5bf444bd48..e2d087607a 100644 --- a/lib/process-services/src/lib/form/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts +++ b/lib/process-services/src/lib/form/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts @@ -26,12 +26,8 @@ import { DropdownEditorComponent } from './dropdown.editor'; import { TaskFormService } from '../../../../services/task-form.service'; import { ProcessDefinitionService } from '../../../../services/process-definition.service'; import { MatSelectHarness } from '@angular/material/select/testing'; -import { FormModule } from '../../../../form.module'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatSelectModule } from '@angular/material/select'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatOptionModule } from '@angular/material/core'; import { ProcessTestingModule } from '../../../../../testing/process.testing.module'; describe('DropdownEditorComponent', () => { @@ -48,7 +44,7 @@ describe('DropdownEditorComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ProcessTestingModule, MatFormFieldModule, MatSelectModule, MatOptionModule, FormModule] + imports: [ProcessTestingModule, DropdownEditorComponent] }); formService = TestBed.inject(FormService); taskFormService = TestBed.inject(TaskFormService); diff --git a/lib/process-services/src/lib/form/widgets/dynamic-table/editors/dropdown/dropdown.editor.ts b/lib/process-services/src/lib/form/widgets/dynamic-table/editors/dropdown/dropdown.editor.ts index 8b72509f8e..2db1c4549c 100644 --- a/lib/process-services/src/lib/form/widgets/dynamic-table/editors/dropdown/dropdown.editor.ts +++ b/lib/process-services/src/lib/form/widgets/dynamic-table/editors/dropdown/dropdown.editor.ts @@ -25,9 +25,15 @@ import { DynamicTableRow } from '../models/dynamic-table-row.model'; import { DynamicTableModel } from '../models/dynamic-table.widget.model'; import { ProcessDefinitionService } from '../../../../services/process-definition.service'; import { TaskFormService } from '../../../../services/task-form.service'; +import { CommonModule } from '@angular/common'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatSelectModule } from '@angular/material/select'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'adf-dropdown-editor', + standalone: true, + imports: [CommonModule, MatFormFieldModule, MatSelectModule, FormsModule], templateUrl: './dropdown.editor.html', styleUrls: ['./dropdown.editor.scss'] }) diff --git a/lib/process-services/src/lib/form/widgets/dynamic-table/editors/row-editor/row.editor.ts b/lib/process-services/src/lib/form/widgets/dynamic-table/editors/row-editor/row.editor.ts index 65f4495bb7..2811081a24 100644 --- a/lib/process-services/src/lib/form/widgets/dynamic-table/editors/row-editor/row.editor.ts +++ b/lib/process-services/src/lib/form/widgets/dynamic-table/editors/row-editor/row.editor.ts @@ -22,9 +22,30 @@ import { DynamicRowValidationSummary } from '../models/dynamic-row-validation-su import { DynamicTableColumn } from '../models/dynamic-table-column.model'; import { DynamicTableRow } from '../models/dynamic-table-row.model'; import { DynamicTableModel } from '../models/dynamic-table.widget.model'; +import { CommonModule } from '@angular/common'; +import { DropdownEditorComponent } from '../dropdown/dropdown.editor'; +import { DateEditorComponent } from '../date/date.editor'; +import { DateTimeEditorComponent } from '../datetime/datetime.editor'; +import { BooleanEditorComponent } from '../boolean/boolean.editor'; +import { AmountEditorComponent } from '../amount/amount.editor'; +import { TextEditorComponent } from '../text/text.editor'; +import { ErrorWidgetComponent } from '@alfresco/adf-core'; +import { MatButtonModule } from '@angular/material/button'; @Component({ selector: 'row-editor', + standalone: true, + imports: [ + CommonModule, + DropdownEditorComponent, + DateEditorComponent, + DateTimeEditorComponent, + BooleanEditorComponent, + AmountEditorComponent, + TextEditorComponent, + ErrorWidgetComponent, + MatButtonModule + ], templateUrl: './row.editor.html', styleUrls: ['./row.editor.css'] }) diff --git a/lib/process-services/src/lib/form/widgets/dynamic-table/editors/text/text.editor.ts b/lib/process-services/src/lib/form/widgets/dynamic-table/editors/text/text.editor.ts index d10fc1d870..41162df5b7 100644 --- a/lib/process-services/src/lib/form/widgets/dynamic-table/editors/text/text.editor.ts +++ b/lib/process-services/src/lib/form/widgets/dynamic-table/editors/text/text.editor.ts @@ -21,14 +21,18 @@ import { Component, Input, OnInit } from '@angular/core'; import { DynamicTableColumn } from '../models/dynamic-table-column.model'; import { DynamicTableRow } from '../models/dynamic-table-row.model'; import { DynamicTableModel } from '../models/dynamic-table.widget.model'; +import { CommonModule } from '@angular/common'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; @Component({ selector: 'adf-text-editor', + standalone: true, + imports: [CommonModule, MatFormFieldModule, MatInputModule], templateUrl: './text.editor.html', styleUrls: ['./text.editor.scss'] }) export class TextEditorComponent implements OnInit { - @Input() table: DynamicTableModel; @@ -48,5 +52,4 @@ export class TextEditorComponent implements OnInit { const value: any = event.target.value; row.value[column.id] = value; } - } diff --git a/lib/process-services/src/lib/form/widgets/dynamic-table/public-api.ts b/lib/process-services/src/lib/form/widgets/dynamic-table/public-api.ts index 43b6700c3b..d09325408b 100644 --- a/lib/process-services/src/lib/form/widgets/dynamic-table/public-api.ts +++ b/lib/process-services/src/lib/form/widgets/dynamic-table/public-api.ts @@ -15,6 +15,15 @@ * limitations under the License. */ +import { DropdownEditorComponent } from './editors/dropdown/dropdown.editor'; +import { AmountEditorComponent } from './editors/amount/amount.editor'; +import { BooleanEditorComponent } from './editors/boolean/boolean.editor'; +import { DateEditorComponent } from './editors/date/date.editor'; +import { RowEditorComponent } from './editors/row-editor/row.editor'; +import { TextEditorComponent } from './editors/text/text.editor'; +import { DateTimeEditorComponent } from './editors/datetime/datetime.editor'; +import { DynamicTableWidgetComponent } from './dynamic-table.widget'; + export * from './editors/dropdown/dropdown.editor'; export * from './editors/amount/amount.editor'; export * from './editors/boolean/boolean.editor'; @@ -22,10 +31,16 @@ export * from './editors/date/date.editor'; export * from './editors/datetime/datetime.editor'; export * from './editors/row-editor/row.editor'; export * from './editors/text/text.editor'; - export * from './editors/models/dynamic-table-row.model'; - export * from './dynamic-table.widget'; - -export * from './dynamic-table.module'; +export const DYNAMIC_TABLE_WIDGET_DIRECTIVES = [ + DynamicTableWidgetComponent, + DropdownEditorComponent, + AmountEditorComponent, + BooleanEditorComponent, + DateEditorComponent, + DateTimeEditorComponent, + RowEditorComponent, + TextEditorComponent +] as const; diff --git a/lib/process-services/src/lib/form/widgets/file-viewer/file-viewer.widget.spec.ts b/lib/process-services/src/lib/form/widgets/file-viewer/file-viewer.widget.spec.ts index ba46a40265..5ab57cc959 100644 --- a/lib/process-services/src/lib/form/widgets/file-viewer/file-viewer.widget.spec.ts +++ b/lib/process-services/src/lib/form/widgets/file-viewer/file-viewer.widget.spec.ts @@ -18,7 +18,7 @@ import { FileViewerWidgetComponent } from './file-viewer.widget'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormModel, FormService, FormFieldModel } from '@alfresco/adf-core'; -import { TranslateModule } from '@ngx-translate/core'; +import { ProcessTestingModule } from '../../../testing/process.testing.module'; describe('FileViewerWidgetComponent', () => { const fakeForm = new FormModel(); @@ -43,12 +43,9 @@ describe('FileViewerWidgetComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ - TranslateModule.forRoot() - ], - declarations: [ FileViewerWidgetComponent ], - providers: [ { provide: FormService, useValue: formServiceStub } ] - }); + imports: [ProcessTestingModule, FileViewerWidgetComponent], + providers: [{ provide: FormService, useValue: formServiceStub }] + }); formServiceStub = TestBed.inject(FormService); fixture = TestBed.createComponent(FileViewerWidgetComponent); diff --git a/lib/process-services/src/lib/form/widgets/file-viewer/file-viewer.widget.ts b/lib/process-services/src/lib/form/widgets/file-viewer/file-viewer.widget.ts index 2005f3abab..be607b3bc1 100644 --- a/lib/process-services/src/lib/form/widgets/file-viewer/file-viewer.widget.ts +++ b/lib/process-services/src/lib/form/widgets/file-viewer/file-viewer.widget.ts @@ -15,13 +15,18 @@ * limitations under the License. */ -import { BaseViewerWidgetComponent, FormService } from '@alfresco/adf-core'; +import { BaseViewerWidgetComponent, ErrorWidgetComponent, FormService } from '@alfresco/adf-core'; import { Component, ViewEncapsulation } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; +import { AlfrescoViewerModule } from '@alfresco/adf-content-services'; /* eslint-disable @angular-eslint/component-selector */ @Component({ selector: 'file-viewer-widget', + standalone: true, + imports: [CommonModule, TranslateModule, AlfrescoViewerModule, ErrorWidgetComponent], templateUrl: './file-viewer.widget.html', styleUrls: ['./file-viewer.widget.scss'], host: { diff --git a/lib/process-services/src/lib/form/widgets/functional-group/functional-group.widget.ts b/lib/process-services/src/lib/form/widgets/functional-group/functional-group.widget.ts index fe478482e0..8d2f006b27 100644 --- a/lib/process-services/src/lib/form/widgets/functional-group/functional-group.widget.ts +++ b/lib/process-services/src/lib/form/widgets/functional-group/functional-group.widget.ts @@ -18,14 +18,21 @@ /* eslint-disable @angular-eslint/component-selector */ import { Component, ElementRef, OnInit, ViewEncapsulation } from '@angular/core'; -import { FormService, GroupModel, WidgetComponent } from '@alfresco/adf-core'; +import { ErrorWidgetComponent, FormService, GroupModel, WidgetComponent } from '@alfresco/adf-core'; import { catchError, debounceTime, filter, switchMap, tap } from 'rxjs/operators'; import { merge, of } from 'rxjs'; -import { UntypedFormControl } from '@angular/forms'; +import { ReactiveFormsModule, UntypedFormControl } from '@angular/forms'; import { PeopleProcessService } from '../../../common/services/people-process.service'; +import { CommonModule } from '@angular/common'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatInputModule } from '@angular/material/input'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; @Component({ selector: 'functional-group-widget', + standalone: true, + imports: [CommonModule, MatFormFieldModule, TranslateModule, MatInputModule, ReactiveFormsModule, MatAutocompleteModule, ErrorWidgetComponent], templateUrl: './functional-group.widget.html', styleUrls: ['./functional-group.widget.scss'], host: { diff --git a/lib/process-services/src/lib/form/widgets/people/people.widget.ts b/lib/process-services/src/lib/form/widgets/people/people.widget.ts index 8015a164d4..5bc9802ed2 100644 --- a/lib/process-services/src/lib/form/widgets/people/people.widget.ts +++ b/lib/process-services/src/lib/form/widgets/people/people.widget.ts @@ -17,16 +17,34 @@ /* eslint-disable @angular-eslint/component-selector */ -import { FormService, WidgetComponent } from '@alfresco/adf-core'; +import { ErrorWidgetComponent, FormService, InitialUsernamePipe, WidgetComponent } from '@alfresco/adf-core'; import { Component, ElementRef, EventEmitter, OnInit, Output, ViewChild, ViewEncapsulation } from '@angular/core'; -import { UntypedFormControl } from '@angular/forms'; +import { ReactiveFormsModule, UntypedFormControl } from '@angular/forms'; import { Observable, of } from 'rxjs'; import { catchError, distinctUntilChanged, map, switchMap, tap } from 'rxjs/operators'; import { PeopleProcessService } from '../../../common/services/people-process.service'; import { LightUserRepresentation } from '@alfresco/js-api'; +import { CommonModule } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatTooltipModule } from '@angular/material/tooltip'; @Component({ selector: 'people-widget', + standalone: true, + imports: [ + CommonModule, + TranslateModule, + MatFormFieldModule, + MatInputModule, + ReactiveFormsModule, + MatAutocompleteModule, + MatTooltipModule, + InitialUsernamePipe, + ErrorWidgetComponent + ], templateUrl: './people.widget.html', styleUrls: ['./people.widget.scss'], host: { diff --git a/lib/process-services/src/lib/form/widgets/public-api.ts b/lib/process-services/src/lib/form/widgets/public-api.ts index f856ee1765..8e8392da07 100644 --- a/lib/process-services/src/lib/form/widgets/public-api.ts +++ b/lib/process-services/src/lib/form/widgets/public-api.ts @@ -15,15 +15,42 @@ * limitations under the License. */ +import { UploadWidgetComponent } from './upload/upload.widget'; +import { DocumentWidgetComponent } from './document/document.widget'; +import { ContentWidgetComponent } from './document/content.widget'; +import { PeopleWidgetComponent } from './people/people.widget'; +import { FunctionalGroupWidgetComponent } from './functional-group/functional-group.widget'; +import { RadioButtonsWidgetComponent } from './radio-buttons/radio-buttons.widget'; +import { DropdownWidgetComponent } from './dropdown/dropdown.widget'; +import { TypeaheadWidgetComponent } from './typeahead/typeahead.widget'; +import { FileViewerWidgetComponent } from './file-viewer/file-viewer.widget'; +import { DYNAMIC_TABLE_WIDGET_DIRECTIVES } from './dynamic-table'; +import { AttachFileWidgetComponent, AttachFileWidgetDialogComponent, AttachFolderWidgetComponent } from './content-widget'; + +export * from './content-widget/public-api'; export * from './document/content.widget'; -export * from './content-widget/index'; +export * from './document/document.widget'; export * from './people/people.widget'; export * from './radio-buttons/radio-buttons.widget'; export * from './functional-group/functional-group.widget'; export * from './typeahead/typeahead.widget'; export * from './dropdown/dropdown.widget'; export * from './file-viewer/file-viewer.widget'; - export * from './dynamic-table/index'; - export * from './upload/upload.widget'; + +export const WIDGET_DIRECTIVES = [ + AttachFileWidgetComponent, + AttachFolderWidgetComponent, + AttachFileWidgetDialogComponent, + ContentWidgetComponent, + DocumentWidgetComponent, + DropdownWidgetComponent, + ...DYNAMIC_TABLE_WIDGET_DIRECTIVES, + FileViewerWidgetComponent, + FunctionalGroupWidgetComponent, + PeopleWidgetComponent, + RadioButtonsWidgetComponent, + TypeaheadWidgetComponent, + UploadWidgetComponent +]; diff --git a/lib/process-services/src/lib/form/widgets/radio-buttons/radio-buttons.widget.ts b/lib/process-services/src/lib/form/widgets/radio-buttons/radio-buttons.widget.ts index d1c3a9e2e6..1db655ff16 100644 --- a/lib/process-services/src/lib/form/widgets/radio-buttons/radio-buttons.widget.ts +++ b/lib/process-services/src/lib/form/widgets/radio-buttons/radio-buttons.widget.ts @@ -17,13 +17,20 @@ /* eslint-disable @angular-eslint/component-selector */ -import { FormService, WidgetComponent } from '@alfresco/adf-core'; +import { ErrorWidgetComponent, FormService, WidgetComponent } from '@alfresco/adf-core'; import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { TaskFormService } from '../../services/task-form.service'; import { ProcessDefinitionService } from '../../services/process-definition.service'; +import { CommonModule } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatRadioModule } from '@angular/material/radio'; +import { FormsModule } from '@angular/forms'; +import { MatTooltipModule } from '@angular/material/tooltip'; @Component({ selector: 'radio-buttons-widget', + standalone: true, + imports: [CommonModule, TranslateModule, MatRadioModule, FormsModule, MatTooltipModule, ErrorWidgetComponent], templateUrl: './radio-buttons.widget.html', styleUrls: ['./radio-buttons.widget.scss'], host: { diff --git a/lib/process-services/src/lib/form/widgets/typeahead/typeahead.widget.spec.ts b/lib/process-services/src/lib/form/widgets/typeahead/typeahead.widget.spec.ts index 8fc509fce8..933babfa44 100644 --- a/lib/process-services/src/lib/form/widgets/typeahead/typeahead.widget.spec.ts +++ b/lib/process-services/src/lib/form/widgets/typeahead/typeahead.widget.spec.ts @@ -34,7 +34,7 @@ describe('TypeaheadWidgetComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [CoreTestingModule] + imports: [CoreTestingModule, TypeaheadWidgetComponent] }); translationService = TestBed.inject(TranslateService); taskFormService = TestBed.inject(TaskFormService); diff --git a/lib/process-services/src/lib/form/widgets/typeahead/typeahead.widget.ts b/lib/process-services/src/lib/form/widgets/typeahead/typeahead.widget.ts index 992ed0b5ea..2f9b9c13b9 100644 --- a/lib/process-services/src/lib/form/widgets/typeahead/typeahead.widget.ts +++ b/lib/process-services/src/lib/form/widgets/typeahead/typeahead.widget.ts @@ -17,14 +17,22 @@ /* eslint-disable @angular-eslint/component-selector */ -import { FormService, FormFieldOption, WidgetComponent } from '@alfresco/adf-core'; +import { FormService, FormFieldOption, WidgetComponent, ErrorWidgetComponent } from '@alfresco/adf-core'; import { ENTER, ESCAPE } from '@angular/cdk/keycodes'; import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { TaskFormService } from '../../services/task-form.service'; import { ProcessDefinitionService } from '../../services/process-definition.service'; +import { CommonModule } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { FormsModule } from '@angular/forms'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatInputModule } from '@angular/material/input'; @Component({ selector: 'typeahead-widget', + standalone: true, + imports: [CommonModule, TranslateModule, MatFormFieldModule, FormsModule, MatAutocompleteModule, ErrorWidgetComponent, MatInputModule], templateUrl: './typeahead.widget.html', styleUrls: ['./typeahead.widget.scss'], host: { diff --git a/lib/process-services/src/lib/form/widgets/upload/upload.widget.spec.ts b/lib/process-services/src/lib/form/widgets/upload/upload.widget.spec.ts index fc5155dc91..dc2eba7b18 100644 --- a/lib/process-services/src/lib/form/widgets/upload/upload.widget.spec.ts +++ b/lib/process-services/src/lib/form/widgets/upload/upload.widget.spec.ts @@ -74,7 +74,7 @@ describe('UploadWidgetComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [CoreTestingModule] + imports: [CoreTestingModule, UploadWidgetComponent] }); }); diff --git a/lib/process-services/src/lib/form/widgets/upload/upload.widget.ts b/lib/process-services/src/lib/form/widgets/upload/upload.widget.ts index c872605e69..835403e850 100644 --- a/lib/process-services/src/lib/form/widgets/upload/upload.widget.ts +++ b/lib/process-services/src/lib/form/widgets/upload/upload.widget.ts @@ -17,14 +17,21 @@ /* eslint-disable @angular-eslint/component-selector */ -import { ThumbnailService, FormService, ContentLinkModel, WidgetComponent } from '@alfresco/adf-core'; +import { ThumbnailService, FormService, ContentLinkModel, WidgetComponent, ErrorWidgetComponent } from '@alfresco/adf-core'; import { Component, ElementRef, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { Observable, from } from 'rxjs'; import { ProcessContentService } from '../../services/process-content.service'; import { mergeMap, map } from 'rxjs/operators'; +import { CommonModule } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatListModule } from '@angular/material/list'; +import { MatButtonModule } from '@angular/material/button'; +import { MatIconModule } from '@angular/material/icon'; @Component({ selector: 'upload-widget', + standalone: true, + imports: [CommonModule, TranslateModule, MatListModule, MatButtonModule, MatIconModule, ErrorWidgetComponent], templateUrl: './upload.widget.html', styleUrls: ['./upload.widget.scss'], host: { diff --git a/lib/process-services/src/lib/material.module.ts b/lib/process-services/src/lib/material.module.ts deleted file mode 100644 index 051ba4306d..0000000000 --- a/lib/process-services/src/lib/material.module.ts +++ /dev/null @@ -1,60 +0,0 @@ -/*! - * @license - * Copyright © 2005-2024 Hyland Software, Inc. and its affiliates. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { NgModule } from '@angular/core'; -import { MatAutocompleteModule } from '@angular/material/autocomplete'; -import { MatButtonModule } from '@angular/material/button'; -import { MatCardModule } from '@angular/material/card'; -import { MatCheckboxModule } from '@angular/material/checkbox'; -import { MatChipsModule } from '@angular/material/chips'; -import { MatNativeDateModule, MatOptionModule, MatRippleModule } from '@angular/material/core'; -import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field'; -import { MatDatepickerModule } from '@angular/material/datepicker'; -import { MatDialogModule } from '@angular/material/dialog'; -import { MatGridListModule } from '@angular/material/grid-list'; -import { MatIconModule } from '@angular/material/icon'; -import { MatInputModule } from '@angular/material/input'; -import { MatListModule } from '@angular/material/list'; -import { MatMenuModule } from '@angular/material/menu'; -import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; -import { MatRadioModule } from '@angular/material/radio'; -import { MatSelectModule } from '@angular/material/select'; -import { MatSlideToggleModule } from '@angular/material/slide-toggle'; -import { MatTableModule } from '@angular/material/table'; -import { MatTabsModule } from '@angular/material/tabs'; -import { MatTooltipModule } from '@angular/material/tooltip'; - -@NgModule({ - providers: [ - { provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, useValue: { floatLabel: 'never' } } - ], - imports: [ - MatAutocompleteModule, MatButtonModule, MatCardModule, MatDialogModule, - MatCheckboxModule, MatDatepickerModule, MatGridListModule, MatIconModule, MatInputModule, - MatListModule, MatOptionModule, MatRadioModule, MatSelectModule, MatSlideToggleModule, MatTableModule, - MatTabsModule, MatProgressSpinnerModule, MatNativeDateModule, MatRippleModule, MatTooltipModule, - MatChipsModule, MatMenuModule - ], - exports: [ - MatAutocompleteModule, MatButtonModule, MatCardModule, MatDialogModule, - MatCheckboxModule, MatDatepickerModule, MatGridListModule, MatIconModule, MatInputModule, - MatListModule, MatOptionModule, MatRadioModule, MatSelectModule, MatSlideToggleModule, MatTableModule, - MatTabsModule, MatProgressSpinnerModule, MatNativeDateModule, MatRippleModule, MatTooltipModule, - MatChipsModule, MatMenuModule - ] -}) -export class MaterialModule {} diff --git a/lib/process-services/src/lib/people/people.module.ts b/lib/process-services/src/lib/people/people.module.ts deleted file mode 100644 index f7236d3ff8..0000000000 --- a/lib/process-services/src/lib/people/people.module.ts +++ /dev/null @@ -1,29 +0,0 @@ -/*! - * @license - * Copyright © 2005-2024 Hyland Software, Inc. and its affiliates. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { NgModule } from '@angular/core'; -import { PeopleComponent } from './components/people/people.component'; -import { PeopleListComponent } from './components/people-list/people-list.component'; -import { PeopleSearchComponent } from './components/people-search/people-search.component'; -import { PeopleSearchFieldComponent } from './components/people-search-field/people-search-field.component'; -import { PeopleSelectorComponent } from './components/people-selector/people-selector.component'; - -@NgModule({ - imports: [PeopleComponent, PeopleSearchComponent, PeopleSearchFieldComponent, PeopleSelectorComponent, PeopleListComponent], - exports: [PeopleComponent, PeopleSearchComponent, PeopleSearchFieldComponent, PeopleSelectorComponent, PeopleListComponent] -}) -export class PeopleModule {} diff --git a/lib/process-services/src/lib/people/public-api.ts b/lib/process-services/src/lib/people/public-api.ts index 20cd74275a..6dbb006e36 100644 --- a/lib/process-services/src/lib/people/public-api.ts +++ b/lib/process-services/src/lib/people/public-api.ts @@ -15,12 +15,23 @@ * limitations under the License. */ +import { PeopleComponent } from './components/people/people.component'; +import { PeopleSearchComponent } from './components/people-search/people-search.component'; +import { PeopleSearchFieldComponent } from './components/people-search-field/people-search-field.component'; +import { PeopleSelectorComponent } from './components/people-selector/people-selector.component'; +import { PeopleListComponent } from './components/people-list/people-list.component'; + export * from './components/people/people.component'; export * from './components/people-list/people-list.component'; export * from './components/people-search/people-search.component'; export * from './components/people-search-field/people-search-field.component'; export * from './components/people-selector/people-selector.component'; - export * from './interfaces/perform-search-callback.interface'; -export * from './people.module'; +export const PEOPLE_DIRECTIVES = [ + PeopleComponent, + PeopleSearchComponent, + PeopleSearchFieldComponent, + PeopleSelectorComponent, + PeopleListComponent +] as const; diff --git a/lib/process-services/src/lib/process-comments/index.ts b/lib/process-services/src/lib/process-comments/index.ts index b679f28781..a0e1d6a4f4 100644 --- a/lib/process-services/src/lib/process-comments/index.ts +++ b/lib/process-services/src/lib/process-comments/index.ts @@ -15,6 +15,9 @@ * limitations under the License. */ +import { ProcessCommentsComponent } from './process-comments.component'; + export * from './process-comments.component'; export * from './services/comment-process.service'; -export * from './process-comments.module'; + +export const PROCESS_COMMENTS_DIRECTIVES = [ProcessCommentsComponent] as const; diff --git a/lib/process-services/src/lib/process-comments/process-comments.module.ts b/lib/process-services/src/lib/process-comments/process-comments.module.ts deleted file mode 100644 index d891bb9e83..0000000000 --- a/lib/process-services/src/lib/process-comments/process-comments.module.ts +++ /dev/null @@ -1,25 +0,0 @@ -/*! - * @license - * Copyright © 2005-2024 Hyland Software, Inc. and its affiliates. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { NgModule } from '@angular/core'; -import { ProcessCommentsComponent } from './process-comments.component'; - -@NgModule({ - imports: [ProcessCommentsComponent], - exports: [ProcessCommentsComponent] -}) -export class ProcessCommentsModule {} diff --git a/lib/process-services/src/lib/process-list/components/process-audit.directive.spec.ts b/lib/process-services/src/lib/process-list/components/process-audit/process-audit.directive.spec.ts similarity index 98% rename from lib/process-services/src/lib/process-list/components/process-audit.directive.spec.ts rename to lib/process-services/src/lib/process-list/components/process-audit/process-audit.directive.spec.ts index af36225ea5..595227bc03 100644 --- a/lib/process-services/src/lib/process-list/components/process-audit.directive.spec.ts +++ b/lib/process-services/src/lib/process-list/components/process-audit/process-audit.directive.spec.ts @@ -18,9 +18,9 @@ import { Component } from '@angular/core'; import { ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing'; import { of, throwError } from 'rxjs'; -import { ProcessService } from './../services/process.service'; +import { ProcessService } from '../../services/process.service'; import { DownloadService } from '@alfresco/adf-core'; -import { ProcessTestingModule } from '../../testing/process.testing.module'; +import { ProcessTestingModule } from '../../../testing/process.testing.module'; import { ProcessInstanceAuditInfoRepresentation } from '@alfresco/js-api'; @Component({ diff --git a/lib/process-services/src/lib/process-list/components/process-audit.directive.ts b/lib/process-services/src/lib/process-list/components/process-audit/process-audit.directive.ts similarity index 90% rename from lib/process-services/src/lib/process-list/components/process-audit.directive.ts rename to lib/process-services/src/lib/process-list/components/process-audit/process-audit.directive.ts index bbf0ab7f14..f3829ed9a2 100644 --- a/lib/process-services/src/lib/process-list/components/process-audit.directive.ts +++ b/lib/process-services/src/lib/process-list/components/process-audit/process-audit.directive.ts @@ -19,7 +19,7 @@ import { DownloadService } from '@alfresco/adf-core'; import { Directive, EventEmitter, Input, OnChanges, Output } from '@angular/core'; -import { ProcessService } from './../services/process.service'; +import { ProcessService } from '../../services/process.service'; const JSON_FORMAT: string = 'json'; const PDF_FORMAT: string = 'pdf'; @@ -27,13 +27,13 @@ const PDF_FORMAT: string = 'pdf'; @Directive({ // eslint-disable-next-line @angular-eslint/directive-selector selector: 'button[adf-process-audit]', + standalone: true, host: { role: 'button', '(click)': 'onClickAudit()' } }) export class ProcessAuditDirective implements OnChanges { - /** ID of the process. */ @Input('process-id') processId: string; @@ -58,9 +58,7 @@ export class ProcessAuditDirective implements OnChanges { @Output() error: EventEmitter = new EventEmitter(); - constructor(private downloadService: DownloadService, - private processListService: ProcessService) { - } + constructor(private downloadService: DownloadService, private processListService: ProcessService) {} ngOnChanges(): void { if (!this.isValidType()) { @@ -88,11 +86,13 @@ export class ProcessAuditDirective implements OnChanges { } this.clicked.emit({ format: this.format, value: blob, fileName: this.fileName }); }, - (err) => this.error.emit(err)); + (err) => this.error.emit(err) + ); } else { this.processListService.fetchProcessAuditJsonById(this.processId).subscribe( (res) => this.clicked.emit({ format: this.format, value: res, fileName: this.fileName }), - (err) => this.error.emit(err)); + (err) => this.error.emit(err) + ); } } @@ -107,5 +107,4 @@ export class ProcessAuditDirective implements OnChanges { isPdfFormat() { return this.format === PDF_FORMAT; } - } diff --git a/lib/process-services/src/lib/process-list/components/process-filters.component.html b/lib/process-services/src/lib/process-list/components/process-filters/process-filters.component.html similarity index 100% rename from lib/process-services/src/lib/process-list/components/process-filters.component.html rename to lib/process-services/src/lib/process-list/components/process-filters/process-filters.component.html diff --git a/lib/process-services/src/lib/process-list/components/process-filters.component.scss b/lib/process-services/src/lib/process-list/components/process-filters/process-filters.component.scss similarity index 100% rename from lib/process-services/src/lib/process-list/components/process-filters.component.scss rename to lib/process-services/src/lib/process-list/components/process-filters/process-filters.component.scss diff --git a/lib/process-services/src/lib/process-list/components/process-filters.component.spec.ts b/lib/process-services/src/lib/process-list/components/process-filters/process-filters.component.spec.ts similarity index 98% rename from lib/process-services/src/lib/process-list/components/process-filters.component.spec.ts rename to lib/process-services/src/lib/process-list/components/process-filters/process-filters.component.spec.ts index 5110eba258..dd5e1084a9 100644 --- a/lib/process-services/src/lib/process-list/components/process-filters.component.spec.ts +++ b/lib/process-services/src/lib/process-list/components/process-filters/process-filters.component.spec.ts @@ -17,12 +17,12 @@ import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange } from '@angular/core'; import { from, of, throwError } from 'rxjs'; -import { AppsProcessService } from '../../app-list/services/apps-process.service'; -import { ProcessFilterService } from '../services/process-filter.service'; +import { AppsProcessService } from '../../../services/apps-process.service'; +import { ProcessFilterService } from '../../services/process-filter.service'; import { ProcessFiltersComponent } from './process-filters.component'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { ProcessTestingModule } from '../../testing/process.testing.module'; +import { ProcessTestingModule } from '../../../testing/process.testing.module'; import { NavigationStart, Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { ProcessInstanceFilterRepresentation, UserProcessInstanceFilterRepresentation } from '@alfresco/js-api'; diff --git a/lib/process-services/src/lib/process-list/components/process-filters.component.ts b/lib/process-services/src/lib/process-list/components/process-filters/process-filters.component.ts similarity index 93% rename from lib/process-services/src/lib/process-list/components/process-filters.component.ts rename to lib/process-services/src/lib/process-list/components/process-filters/process-filters.component.ts index d3094c2dc0..a158df351c 100644 --- a/lib/process-services/src/lib/process-list/components/process-filters.component.ts +++ b/lib/process-services/src/lib/process-list/components/process-filters/process-filters.component.ts @@ -18,15 +18,20 @@ import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges, ViewEncapsulation } from '@angular/core'; import { ProcessInstanceFilterRepresentation, UserProcessInstanceFilterRepresentation } from '@alfresco/js-api'; import { Subject } from 'rxjs'; -import { ProcessFilterService } from './../services/process-filter.service'; -import { AppsProcessService } from '../../app-list/services/apps-process.service'; -import { IconModel } from '../../app-list/icon.model'; +import { ProcessFilterService } from '../../services/process-filter.service'; +import { AppsProcessService } from '../../../services/apps-process.service'; +import { IconModel } from '../../../app-list/icon.model'; import { NavigationStart, Router } from '@angular/router'; import { filter, takeUntil } from 'rxjs/operators'; -import { Location } from '@angular/common'; +import { CommonModule, Location } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatButtonModule } from '@angular/material/button'; +import { IconComponent } from '@alfresco/adf-core'; @Component({ selector: 'adf-process-instance-filters', + standalone: true, + imports: [CommonModule, TranslateModule, MatButtonModule, IconComponent], templateUrl: './process-filters.component.html', styleUrls: ['./process-filters.component.scss'], encapsulation: ViewEncapsulation.None diff --git a/lib/process-services/src/lib/process-list/components/process-instance-details.component.css b/lib/process-services/src/lib/process-list/components/process-instance-details/process-instance-details.component.css similarity index 100% rename from lib/process-services/src/lib/process-list/components/process-instance-details.component.css rename to lib/process-services/src/lib/process-list/components/process-instance-details/process-instance-details.component.css diff --git a/lib/process-services/src/lib/process-list/components/process-instance-details.component.html b/lib/process-services/src/lib/process-list/components/process-instance-details/process-instance-details.component.html similarity index 83% rename from lib/process-services/src/lib/process-list/components/process-instance-details.component.html rename to lib/process-services/src/lib/process-list/components/process-instance-details/process-instance-details.component.html index 5bf544674e..5e74371d39 100644 --- a/lib/process-services/src/lib/process-list/components/process-instance-details.component.html +++ b/lib/process-services/src/lib/process-list/components/process-instance-details/process-instance-details.component.html @@ -1,4 +1,4 @@ -
{{ 'ADF_PROCESS_LIST.DETAILS.MESSAGES.NONE'|translate }}
+
{{ 'ADF_PROCESS_LIST.DETAILS.MESSAGES.NONE' | translate }}
{{ getProcessNameOrDescription('medium') }} @@ -6,15 +6,15 @@ + [processInstance]="processInstanceDetails"> @@ -34,7 +34,7 @@ - diff --git a/lib/process-services/src/lib/process-list/components/process-instance-details.component.spec.ts b/lib/process-services/src/lib/process-list/components/process-instance-details/process-instance-details.component.spec.ts similarity index 92% rename from lib/process-services/src/lib/process-list/components/process-instance-details.component.spec.ts rename to lib/process-services/src/lib/process-list/components/process-instance-details/process-instance-details.component.spec.ts index 3e9436b82b..5564ea46b9 100644 --- a/lib/process-services/src/lib/process-list/components/process-instance-details.component.spec.ts +++ b/lib/process-services/src/lib/process-list/components/process-instance-details/process-instance-details.component.spec.ts @@ -19,14 +19,12 @@ import { NO_ERRORS_SCHEMA, SimpleChange } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { of } from 'rxjs'; -import { CommentProcessService } from '../../process-comments/services/comment-process.service'; -import { TaskListModule } from '../../task-list/task-list.module'; -import { exampleProcess, exampleProcessNoName, mockRunningProcess, processEnded } from './../../mock'; -import { mockProcessInstanceComments } from './../../mock/process/process-comments.mock'; -import { ProcessService } from './../services/process.service'; +import { CommentProcessService } from '../../../process-comments/services/comment-process.service'; +import { exampleProcess, exampleProcessNoName, mockRunningProcess, processEnded } from '../../../mock'; +import { mockProcessInstanceComments } from '../../../mock/process/process-comments.mock'; +import { ProcessService } from '../../services/process.service'; import { ProcessInstanceDetailsComponent } from './process-instance-details.component'; -import { ProcessTestingModule } from '../../testing/process.testing.module'; -import { FormModule } from '../../form'; +import { ProcessTestingModule } from '../../../testing/process.testing.module'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatCardHarness } from '@angular/material/card/testing'; @@ -40,7 +38,7 @@ describe('ProcessInstanceDetailsComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ProcessTestingModule, FormModule, TaskListModule], + imports: [ProcessTestingModule, ProcessInstanceDetailsComponent], schemas: [NO_ERRORS_SCHEMA] }); fixture = TestBed.createComponent(ProcessInstanceDetailsComponent); diff --git a/lib/process-services/src/lib/process-list/components/process-instance-details.component.ts b/lib/process-services/src/lib/process-list/components/process-instance-details/process-instance-details.component.ts similarity index 82% rename from lib/process-services/src/lib/process-list/components/process-instance-details.component.ts rename to lib/process-services/src/lib/process-list/components/process-instance-details/process-instance-details.component.ts index fc800944e7..ac6a681aba 100644 --- a/lib/process-services/src/lib/process-list/components/process-instance-details.component.ts +++ b/lib/process-services/src/lib/process-list/components/process-instance-details/process-instance-details.component.ts @@ -15,16 +15,30 @@ * limitations under the License. */ -import { DatePipe } from '@angular/common'; +import { CommonModule, DatePipe } from '@angular/common'; import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges, ViewChild } from '@angular/core'; -import { TaskDetailsEvent } from '../../task-list'; -import { ProcessService } from './../services/process.service'; -import { ProcessInstanceHeaderComponent } from './process-instance-header.component'; -import { ProcessInstanceTasksComponent } from './process-instance-tasks.component'; +import { TaskDetailsEvent } from '../../../task-list'; +import { ProcessService } from '../../services/process.service'; +import { ProcessInstanceHeaderComponent } from '../process-instance-header/process-instance-header.component'; +import { ProcessInstanceTasksComponent } from '../process-instance-tasks/process-instance-tasks.component'; import { ProcessInstanceRepresentation } from '@alfresco/js-api'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatCardModule } from '@angular/material/card'; +import { MatButtonModule } from '@angular/material/button'; +import { ProcessCommentsComponent } from '../../../process-comments'; @Component({ selector: 'adf-process-instance-details', + standalone: true, + imports: [ + CommonModule, + TranslateModule, + MatCardModule, + MatButtonModule, + ProcessCommentsComponent, + ProcessInstanceTasksComponent, + ProcessInstanceHeaderComponent + ], templateUrl: './process-instance-details.component.html', styleUrls: ['./process-instance-details.component.css'] }) diff --git a/lib/process-services/src/lib/process-list/components/process-instance-header.component.css b/lib/process-services/src/lib/process-list/components/process-instance-header/process-instance-header.component.css similarity index 100% rename from lib/process-services/src/lib/process-list/components/process-instance-header.component.css rename to lib/process-services/src/lib/process-list/components/process-instance-header/process-instance-header.component.css diff --git a/lib/process-services/src/lib/process-list/components/process-instance-header.component.html b/lib/process-services/src/lib/process-list/components/process-instance-header/process-instance-header.component.html similarity index 100% rename from lib/process-services/src/lib/process-list/components/process-instance-header.component.html rename to lib/process-services/src/lib/process-list/components/process-instance-header/process-instance-header.component.html diff --git a/lib/process-services/src/lib/process-list/components/process-instance-header.component.spec.ts b/lib/process-services/src/lib/process-list/components/process-instance-header/process-instance-header.component.spec.ts similarity index 98% rename from lib/process-services/src/lib/process-list/components/process-instance-header.component.spec.ts rename to lib/process-services/src/lib/process-list/components/process-instance-header/process-instance-header.component.spec.ts index ec92e5d994..29df4d3b0a 100644 --- a/lib/process-services/src/lib/process-list/components/process-instance-header.component.spec.ts +++ b/lib/process-services/src/lib/process-list/components/process-instance-header/process-instance-header.component.spec.ts @@ -17,9 +17,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AppConfigService } from '@alfresco/adf-core'; -import { exampleProcess } from '../../mock'; +import { exampleProcess } from '../../../mock'; import { ProcessInstanceHeaderComponent } from './process-instance-header.component'; -import { ProcessTestingModule } from '../../testing/process.testing.module'; +import { ProcessTestingModule } from '../../../testing/process.testing.module'; describe('ProcessInstanceHeaderComponent', () => { let component: ProcessInstanceHeaderComponent; diff --git a/lib/process-services/src/lib/process-list/components/process-instance-header.component.ts b/lib/process-services/src/lib/process-list/components/process-instance-header/process-instance-header.component.ts similarity index 95% rename from lib/process-services/src/lib/process-list/components/process-instance-header.component.ts rename to lib/process-services/src/lib/process-list/components/process-instance-header/process-instance-header.component.ts index 21fd0ce027..bb8bffd282 100644 --- a/lib/process-services/src/lib/process-list/components/process-instance-header.component.ts +++ b/lib/process-services/src/lib/process-list/components/process-instance-header/process-instance-header.component.ts @@ -21,13 +21,18 @@ import { CardViewItem, CardViewBaseItemModel, CardViewTextItemModel, - TranslationService + TranslationService, + CardViewModule } from '@alfresco/adf-core'; import { Component, Input, OnChanges } from '@angular/core'; import { ProcessInstanceRepresentation } from '@alfresco/js-api'; +import { CommonModule } from '@angular/common'; +import { MatCardModule } from '@angular/material/card'; @Component({ selector: 'adf-process-instance-header', + standalone: true, + imports: [CommonModule, MatCardModule, CardViewModule], templateUrl: './process-instance-header.component.html', styleUrls: ['./process-instance-header.component.css'] }) diff --git a/lib/process-services/src/lib/process-list/components/process-instance-tasks.component.css b/lib/process-services/src/lib/process-list/components/process-instance-tasks/process-instance-tasks.component.css similarity index 100% rename from lib/process-services/src/lib/process-list/components/process-instance-tasks.component.css rename to lib/process-services/src/lib/process-list/components/process-instance-tasks/process-instance-tasks.component.css diff --git a/lib/process-services/src/lib/process-list/components/process-instance-tasks.component.html b/lib/process-services/src/lib/process-list/components/process-instance-tasks/process-instance-tasks.component.html similarity index 100% rename from lib/process-services/src/lib/process-list/components/process-instance-tasks.component.html rename to lib/process-services/src/lib/process-list/components/process-instance-tasks/process-instance-tasks.component.html diff --git a/lib/process-services/src/lib/process-list/components/process-instance-tasks.component.spec.ts b/lib/process-services/src/lib/process-list/components/process-instance-tasks/process-instance-tasks.component.spec.ts similarity index 96% rename from lib/process-services/src/lib/process-list/components/process-instance-tasks.component.spec.ts rename to lib/process-services/src/lib/process-list/components/process-instance-tasks/process-instance-tasks.component.spec.ts index 55c5973281..cc644ff6d7 100644 --- a/lib/process-services/src/lib/process-list/components/process-instance-tasks.component.spec.ts +++ b/lib/process-services/src/lib/process-list/components/process-instance-tasks/process-instance-tasks.component.spec.ts @@ -19,10 +19,10 @@ import { SimpleChange } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { of } from 'rxjs'; -import { taskDetailsMock } from '../../mock'; -import { ProcessService } from './../services/process.service'; +import { taskDetailsMock } from '../../../mock'; +import { ProcessService } from '../../services/process.service'; import { ProcessInstanceTasksComponent } from './process-instance-tasks.component'; -import { ProcessTestingModule } from '../../testing/process.testing.module'; +import { ProcessTestingModule } from '../../../testing/process.testing.module'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatListItemHarness } from '@angular/material/list/testing'; diff --git a/lib/process-services/src/lib/process-list/components/process-instance-tasks.component.ts b/lib/process-services/src/lib/process-list/components/process-instance-tasks/process-instance-tasks.component.ts similarity index 88% rename from lib/process-services/src/lib/process-list/components/process-instance-tasks.component.ts rename to lib/process-services/src/lib/process-list/components/process-instance-tasks/process-instance-tasks.component.ts index 18733a4fa2..8dbdae2e99 100644 --- a/lib/process-services/src/lib/process-list/components/process-instance-tasks.component.ts +++ b/lib/process-services/src/lib/process-list/components/process-instance-tasks/process-instance-tasks.component.ts @@ -15,17 +15,25 @@ * limitations under the License. */ -import { DatePipe } from '@angular/common'; +import { CommonModule, DatePipe } from '@angular/common'; import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild, OnDestroy } from '@angular/core'; -import { MatDialog } from '@angular/material/dialog'; +import { MatDialog, MatDialogModule } from '@angular/material/dialog'; import { Observable, Observer, Subject } from 'rxjs'; -import { TaskDetailsEvent } from '../../task-list'; -import { ProcessService } from './../services/process.service'; +import { TaskDetailsEvent } from '../../../task-list'; +import { ProcessService } from '../../services/process.service'; import { share, takeUntil } from 'rxjs/operators'; import { ProcessInstanceRepresentation, TaskRepresentation } from '@alfresco/js-api'; +import { MatButtonModule } from '@angular/material/button'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatChipsModule } from '@angular/material/chips'; +import { MatListModule } from '@angular/material/list'; +import { MatIconModule } from '@angular/material/icon'; +import { StartFormComponent } from '../../../form'; @Component({ selector: 'adf-process-instance-tasks', + standalone: true, + imports: [CommonModule, MatButtonModule, TranslateModule, MatChipsModule, MatListModule, MatIconModule, MatDialogModule, StartFormComponent], templateUrl: './process-instance-tasks.component.html', styleUrls: ['./process-instance-tasks.component.css'] }) diff --git a/lib/process-services/src/lib/process-list/components/process-list.component.css b/lib/process-services/src/lib/process-list/components/process-list/process-list.component.css similarity index 100% rename from lib/process-services/src/lib/process-list/components/process-list.component.css rename to lib/process-services/src/lib/process-list/components/process-list/process-list.component.css diff --git a/lib/process-services/src/lib/process-list/components/process-list.component.html b/lib/process-services/src/lib/process-list/components/process-list/process-list.component.html similarity index 100% rename from lib/process-services/src/lib/process-list/components/process-list.component.html rename to lib/process-services/src/lib/process-list/components/process-list/process-list.component.html diff --git a/lib/process-services/src/lib/process-list/components/process-list.component.spec.ts b/lib/process-services/src/lib/process-list/components/process-list/process-list.component.spec.ts similarity index 99% rename from lib/process-services/src/lib/process-list/components/process-list.component.spec.ts rename to lib/process-services/src/lib/process-list/components/process-list/process-list.component.spec.ts index 4ab58a4d61..fcd810cb01 100644 --- a/lib/process-services/src/lib/process-list/components/process-list.component.spec.ts +++ b/lib/process-services/src/lib/process-list/components/process-list/process-list.component.spec.ts @@ -30,9 +30,9 @@ import { DataCellEvent, ObjectDataColumn } from '@alfresco/adf-core'; -import { fakeProcessInstance, fakeProcessInstancesWithNoName, fakeProcessInstancesEmpty, fakeProcessColumnSchema } from '../../mock'; -import { ProcessService } from '../services/process.service'; -import { ProcessTestingModule } from '../../testing/process.testing.module'; +import { fakeProcessInstance, fakeProcessInstancesWithNoName, fakeProcessInstancesEmpty, fakeProcessColumnSchema } from '../../../mock'; +import { ProcessService } from '../../services/process.service'; +import { ProcessTestingModule } from '../../../testing/process.testing.module'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatProgressSpinnerHarness } from '@angular/material/progress-spinner/testing'; diff --git a/lib/process-services/src/lib/process-list/components/process-list.component.ts b/lib/process-services/src/lib/process-list/components/process-list/process-list.component.ts similarity index 96% rename from lib/process-services/src/lib/process-list/components/process-list.component.ts rename to lib/process-services/src/lib/process-list/components/process-list/process-list.component.ts index 04e0c289af..3d5eedc295 100644 --- a/lib/process-services/src/lib/process-list/components/process-list.component.ts +++ b/lib/process-services/src/lib/process-list/components/process-list/process-list.component.ts @@ -28,10 +28,12 @@ import { PaginationModel, UserPreferencesService, DataCellEvent, - DEFAULT_PAGINATION + DEFAULT_PAGINATION, + DataTableModule, + EmptyContentComponent } from '@alfresco/adf-core'; import { AfterContentInit, Component, ContentChild, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core'; -import { ProcessService } from '../services/process.service'; +import { ProcessService } from '../../services/process.service'; import { BehaviorSubject } from 'rxjs'; import { finalize } from 'rxjs/operators'; import { @@ -40,6 +42,9 @@ import { ProcessInstanceQueryRepresentationState, ResultListDataRepresentationProcessInstanceRepresentation } from '@alfresco/js-api'; +import { CommonModule } from '@angular/common'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { TranslateModule } from '@ngx-translate/core'; const PRESET_KEY = 'adf-process-list.presets'; @@ -63,6 +68,8 @@ export const processPresetsDefaultModel = { @Component({ selector: 'adf-process-instance-list', + standalone: true, + imports: [CommonModule, DataTableModule, MatProgressSpinnerModule, EmptyContentComponent, TranslateModule], styleUrls: ['./process-list.component.css'], templateUrl: './process-list.component.html' }) diff --git a/lib/process-services/src/lib/process-list/components/start-process.component.html b/lib/process-services/src/lib/process-list/components/start-process/start-process.component.html similarity index 98% rename from lib/process-services/src/lib/process-list/components/start-process.component.html rename to lib/process-services/src/lib/process-list/components/start-process/start-process.component.html index 1eeb5a2c68..44ca2daac9 100644 --- a/lib/process-services/src/lib/process-list/components/start-process.component.html +++ b/lib/process-services/src/lib/process-list/components/start-process/start-process.component.html @@ -31,8 +31,7 @@ matInput [formControl]="processDefinitionInput" [matAutocomplete]="auto" - id="processDefinitionName" - #inputAutocomplete> + id="processDefinitionName">
{ - return { - ngModule: ProcessModule - }; - } } diff --git a/lib/process-services/src/lib/app-list/services/apps-process.service.ts b/lib/process-services/src/lib/services/apps-process.service.ts similarity index 100% rename from lib/process-services/src/lib/app-list/services/apps-process.service.ts rename to lib/process-services/src/lib/services/apps-process.service.ts diff --git a/lib/process-services/src/lib/task-comments/index.ts b/lib/process-services/src/lib/task-comments/index.ts index 5e22590559..45a9b63fb1 100644 --- a/lib/process-services/src/lib/task-comments/index.ts +++ b/lib/process-services/src/lib/task-comments/index.ts @@ -15,6 +15,9 @@ * limitations under the License. */ +import { TaskCommentsComponent } from './task-comments.component'; + export * from './task-comments.component'; -export * from './services/task-comments.service'; -export * from './task-comments.module'; +export * from './task-comments.service'; + +export const TASK_COMMENTS_DIRECTIVES = [TaskCommentsComponent] as const; diff --git a/lib/process-services/src/lib/task-comments/task-comments.component.ts b/lib/process-services/src/lib/task-comments/task-comments.component.ts index 1b73db36cf..848df8e855 100644 --- a/lib/process-services/src/lib/task-comments/task-comments.component.ts +++ b/lib/process-services/src/lib/task-comments/task-comments.component.ts @@ -17,7 +17,7 @@ import { Component, Input, ViewEncapsulation } from '@angular/core'; import { ADF_COMMENTS_SERVICE, CommentsModule } from '@alfresco/adf-core'; -import { TaskCommentsService } from './services/task-comments.service'; +import { TaskCommentsService } from './task-comments.service'; import { CommonModule } from '@angular/common'; @Component({ diff --git a/lib/process-services/src/lib/task-comments/task-comments.module.ts b/lib/process-services/src/lib/task-comments/task-comments.module.ts deleted file mode 100644 index 038562131b..0000000000 --- a/lib/process-services/src/lib/task-comments/task-comments.module.ts +++ /dev/null @@ -1,25 +0,0 @@ -/*! - * @license - * Copyright © 2005-2024 Hyland Software, Inc. and its affiliates. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { NgModule } from '@angular/core'; -import { TaskCommentsComponent } from './task-comments.component'; - -@NgModule({ - imports: [TaskCommentsComponent], - exports: [TaskCommentsComponent] -}) -export class TaskCommentsModule {} diff --git a/lib/process-services/src/lib/task-comments/services/task-comments.service.ts b/lib/process-services/src/lib/task-comments/task-comments.service.ts similarity index 96% rename from lib/process-services/src/lib/task-comments/services/task-comments.service.ts rename to lib/process-services/src/lib/task-comments/task-comments.service.ts index 6dd576494a..e663028cbf 100644 --- a/lib/process-services/src/lib/task-comments/services/task-comments.service.ts +++ b/lib/process-services/src/lib/task-comments/task-comments.service.ts @@ -20,7 +20,7 @@ import { ActivitiCommentsApi } from '@alfresco/js-api'; import { Injectable } from '@angular/core'; import { from, Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { PeopleProcessService } from '../../common/services/people-process.service'; +import { PeopleProcessService } from '../common/services/people-process.service'; @Injectable({ providedIn: 'root' diff --git a/lib/process-services/src/lib/task-list/components/attach-form.component.html b/lib/process-services/src/lib/task-list/components/attach-form/attach-form.component.html similarity index 100% rename from lib/process-services/src/lib/task-list/components/attach-form.component.html rename to lib/process-services/src/lib/task-list/components/attach-form/attach-form.component.html diff --git a/lib/process-services/src/lib/task-list/components/attach-form.component.scss b/lib/process-services/src/lib/task-list/components/attach-form/attach-form.component.scss similarity index 100% rename from lib/process-services/src/lib/task-list/components/attach-form.component.scss rename to lib/process-services/src/lib/task-list/components/attach-form/attach-form.component.scss diff --git a/lib/process-services/src/lib/task-list/components/attach-form.component.spec.ts b/lib/process-services/src/lib/task-list/components/attach-form/attach-form.component.spec.ts similarity index 96% rename from lib/process-services/src/lib/task-list/components/attach-form.component.spec.ts rename to lib/process-services/src/lib/task-list/components/attach-form/attach-form.component.spec.ts index 315595dd18..c6a6b37963 100644 --- a/lib/process-services/src/lib/task-list/components/attach-form.component.spec.ts +++ b/lib/process-services/src/lib/task-list/components/attach-form/attach-form.component.spec.ts @@ -17,8 +17,8 @@ import { AttachFormComponent } from './attach-form.component'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ProcessTestingModule } from '../../testing/process.testing.module'; -import { TaskListService } from './../services/tasklist.service'; +import { ProcessTestingModule } from '../../../testing/process.testing.module'; +import { TaskListService } from '../../services/tasklist.service'; import { of } from 'rxjs'; import { By } from '@angular/platform-browser'; @@ -30,7 +30,7 @@ describe('AttachFormComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ProcessTestingModule] + imports: [ProcessTestingModule, AttachFormComponent] }); fixture = TestBed.createComponent(AttachFormComponent); component = fixture.componentInstance; diff --git a/lib/process-services/src/lib/task-list/components/attach-form.component.ts b/lib/process-services/src/lib/task-list/components/attach-form/attach-form.component.ts similarity index 80% rename from lib/process-services/src/lib/task-list/components/attach-form.component.ts rename to lib/process-services/src/lib/task-list/components/attach-form/attach-form.component.ts index 844fa30ed2..b762d98b7e 100644 --- a/lib/process-services/src/lib/task-list/components/attach-form.component.ts +++ b/lib/process-services/src/lib/task-list/components/attach-form/attach-form.component.ts @@ -16,14 +16,23 @@ */ import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core'; -import { Form } from '../models/form.model'; -import { TaskListService } from './../services/tasklist.service'; -import { UntypedFormControl, Validators } from '@angular/forms'; -import { ModelService } from '../../form/services/model.service'; -import { TaskFormService } from '../../form/services/task-form.service'; +import { Form } from '../../models/form.model'; +import { TaskListService } from '../../services/tasklist.service'; +import { ReactiveFormsModule, UntypedFormControl, Validators } from '@angular/forms'; +import { ModelService } from '../../../form/services/model.service'; +import { TaskFormService } from '../../../form/services/task-form.service'; +import { CommonModule } from '@angular/common'; +import { MatCardModule } from '@angular/material/card'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatSelectModule } from '@angular/material/select'; +import { MatButtonModule } from '@angular/material/button'; +import { FormComponent } from '../../../form'; @Component({ selector: 'adf-attach-form', + standalone: true, + imports: [CommonModule, MatCardModule, TranslateModule, MatFormFieldModule, MatSelectModule, ReactiveFormsModule, MatButtonModule, FormComponent], templateUrl: './attach-form.component.html', styleUrls: ['./attach-form.component.scss'] }) diff --git a/lib/process-services/src/lib/task-list/components/checklist.component.html b/lib/process-services/src/lib/task-list/components/checklist/checklist.component.html similarity index 100% rename from lib/process-services/src/lib/task-list/components/checklist.component.html rename to lib/process-services/src/lib/task-list/components/checklist/checklist.component.html diff --git a/lib/process-services/src/lib/task-list/components/checklist.component.scss b/lib/process-services/src/lib/task-list/components/checklist/checklist.component.scss similarity index 100% rename from lib/process-services/src/lib/task-list/components/checklist.component.scss rename to lib/process-services/src/lib/task-list/components/checklist/checklist.component.scss diff --git a/lib/process-services/src/lib/task-list/components/checklist.component.spec.ts b/lib/process-services/src/lib/task-list/components/checklist/checklist.component.spec.ts similarity index 98% rename from lib/process-services/src/lib/task-list/components/checklist.component.spec.ts rename to lib/process-services/src/lib/task-list/components/checklist/checklist.component.spec.ts index 916f7f3e00..c0d090d8be 100644 --- a/lib/process-services/src/lib/task-list/components/checklist.component.spec.ts +++ b/lib/process-services/src/lib/task-list/components/checklist/checklist.component.spec.ts @@ -18,8 +18,8 @@ import { SimpleChange } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ChecklistComponent } from './checklist.component'; -import { ProcessTestingModule } from '../../testing/process.testing.module'; -import { TaskListService } from './../services/tasklist.service'; +import { ProcessTestingModule } from '../../../testing/process.testing.module'; +import { TaskListService } from '../../services/tasklist.service'; import { of } from 'rxjs'; import { TaskRepresentation } from '@alfresco/js-api'; diff --git a/lib/process-services/src/lib/task-list/components/checklist.component.ts b/lib/process-services/src/lib/task-list/components/checklist/checklist.component.ts similarity index 80% rename from lib/process-services/src/lib/task-list/components/checklist.component.ts rename to lib/process-services/src/lib/task-list/components/checklist/checklist.component.ts index 124bc84dbc..2fa38229ba 100644 --- a/lib/process-services/src/lib/task-list/components/checklist.component.ts +++ b/lib/process-services/src/lib/task-list/components/checklist/checklist.component.ts @@ -16,12 +16,34 @@ */ import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges, ViewChild } from '@angular/core'; -import { MatDialog } from '@angular/material/dialog'; -import { TaskListService } from './../services/tasklist.service'; +import { MatDialog, MatDialogModule } from '@angular/material/dialog'; +import { TaskListService } from '../../services/tasklist.service'; import { TaskRepresentation } from '@alfresco/js-api'; +import { CommonModule } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatChipsModule } from '@angular/material/chips'; +import { MatButtonModule } from '@angular/material/button'; +import { MatTooltipModule } from '@angular/material/tooltip'; +import { MatIconModule } from '@angular/material/icon'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'adf-checklist', + standalone: true, + imports: [ + CommonModule, + TranslateModule, + MatChipsModule, + MatButtonModule, + MatTooltipModule, + MatIconModule, + MatDialogModule, + MatFormFieldModule, + MatInputModule, + FormsModule + ], templateUrl: './checklist.component.html', styleUrls: ['./checklist.component.scss'] }) diff --git a/lib/process-services/src/lib/task-list/components/no-task-detail-template.directive.spec.ts b/lib/process-services/src/lib/task-list/components/no-task-details/no-task-detail-template.directive.spec.ts similarity index 94% rename from lib/process-services/src/lib/task-list/components/no-task-detail-template.directive.spec.ts rename to lib/process-services/src/lib/task-list/components/no-task-details/no-task-detail-template.directive.spec.ts index 8b575ec59c..dc57825b54 100644 --- a/lib/process-services/src/lib/task-list/components/no-task-detail-template.directive.spec.ts +++ b/lib/process-services/src/lib/task-list/components/no-task-details/no-task-detail-template.directive.spec.ts @@ -16,7 +16,7 @@ */ import { NoTaskDetailsTemplateDirective } from './no-task-detail-template.directive'; -import { TaskDetailsComponent } from './task-details.component'; +import { TaskDetailsComponent } from '../task-details/task-details.component'; describe('NoTaskDetailsTemplateDirective', () => { let component: NoTaskDetailsTemplateDirective; diff --git a/lib/process-services/src/lib/task-list/components/no-task-detail-template.directive.ts b/lib/process-services/src/lib/task-list/components/no-task-details/no-task-detail-template.directive.ts similarity index 82% rename from lib/process-services/src/lib/task-list/components/no-task-detail-template.directive.ts rename to lib/process-services/src/lib/task-list/components/no-task-details/no-task-detail-template.directive.ts index 3a7e66306a..0c50fbc19c 100644 --- a/lib/process-services/src/lib/task-list/components/no-task-detail-template.directive.ts +++ b/lib/process-services/src/lib/task-list/components/no-task-details/no-task-detail-template.directive.ts @@ -15,29 +15,22 @@ * limitations under the License. */ -import { - AfterContentInit, - ContentChild, - Directive, - TemplateRef -} from '@angular/core'; -import { TaskDetailsComponent } from './task-details.component'; +import { AfterContentInit, ContentChild, Directive, TemplateRef } from '@angular/core'; +import { TaskDetailsComponent } from '../task-details/task-details.component'; /** * Directive selectors without adf- prefix will be deprecated on 3.0.0 */ @Directive({ // eslint-disable-next-line @angular-eslint/directive-selector - selector: 'adf-no-task-details-template, no-task-details-template' + selector: 'adf-no-task-details-template, no-task-details-template', + standalone: true }) export class NoTaskDetailsTemplateDirective implements AfterContentInit { - @ContentChild(TemplateRef) template: any; - constructor( - private activitiTaskDetails: TaskDetailsComponent) { - } + constructor(private activitiTaskDetails: TaskDetailsComponent) {} ngAfterContentInit() { this.activitiTaskDetails.noTaskDetailsTemplateComponent = this.template; diff --git a/lib/process-services/src/lib/task-list/components/start-task.component.html b/lib/process-services/src/lib/task-list/components/start-task/start-task.component.html similarity index 100% rename from lib/process-services/src/lib/task-list/components/start-task.component.html rename to lib/process-services/src/lib/task-list/components/start-task/start-task.component.html diff --git a/lib/process-services/src/lib/task-list/components/start-task.component.scss b/lib/process-services/src/lib/task-list/components/start-task/start-task.component.scss similarity index 100% rename from lib/process-services/src/lib/task-list/components/start-task.component.scss rename to lib/process-services/src/lib/task-list/components/start-task/start-task.component.scss diff --git a/lib/process-services/src/lib/task-list/components/start-task.component.spec.ts b/lib/process-services/src/lib/task-list/components/start-task/start-task.component.spec.ts similarity index 98% rename from lib/process-services/src/lib/task-list/components/start-task.component.spec.ts rename to lib/process-services/src/lib/task-list/components/start-task/start-task.component.spec.ts index 617af897d4..cf820d873d 100644 --- a/lib/process-services/src/lib/task-list/components/start-task.component.spec.ts +++ b/lib/process-services/src/lib/task-list/components/start-task/start-task.component.spec.ts @@ -17,10 +17,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { of, throwError } from 'rxjs'; -import { TaskListService } from '../services/tasklist.service'; +import { TaskListService } from '../../services/tasklist.service'; import { StartTaskComponent } from './start-task.component'; -import { ProcessTestingModule } from '../../testing/process.testing.module'; -import { taskDetailsMock } from '../../mock/task/task-details.mock'; +import { ProcessTestingModule } from '../../../testing/process.testing.module'; +import { taskDetailsMock } from '../../../mock/task/task-details.mock'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatButtonHarness } from '@angular/material/button/testing'; @@ -50,7 +50,7 @@ describe('StartTaskComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ProcessTestingModule] + imports: [ProcessTestingModule, StartTaskComponent] }); fixture = TestBed.createComponent(StartTaskComponent); component = fixture.componentInstance; diff --git a/lib/process-services/src/lib/task-list/components/start-task.component.ts b/lib/process-services/src/lib/task-list/components/start-task/start-task.component.ts similarity index 87% rename from lib/process-services/src/lib/task-list/components/start-task.component.ts rename to lib/process-services/src/lib/task-list/components/start-task/start-task.component.ts index 77a3f7af0c..0cd9c56cc1 100644 --- a/lib/process-services/src/lib/task-list/components/start-task.component.ts +++ b/lib/process-services/src/lib/task-list/components/start-task/start-task.component.ts @@ -19,18 +19,42 @@ import { FormFieldModel, FormModel, DateFnsUtils, AdfDateFnsAdapter, ADF_DATE_FO import { Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation, OnDestroy } from '@angular/core'; import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material/core'; import { EMPTY, Observable, Subject } from 'rxjs'; -import { Form } from '../models/form.model'; -import { TaskListService } from './../services/tasklist.service'; +import { Form } from '../../models/form.model'; +import { TaskListService } from '../../services/tasklist.service'; import { switchMap, defaultIfEmpty, takeUntil } from 'rxjs/operators'; -import { UntypedFormBuilder, AbstractControl, Validators, UntypedFormGroup, UntypedFormControl } from '@angular/forms'; +import { UntypedFormBuilder, AbstractControl, Validators, UntypedFormGroup, UntypedFormControl, ReactiveFormsModule } from '@angular/forms'; import { isValid } from 'date-fns'; import { TaskRepresentation } from '@alfresco/js-api'; +import { CommonModule } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatCardModule } from '@angular/material/card'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatIconModule } from '@angular/material/icon'; +import { MatSelectModule } from '@angular/material/select'; +import { MatButtonModule } from '@angular/material/button'; +import { PeopleWidgetComponent } from '../../../form'; const FORMAT_DATE = 'DD/MM/YYYY'; const MAX_LENGTH = 255; @Component({ selector: 'adf-start-task', + standalone: true, + imports: [ + CommonModule, + TranslateModule, + MatCardModule, + ReactiveFormsModule, + MatFormFieldModule, + MatInputModule, + MatDatepickerModule, + MatIconModule, + MatSelectModule, + MatButtonModule, + PeopleWidgetComponent + ], templateUrl: './start-task.component.html', styleUrls: ['./start-task.component.scss'], providers: [ diff --git a/lib/process-services/src/lib/task-list/components/task-audit.directive.spec.ts b/lib/process-services/src/lib/task-list/components/task-audit/task-audit.directive.spec.ts similarity index 97% rename from lib/process-services/src/lib/task-list/components/task-audit.directive.spec.ts rename to lib/process-services/src/lib/task-list/components/task-audit/task-audit.directive.spec.ts index 99f1d79769..1a9cea71e3 100644 --- a/lib/process-services/src/lib/task-list/components/task-audit.directive.spec.ts +++ b/lib/process-services/src/lib/task-list/components/task-audit/task-audit.directive.spec.ts @@ -18,8 +18,8 @@ import { Component } from '@angular/core'; import { ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing'; import { of } from 'rxjs'; -import { TaskListService } from './../services/tasklist.service'; -import { ProcessTestingModule } from '../../testing/process.testing.module'; +import { TaskListService } from '../../services/tasklist.service'; +import { ProcessTestingModule } from '../../../testing/process.testing.module'; declare let jasmine: any; diff --git a/lib/process-services/src/lib/task-list/components/task-audit.directive.ts b/lib/process-services/src/lib/task-list/components/task-audit/task-audit.directive.ts similarity index 92% rename from lib/process-services/src/lib/task-list/components/task-audit.directive.ts rename to lib/process-services/src/lib/task-list/components/task-audit/task-audit.directive.ts index b9660ee49c..b458ced07c 100644 --- a/lib/process-services/src/lib/task-list/components/task-audit.directive.ts +++ b/lib/process-services/src/lib/task-list/components/task-audit/task-audit.directive.ts @@ -19,7 +19,7 @@ import { DownloadService } from '@alfresco/adf-core'; import { Directive, EventEmitter, Input, OnChanges, Output } from '@angular/core'; -import { TaskListService } from './../services/tasklist.service'; +import { TaskListService } from '../../services/tasklist.service'; const JSON_FORMAT: string = 'json'; const PDF_FORMAT: string = 'pdf'; @@ -27,13 +27,13 @@ const PDF_FORMAT: string = 'pdf'; @Directive({ // eslint-disable-next-line @angular-eslint/directive-selector selector: 'button[adf-task-audit]', + standalone: true, host: { role: 'button', '(click)': 'onClickAudit()' } }) export class TaskAuditDirective implements OnChanges { - /** (**required**) The id of the task. */ @Input('task-id') taskId: string; @@ -60,9 +60,7 @@ export class TaskAuditDirective implements OnChanges { public audit: any; - constructor(private downloadService: DownloadService, - private taskListService: TaskListService) { - } + constructor(private downloadService: DownloadService, private taskListService: TaskListService) {} ngOnChanges(): void { if (!this.isValidType()) { @@ -93,7 +91,8 @@ export class TaskAuditDirective implements OnChanges { }, (err) => { this.error.emit(err); - }); + } + ); } else { this.taskListService.fetchTaskAuditJsonById(this.taskId).subscribe( (res) => { @@ -102,7 +101,8 @@ export class TaskAuditDirective implements OnChanges { }, (err) => { this.error.emit(err); - }); + } + ); } } @@ -117,5 +117,4 @@ export class TaskAuditDirective implements OnChanges { isPdfFormat() { return this.format === PDF_FORMAT; } - } diff --git a/lib/process-services/src/lib/task-list/components/task-details.component.html b/lib/process-services/src/lib/task-list/components/task-details/task-details.component.html similarity index 100% rename from lib/process-services/src/lib/task-list/components/task-details.component.html rename to lib/process-services/src/lib/task-list/components/task-details/task-details.component.html diff --git a/lib/process-services/src/lib/task-list/components/task-details.component.scss b/lib/process-services/src/lib/task-list/components/task-details/task-details.component.scss similarity index 100% rename from lib/process-services/src/lib/task-list/components/task-details.component.scss rename to lib/process-services/src/lib/task-list/components/task-details/task-details.component.scss diff --git a/lib/process-services/src/lib/task-list/components/task-details.component.spec.ts b/lib/process-services/src/lib/task-list/components/task-details/task-details.component.spec.ts similarity index 96% rename from lib/process-services/src/lib/task-list/components/task-details.component.spec.ts rename to lib/process-services/src/lib/task-list/components/task-details/task-details.component.spec.ts index b1f7c3e318..02fc2821e1 100644 --- a/lib/process-services/src/lib/task-list/components/task-details.component.spec.ts +++ b/lib/process-services/src/lib/task-list/components/task-details/task-details.component.spec.ts @@ -20,14 +20,14 @@ import { ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { of, throwError } from 'rxjs'; import { FormModel, FormOutcomeEvent, FormOutcomeModel, CommentModel, User } from '@alfresco/adf-core'; -import { noDataMock, taskDetailsMock, taskFormMock, tasksMock, taskDetailsWithOutAssigneeMock } from '../../mock'; -import { TaskListService } from './../services/tasklist.service'; +import { noDataMock, taskDetailsMock, taskFormMock, tasksMock, taskDetailsWithOutAssigneeMock } from '../../../mock'; +import { TaskListService } from '../../services/tasklist.service'; import { TaskDetailsComponent } from './task-details.component'; -import { ProcessTestingModule } from '../../testing/process.testing.module'; -import { TaskService } from '../../form/services/task.service'; -import { TaskFormService } from '../../form/services/task-form.service'; -import { TaskCommentsService } from '../../task-comments/services/task-comments.service'; -import { PeopleProcessService } from '../../common/services/people-process.service'; +import { ProcessTestingModule } from '../../../testing/process.testing.module'; +import { TaskService } from '../../../form/services/task.service'; +import { TaskFormService } from '../../../form/services/task-form.service'; +import { TaskCommentsService } from '../../../task-comments/task-comments.service'; +import { PeopleProcessService } from '../../../common/services/people-process.service'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { HarnessLoader } from '@angular/cdk/testing'; import { MatDialogHarness } from '@angular/material/dialog/testing'; @@ -63,7 +63,7 @@ describe('TaskDetailsComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ProcessTestingModule], + imports: [ProcessTestingModule, TaskDetailsComponent], schemas: [NO_ERRORS_SCHEMA] }); peopleProcessService = TestBed.inject(PeopleProcessService); diff --git a/lib/process-services/src/lib/task-list/components/task-details.component.ts b/lib/process-services/src/lib/task-list/components/task-details/task-details.component.ts similarity index 90% rename from lib/process-services/src/lib/task-list/components/task-details.component.ts rename to lib/process-services/src/lib/task-list/components/task-details/task-details.component.ts index 58e16ddd84..dfe9877c2f 100644 --- a/lib/process-services/src/lib/task-list/components/task-details.component.ts +++ b/lib/process-services/src/lib/task-list/components/task-details/task-details.component.ts @@ -22,6 +22,7 @@ import { FormFieldValidator, FormModel, FormOutcomeEvent, + InfoDrawerModule, UpdateNotification } from '@alfresco/adf-core'; import { @@ -37,16 +38,39 @@ import { ViewChild, ViewEncapsulation } from '@angular/core'; -import { MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { MatDialog, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { Observable, Observer, of, Subject } from 'rxjs'; -import { TaskListService } from './../services/tasklist.service'; +import { TaskListService } from '../../services/tasklist.service'; import { catchError, share, takeUntil } from 'rxjs/operators'; -import { TaskFormComponent } from './task-form/task-form.component'; -import { PeopleProcessService } from '../../common/services/people-process.service'; +import { TaskFormComponent } from '../task-form/task-form.component'; +import { PeopleProcessService } from '../../../common/services/people-process.service'; import { LightUserRepresentation, TaskQueryRepresentation, TaskRepresentation } from '@alfresco/js-api'; +import { CommonModule } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; +import { AttachFormComponent } from '../attach-form/attach-form.component'; +import { PeopleComponent, PeopleSearchComponent } from '../../../people'; +import { TaskHeaderComponent } from '../task-header/task-header.component'; +import { TaskCommentsComponent } from '../../../task-comments'; +import { ChecklistComponent } from '../checklist/checklist.component'; +import { MatButtonModule } from '@angular/material/button'; @Component({ selector: 'adf-task-details', + standalone: true, + imports: [ + CommonModule, + TranslateModule, + TaskFormComponent, + AttachFormComponent, + InfoDrawerModule, + PeopleSearchComponent, + TaskHeaderComponent, + PeopleComponent, + TaskCommentsComponent, + ChecklistComponent, + MatDialogModule, + MatButtonModule + ], templateUrl: './task-details.component.html', styleUrls: ['./task-details.component.scss'], encapsulation: ViewEncapsulation.None diff --git a/lib/process-services/src/lib/task-list/components/task-filters.component.html b/lib/process-services/src/lib/task-list/components/task-filters/task-filters.component.html similarity index 100% rename from lib/process-services/src/lib/task-list/components/task-filters.component.html rename to lib/process-services/src/lib/task-list/components/task-filters/task-filters.component.html diff --git a/lib/process-services/src/lib/task-list/components/task-filters.component.scss b/lib/process-services/src/lib/task-list/components/task-filters/task-filters.component.scss similarity index 100% rename from lib/process-services/src/lib/task-list/components/task-filters.component.scss rename to lib/process-services/src/lib/task-list/components/task-filters/task-filters.component.scss diff --git a/lib/process-services/src/lib/task-list/components/task-filters.component.spec.ts b/lib/process-services/src/lib/task-list/components/task-filters/task-filters.component.spec.ts similarity index 97% rename from lib/process-services/src/lib/task-list/components/task-filters.component.spec.ts rename to lib/process-services/src/lib/task-list/components/task-filters/task-filters.component.spec.ts index a0f19e5e99..13b4067e10 100644 --- a/lib/process-services/src/lib/task-list/components/task-filters.component.spec.ts +++ b/lib/process-services/src/lib/task-list/components/task-filters/task-filters.component.spec.ts @@ -17,13 +17,13 @@ import { SimpleChange } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { AppsProcessService } from '../../app-list/services/apps-process.service'; +import { AppsProcessService } from '../../../services/apps-process.service'; import { AppConfigService } from '@alfresco/adf-core'; import { of, throwError } from 'rxjs'; -import { TaskListService } from '../services/tasklist.service'; -import { TaskFilterService } from '../services/task-filter.service'; +import { TaskListService } from '../../services/tasklist.service'; +import { TaskFilterService } from '../../services/task-filter.service'; import { TaskFiltersComponent } from './task-filters.component'; -import { ProcessTestingModule } from '../../testing/process.testing.module'; +import { ProcessTestingModule } from '../../../testing/process.testing.module'; import { By } from '@angular/platform-browser'; import { NavigationStart, Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; @@ -60,7 +60,7 @@ describe('TaskFiltersComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ProcessTestingModule, RouterTestingModule] + imports: [ProcessTestingModule, RouterTestingModule, TaskFiltersComponent] }); const appConfig: AppConfigService = TestBed.inject(AppConfigService); appConfig.config.bpmHost = 'http://localhost:9876/bpm'; diff --git a/lib/process-services/src/lib/task-list/components/task-filters.component.ts b/lib/process-services/src/lib/task-list/components/task-filters/task-filters.component.ts similarity index 93% rename from lib/process-services/src/lib/task-list/components/task-filters.component.ts rename to lib/process-services/src/lib/task-list/components/task-filters/task-filters.component.ts index b0029f306d..4a76cb6291 100644 --- a/lib/process-services/src/lib/task-list/components/task-filters.component.ts +++ b/lib/process-services/src/lib/task-list/components/task-filters/task-filters.component.ts @@ -15,18 +15,24 @@ * limitations under the License. */ -import { AppsProcessService } from '../../app-list/services/apps-process.service'; +import { AppsProcessService } from '../../../services/apps-process.service'; import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges, ViewEncapsulation } from '@angular/core'; import { Subject } from 'rxjs'; -import { TaskFilterService } from './../services/task-filter.service'; -import { TaskListService } from './../services/tasklist.service'; -import { IconModel } from '../../app-list/icon.model'; +import { TaskFilterService } from '../../services/task-filter.service'; +import { TaskListService } from '../../services/tasklist.service'; +import { IconModel } from '../../../app-list/icon.model'; import { ActivatedRoute, NavigationStart, Router } from '@angular/router'; import { filter, takeUntil } from 'rxjs/operators'; import { UserTaskFilterRepresentation } from '@alfresco/js-api'; +import { CommonModule } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatButtonModule } from '@angular/material/button'; +import { IconComponent } from '@alfresco/adf-core'; @Component({ selector: 'adf-task-filters', + standalone: true, + imports: [CommonModule, TranslateModule, MatButtonModule, IconComponent], templateUrl: './task-filters.component.html', styleUrls: ['./task-filters.component.scss'], encapsulation: ViewEncapsulation.None diff --git a/lib/process-services/src/lib/task-list/components/task-form/claim-task.directive.ts b/lib/process-services/src/lib/task-list/components/task-form/claim-task.directive.ts index deb57a3a70..e622e097d5 100644 --- a/lib/process-services/src/lib/task-list/components/task-form/claim-task.directive.ts +++ b/lib/process-services/src/lib/task-list/components/task-form/claim-task.directive.ts @@ -20,7 +20,8 @@ import { TaskListService } from '../../services/tasklist.service'; @Directive({ // eslint-disable-next-line @angular-eslint/directive-selector - selector: '[adf-claim-task]' + selector: '[adf-claim-task]', + standalone: true }) export class ClaimTaskDirective implements OnInit { /** (Required) The id of the task. */ diff --git a/lib/process-services/src/lib/task-list/components/task-form/task-form.component.ts b/lib/process-services/src/lib/task-list/components/task-form/task-form.component.ts index 1414fb4277..ad70586105 100644 --- a/lib/process-services/src/lib/task-list/components/task-form/task-form.component.ts +++ b/lib/process-services/src/lib/task-list/components/task-form/task-form.component.ts @@ -16,14 +16,45 @@ */ import { Component, OnInit, Input, Output, EventEmitter, SimpleChanges, ViewEncapsulation, OnChanges } from '@angular/core'; -import { FormModel, ContentLinkModel, FormFieldValidator, FormOutcomeEvent, TranslationService, FormFieldModel } from '@alfresco/adf-core'; +import { + FormModel, + ContentLinkModel, + FormFieldValidator, + FormOutcomeEvent, + TranslationService, + FormFieldModel, + EmptyContentComponent +} from '@alfresco/adf-core'; import { TaskListService } from '../../services/tasklist.service'; import { TaskRepresentation, UserRepresentation } from '@alfresco/js-api'; import { Observable } from 'rxjs'; import { PeopleProcessService } from '../../../common'; +import { CommonModule } from '@angular/common'; +import { MatCardModule } from '@angular/material/card'; +import { MatButtonModule } from '@angular/material/button'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { ClaimTaskDirective } from './claim-task.directive'; +import { UnclaimTaskDirective } from './unclaim-task.directive'; +import { TaskStandaloneComponent } from '../task-standalone/task-standalone.component'; +import { FormComponent, FormCustomOutcomesComponent } from '../../../form'; @Component({ selector: 'adf-task-form', + standalone: true, + imports: [ + CommonModule, + MatCardModule, + EmptyContentComponent, + MatButtonModule, + TranslateModule, + MatProgressSpinnerModule, + ClaimTaskDirective, + UnclaimTaskDirective, + TaskStandaloneComponent, + FormComponent, + FormCustomOutcomesComponent + ], templateUrl: './task-form.component.html', styleUrls: ['./task-form.component.scss'], encapsulation: ViewEncapsulation.None @@ -308,6 +339,10 @@ export class TaskFormComponent implements OnInit, OnChanges { return this.isCandidateMember() && this.isAssignedToMe() && !this.isCompletedTask(); } + reloadTask() { + this.loadTask(this.taskId); + } + onClaimTask(taskId: string) { this.taskClaimed.emit(taskId); } diff --git a/lib/process-services/src/lib/task-list/components/task-form/unclaim-task.directive.ts b/lib/process-services/src/lib/task-list/components/task-form/unclaim-task.directive.ts index 5faeddd2e6..d27806e539 100644 --- a/lib/process-services/src/lib/task-list/components/task-form/unclaim-task.directive.ts +++ b/lib/process-services/src/lib/task-list/components/task-form/unclaim-task.directive.ts @@ -20,7 +20,8 @@ import { TaskListService } from '../../services/tasklist.service'; @Directive({ // eslint-disable-next-line @angular-eslint/directive-selector - selector: '[adf-unclaim-task]' + selector: '[adf-unclaim-task]', + standalone: true }) export class UnclaimTaskDirective implements OnInit { /** (Required) The id of the task. */ diff --git a/lib/process-services/src/lib/task-list/components/task-header.component.html b/lib/process-services/src/lib/task-list/components/task-header/task-header.component.html similarity index 100% rename from lib/process-services/src/lib/task-list/components/task-header.component.html rename to lib/process-services/src/lib/task-list/components/task-header/task-header.component.html diff --git a/lib/process-services/src/lib/task-list/components/task-header.component.scss b/lib/process-services/src/lib/task-list/components/task-header/task-header.component.scss similarity index 100% rename from lib/process-services/src/lib/task-list/components/task-header.component.scss rename to lib/process-services/src/lib/task-list/components/task-header/task-header.component.scss diff --git a/lib/process-services/src/lib/task-list/components/task-header.component.spec.ts b/lib/process-services/src/lib/task-list/components/task-header/task-header.component.spec.ts similarity index 98% rename from lib/process-services/src/lib/task-list/components/task-header.component.spec.ts rename to lib/process-services/src/lib/task-list/components/task-header/task-header.component.spec.ts index ba4215a443..a634babab5 100644 --- a/lib/process-services/src/lib/task-list/components/task-header.component.spec.ts +++ b/lib/process-services/src/lib/task-list/components/task-header/task-header.component.spec.ts @@ -26,11 +26,11 @@ import { claimedTaskDetailsMock, claimedByGroupMemberMock, taskDetailsWithOutCandidateGroup -} from '../../mock'; -import { TaskListService } from './../services/tasklist.service'; +} from '../../../mock'; +import { TaskListService } from '../../services/tasklist.service'; import { TaskHeaderComponent } from './task-header.component'; -import { ProcessTestingModule } from '../../testing/process.testing.module'; -import { PeopleProcessService } from '../../common/services/people-process.service'; +import { ProcessTestingModule } from '../../../testing/process.testing.module'; +import { PeopleProcessService } from '../../../common/services/people-process.service'; import { TaskRepresentation } from '@alfresco/js-api'; describe('TaskHeaderComponent', () => { @@ -56,7 +56,7 @@ describe('TaskHeaderComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ProcessTestingModule] + imports: [ProcessTestingModule, TaskHeaderComponent] }); fixture = TestBed.createComponent(TaskHeaderComponent); component = fixture.componentInstance; diff --git a/lib/process-services/src/lib/task-list/components/task-header.component.ts b/lib/process-services/src/lib/task-list/components/task-header/task-header.component.ts similarity index 93% rename from lib/process-services/src/lib/task-list/components/task-header.component.ts rename to lib/process-services/src/lib/task-list/components/task-header/task-header.component.ts index 941cffaaa0..cbbede0216 100644 --- a/lib/process-services/src/lib/task-list/components/task-header.component.ts +++ b/lib/process-services/src/lib/task-list/components/task-header/task-header.component.ts @@ -24,14 +24,23 @@ import { TranslationService, AppConfigService, CardViewIntItemModel, - CardViewItemLengthValidator + CardViewItemLengthValidator, + CardViewModule } from '@alfresco/adf-core'; -import { PeopleProcessService } from '../../common/services/people-process.service'; -import { TaskDescriptionValidator } from '../validators/task-description.validator'; +import { PeopleProcessService } from '../../../common/services/people-process.service'; +import { TaskDescriptionValidator } from '../../validators/task-description.validator'; import { TaskRepresentation } from '@alfresco/js-api'; +import { CommonModule } from '@angular/common'; +import { MatCardModule } from '@angular/material/card'; +import { MatButtonModule } from '@angular/material/button'; +import { UnclaimTaskDirective } from '../task-form/unclaim-task.directive'; +import { ClaimTaskDirective } from '../task-form/claim-task.directive'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'adf-task-header', + standalone: true, + imports: [CommonModule, MatCardModule, CardViewModule, MatButtonModule, UnclaimTaskDirective, ClaimTaskDirective, TranslateModule], templateUrl: './task-header.component.html', styleUrls: ['./task-header.component.scss'], encapsulation: ViewEncapsulation.None diff --git a/lib/process-services/src/lib/task-list/components/task-list.component.css b/lib/process-services/src/lib/task-list/components/task-list/task-list.component.css similarity index 100% rename from lib/process-services/src/lib/task-list/components/task-list.component.css rename to lib/process-services/src/lib/task-list/components/task-list/task-list.component.css diff --git a/lib/process-services/src/lib/task-list/components/task-list.component.html b/lib/process-services/src/lib/task-list/components/task-list/task-list.component.html similarity index 100% rename from lib/process-services/src/lib/task-list/components/task-list.component.html rename to lib/process-services/src/lib/task-list/components/task-list/task-list.component.html diff --git a/lib/process-services/src/lib/task-list/components/task-list.component.spec.ts b/lib/process-services/src/lib/task-list/components/task-list/task-list.component.spec.ts similarity index 99% rename from lib/process-services/src/lib/task-list/components/task-list.component.spec.ts rename to lib/process-services/src/lib/task-list/components/task-list/task-list.component.spec.ts index 36479b3c1f..3dce1f76a0 100644 --- a/lib/process-services/src/lib/task-list/components/task-list.component.spec.ts +++ b/lib/process-services/src/lib/task-list/components/task-list/task-list.component.spec.ts @@ -19,10 +19,10 @@ import { Component, SimpleChange, ViewChild, OnInit, Output, EventEmitter, Simpl import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { AppConfigService, DataRowEvent, ObjectDataRow, DataCellEvent, ObjectDataColumn } from '@alfresco/adf-core'; -import { TaskListService } from '../services/tasklist.service'; +import { TaskListService } from '../../services/tasklist.service'; import { TaskListComponent } from './task-list.component'; -import { ProcessTestingModule } from '../../testing/process.testing.module'; -import { fakeGlobalTask, fakeEmptyTask, paginatedTask, fakeColumnSchema, fakeCustomSchema } from '../../mock'; +import { ProcessTestingModule } from '../../../testing/process.testing.module'; +import { fakeGlobalTask, fakeEmptyTask, paginatedTask, fakeColumnSchema, fakeCustomSchema } from '../../../mock'; import { TranslateService } from '@ngx-translate/core'; import { of, Subject } from 'rxjs'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; @@ -93,7 +93,7 @@ describe('TaskListComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ProcessTestingModule] + imports: [ProcessTestingModule, TaskListComponent] }); appConfig = TestBed.inject(AppConfigService); appConfig.config.bpmHost = 'http://localhost:9876/bpm'; diff --git a/lib/process-services/src/lib/task-list/components/task-list.component.ts b/lib/process-services/src/lib/task-list/components/task-list/task-list.component.ts similarity index 96% rename from lib/process-services/src/lib/task-list/components/task-list.component.ts rename to lib/process-services/src/lib/task-list/components/task-list/task-list.component.ts index b74a81222c..59bbd55418 100644 --- a/lib/process-services/src/lib/task-list/components/task-list.component.ts +++ b/lib/process-services/src/lib/task-list/components/task-list/task-list.component.ts @@ -27,19 +27,26 @@ import { UserPreferenceValues, PaginationModel, DataCellEvent, - DEFAULT_PAGINATION + DEFAULT_PAGINATION, + DataTableModule, + EmptyContentComponent } from '@alfresco/adf-core'; import { AfterContentInit, Component, ContentChild, EventEmitter, Input, OnChanges, Output, SimpleChanges, OnDestroy, OnInit } from '@angular/core'; import { BehaviorSubject, Subject } from 'rxjs'; -import { taskPresetsDefaultModel } from '../models/task-preset.model'; -import { TaskListService } from './../services/tasklist.service'; +import { taskPresetsDefaultModel } from '../../models/task-preset.model'; +import { TaskListService } from '../../services/tasklist.service'; import { takeUntil, finalize } from 'rxjs/operators'; import { TaskQueryRepresentation, TaskRepresentation } from '@alfresco/js-api'; +import { CommonModule } from '@angular/common'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { TranslateModule } from '@ngx-translate/core'; export const PRESET_KEY = 'adf-task-list.presets'; @Component({ selector: 'adf-tasklist', + standalone: true, + imports: [CommonModule, DataTableModule, MatProgressSpinnerModule, EmptyContentComponent, TranslateModule], templateUrl: './task-list.component.html', styleUrls: ['./task-list.component.css'] }) diff --git a/lib/process-services/src/lib/task-list/components/task-standalone.component.html b/lib/process-services/src/lib/task-list/components/task-standalone/task-standalone.component.html similarity index 100% rename from lib/process-services/src/lib/task-list/components/task-standalone.component.html rename to lib/process-services/src/lib/task-list/components/task-standalone/task-standalone.component.html diff --git a/lib/process-services/src/lib/task-list/components/task-standalone.component.scss b/lib/process-services/src/lib/task-list/components/task-standalone/task-standalone.component.scss similarity index 100% rename from lib/process-services/src/lib/task-list/components/task-standalone.component.scss rename to lib/process-services/src/lib/task-list/components/task-standalone/task-standalone.component.scss diff --git a/lib/process-services/src/lib/task-list/components/task-standalone.component.spec.ts b/lib/process-services/src/lib/task-list/components/task-standalone/task-standalone.component.spec.ts similarity index 97% rename from lib/process-services/src/lib/task-list/components/task-standalone.component.spec.ts rename to lib/process-services/src/lib/task-list/components/task-standalone/task-standalone.component.spec.ts index 3a440007b2..acab8686d2 100644 --- a/lib/process-services/src/lib/task-list/components/task-standalone.component.spec.ts +++ b/lib/process-services/src/lib/task-list/components/task-standalone/task-standalone.component.spec.ts @@ -17,7 +17,7 @@ import { TaskStandaloneComponent } from './task-standalone.component'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ProcessTestingModule } from '../../testing/process.testing.module'; +import { ProcessTestingModule } from '../../../testing/process.testing.module'; describe('TaskStandaloneComponent', () => { let component: TaskStandaloneComponent; @@ -26,7 +26,7 @@ describe('TaskStandaloneComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ProcessTestingModule] + imports: [ProcessTestingModule, TaskStandaloneComponent] }); fixture = TestBed.createComponent(TaskStandaloneComponent); component = fixture.componentInstance; diff --git a/lib/process-services/src/lib/task-list/components/task-standalone.component.ts b/lib/process-services/src/lib/task-list/components/task-standalone/task-standalone.component.ts similarity index 87% rename from lib/process-services/src/lib/task-list/components/task-standalone.component.ts rename to lib/process-services/src/lib/task-list/components/task-standalone/task-standalone.component.ts index 78c49751d6..7a71c1451b 100644 --- a/lib/process-services/src/lib/task-list/components/task-standalone.component.ts +++ b/lib/process-services/src/lib/task-list/components/task-standalone/task-standalone.component.ts @@ -16,9 +16,15 @@ */ import { Component, EventEmitter, Input, Output, ViewEncapsulation } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatCardModule } from '@angular/material/card'; +import { MatButtonModule } from '@angular/material/button'; @Component({ selector: 'adf-task-standalone', + standalone: true, + imports: [CommonModule, TranslateModule, MatCardModule, MatButtonModule], templateUrl: './task-standalone.component.html', styleUrls: ['./task-standalone.component.scss'], encapsulation: ViewEncapsulation.None diff --git a/lib/process-services/src/lib/task-list/public-api.ts b/lib/process-services/src/lib/task-list/public-api.ts index c2d256ee13..f0f331f779 100644 --- a/lib/process-services/src/lib/task-list/public-api.ts +++ b/lib/process-services/src/lib/task-list/public-api.ts @@ -15,19 +15,33 @@ * limitations under the License. */ -export * from './components/task-list.component'; -export * from './components/checklist.component'; -export * from './components/task-header.component'; -export * from './components/no-task-detail-template.directive'; -export * from './components/task-filters.component'; +import { ClaimTaskDirective } from './components/task-form/claim-task.directive'; +import { UnclaimTaskDirective } from './components/task-form/unclaim-task.directive'; +import { TaskFormComponent } from './components/task-form/task-form.component'; +import { AttachFormComponent } from './components/attach-form/attach-form.component'; +import { ChecklistComponent } from './components/checklist/checklist.component'; +import { NoTaskDetailsTemplateDirective } from './components/no-task-details/no-task-detail-template.directive'; +import { TaskAuditDirective } from './components/task-audit/task-audit.directive'; +import { TaskFiltersComponent } from './components/task-filters/task-filters.component'; +import { TaskListComponent } from './components/task-list/task-list.component'; +import { TaskDetailsComponent } from './components/task-details/task-details.component'; +import { TaskHeaderComponent } from './components/task-header/task-header.component'; +import { StartTaskComponent } from './components/start-task/start-task.component'; +import { TaskStandaloneComponent } from './components/task-standalone/task-standalone.component'; + +export * from './components/task-list/task-list.component'; +export * from './components/checklist/checklist.component'; +export * from './components/task-header/task-header.component'; +export * from './components/no-task-details/no-task-detail-template.directive'; +export * from './components/task-filters/task-filters.component'; export * from './components/task-form/task-form.component'; export * from './components/task-form/claim-task.directive'; export * from './components/task-form/unclaim-task.directive'; -export * from './components/task-details.component'; -export * from './components/task-audit.directive'; -export * from './components/start-task.component'; -export * from './components/task-standalone.component'; -export * from './components/attach-form.component'; +export * from './components/task-details/task-details.component'; +export * from './components/task-audit/task-audit.directive'; +export * from './components/start-task/start-task.component'; +export * from './components/task-standalone/task-standalone.component'; +export * from './components/attach-form/attach-form.component'; export * from './services/tasklist.service'; export * from './services/process-upload.service'; @@ -39,4 +53,18 @@ export * from './models/task-details.event'; export * from './models/user-event.model'; export * from './models/user-group.model'; -export * from './task-list.module'; +export const TASK_LIST_DIRECTIVES = [ + TaskFormComponent, + AttachFormComponent, + ChecklistComponent, + TaskFiltersComponent, + TaskListComponent, + TaskDetailsComponent, + TaskHeaderComponent, + StartTaskComponent, + TaskStandaloneComponent, + ClaimTaskDirective, + UnclaimTaskDirective, + NoTaskDetailsTemplateDirective, + TaskAuditDirective +] as const; diff --git a/lib/process-services/src/lib/task-list/task-list.module.ts b/lib/process-services/src/lib/task-list/task-list.module.ts deleted file mode 100644 index 89b8da898a..0000000000 --- a/lib/process-services/src/lib/task-list/task-list.module.ts +++ /dev/null @@ -1,88 +0,0 @@ -/*! - * @license - * Copyright © 2005-2024 Hyland Software, Inc. and its affiliates. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; -import { CoreModule } from '@alfresco/adf-core'; -import { ProcessCommentsModule } from '../process-comments/process-comments.module'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; - -import { MaterialModule } from '../material.module'; -import { PeopleModule } from '../people/people.module'; -import { ContentWidgetModule } from '../form/widgets/content-widget/content-widget.module'; - -import { ChecklistComponent } from './components/checklist.component'; -import { NoTaskDetailsTemplateDirective } from './components/no-task-detail-template.directive'; -import { StartTaskComponent } from './components/start-task.component'; -import { TaskAuditDirective } from './components/task-audit.directive'; -import { TaskDetailsComponent } from './components/task-details.component'; -import { TaskFormComponent } from './components/task-form/task-form.component'; -import { TaskFiltersComponent } from './components/task-filters.component'; -import { TaskHeaderComponent } from './components/task-header.component'; -import { TaskListComponent } from './components/task-list.component'; -import { TaskStandaloneComponent } from './components/task-standalone.component'; -import { AttachFormComponent } from './components/attach-form.component'; -import { FormModule } from '../form/form.module'; -import { ClaimTaskDirective } from './components/task-form/claim-task.directive'; -import { UnclaimTaskDirective } from './components/task-form/unclaim-task.directive'; -import { TaskCommentsModule } from '../task-comments/task-comments.module'; - -@NgModule({ - imports: [ - CommonModule, - MaterialModule, - FormsModule, - FormModule, - ReactiveFormsModule, - CoreModule, - PeopleModule, - ProcessCommentsModule, - ContentWidgetModule, - TaskCommentsModule - ], - declarations: [ - NoTaskDetailsTemplateDirective, - TaskFiltersComponent, - TaskListComponent, - TaskDetailsComponent, - TaskFormComponent, - TaskAuditDirective, - ChecklistComponent, - TaskHeaderComponent, - StartTaskComponent, - TaskStandaloneComponent, - AttachFormComponent, - ClaimTaskDirective, - UnclaimTaskDirective - ], - exports: [ - NoTaskDetailsTemplateDirective, - TaskFiltersComponent, - TaskListComponent, - TaskDetailsComponent, - TaskFormComponent, - TaskAuditDirective, - ChecklistComponent, - TaskHeaderComponent, - StartTaskComponent, - TaskStandaloneComponent, - AttachFormComponent, - ClaimTaskDirective, - UnclaimTaskDirective - ] -}) -export class TaskListModule {} diff --git a/lib/process-services/src/lib/testing/process.testing.module.ts b/lib/process-services/src/lib/testing/process.testing.module.ts index 1b5a59bbaa..dd9c4a24df 100644 --- a/lib/process-services/src/lib/testing/process.testing.module.ts +++ b/lib/process-services/src/lib/testing/process.testing.module.ts @@ -26,7 +26,8 @@ import { TranslationService, TranslationMock, CoreModule, - FormRenderingService, AuthModule + FormRenderingService, + AuthModule } from '@alfresco/adf-core'; import { TranslateModule } from '@ngx-translate/core'; import { ProcessFormRenderingService } from '../form/process-form-rendering.service'; @@ -38,7 +39,7 @@ import { RouterTestingModule } from '@angular/router/testing'; NoopAnimationsModule, TranslateModule.forRoot(), CoreModule.forRoot(), - ProcessModule, + ProcessModule.forRoot(), RouterTestingModule ], providers: [ @@ -48,11 +49,6 @@ import { RouterTestingModule } from '@angular/router/testing'; FormRenderingService, { provide: FormRenderingService, useClass: ProcessFormRenderingService } ], - exports: [ - NoopAnimationsModule, - TranslateModule, - CoreModule, - ProcessModule - ] + exports: [NoopAnimationsModule, TranslateModule, CoreModule, ProcessModule] }) export class ProcessTestingModule {} diff --git a/lib/process-services/src/public-api.ts b/lib/process-services/src/public-api.ts index 583686cf07..6ce6e7eef4 100644 --- a/lib/process-services/src/public-api.ts +++ b/lib/process-services/src/public-api.ts @@ -25,6 +25,5 @@ export * from './lib/process-comments/index'; export * from './lib/people/index'; export * from './lib/form/index'; export * from './lib/task-comments/index'; -export * from './lib/material.module'; export * from './lib/process.module'; export * from './lib/compat/types';