From b48248fae7d29e2ef80d09d69cc8b5b07da218c4 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Mon, 2 Jan 2023 23:36:38 +0100 Subject: [PATCH] move app process service in process-service (#8087) --- docs/README.md | 2 +- docs/core/services/apps-process.service.md | 2 +- docs/upgrade-guide/upgrade50-60.md | 11 +++++++---- lib/core/src/lib/mock/public-api.ts | 2 -- lib/core/src/lib/services/public-api.ts | 1 - .../src/lib/app-list/apps-list.component.spec.ts | 3 ++- .../src/lib/app-list/apps-list.component.ts | 3 ++- .../src/lib/app-list/mocks}/apps-service.mock.ts | 0 lib/process-services/src/lib/app-list/public-api.ts | 2 ++ .../lib/app-list/select-apps-dialog.component.spec.ts | 3 ++- .../src/lib/app-list/select-apps-dialog.component.ts | 2 +- .../app-list}/services/apps-process.service.spec.ts | 5 ++--- .../lib/app-list}/services/apps-process.service.ts | 3 +-- .../components/process-filters.component.spec.ts | 3 ++- .../components/process-filters.component.ts | 2 +- .../components/start-process.component.spec.ts | 3 ++- .../components/start-process.component.ts | 2 +- .../components/task-filters.component.spec.ts | 3 ++- .../task-list/components/task-filters.component.ts | 2 +- 19 files changed, 30 insertions(+), 24 deletions(-) rename lib/{core/src/lib/mock => process-services/src/lib/app-list/mocks}/apps-service.mock.ts (100%) rename lib/{core/src/lib => process-services/src/lib/app-list}/services/apps-process.service.spec.ts (94%) rename lib/{core/src/lib => process-services/src/lib/app-list}/services/apps-process.service.ts (95%) diff --git a/docs/README.md b/docs/README.md index 5fb88557c7..48930bed8f 100644 --- a/docs/README.md +++ b/docs/README.md @@ -190,7 +190,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/core/src/lib/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/app-list/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/services/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/services/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/services/auth-guard-sso-role.service.ts) | diff --git a/docs/core/services/apps-process.service.md b/docs/core/services/apps-process.service.md index cf06f0abf7..379e0abaf8 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/core/src/lib/services/apps-process.service.ts "Defined in apps-process.service.ts") +# [Apps Process service](lib/process-services/src/lib/app-list/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/upgrade-guide/upgrade50-60.md b/docs/upgrade-guide/upgrade50-60.md index 5508371320..0e7c0b8658 100644 --- a/docs/upgrade-guide/upgrade50-60.md +++ b/docs/upgrade-guide/upgrade50-60.md @@ -89,10 +89,13 @@ How to fix it: ## Relocated classes | Class | Before | After | -| ----- | ------ | ----- | -| [`VersionCompatibilityService`](../../lib/content-services/src/lib/version-compatibility/version-compatibility.service.ts) | `@alfresco/adf-core` | `@alfresco/adf-content-services` | -| [`VersionCompatibilityDirective`](../content-services/directives/version-compatibility.directive.md) | `@alfresco/adf-core` | `@alfresco/adf-content-services` | -| [`SitesService`](../content-services/services/sites.service.md) | `@alfresco/adf-core` | `@alfresco/adf-content-services` | +| --- | -- | --- | +| `VersionCompatibilityService` | `@alfresco/adf-core` | `@alfresco/adf-content-services` | +| `VersionCompatibilityDirective` | `@alfresco/adf-core` | `@alfresco/adf-content-services` | +| `SitesService` | `@alfresco/adf-core` | `@alfresco/adf-content-services` | +| `SearchService` | `@alfresco/adf-core` | `@alfresco/adf-content-services` | +| `SearchConfigurationService` | `@alfresco/adf-core` | `@alfresco/adf-content-services` | +| `AppsProcessService` | `@alfresco/adf-core` | `@alfresco/adf-process-services` | Following classes have been relocated: diff --git a/lib/core/src/lib/mock/public-api.ts b/lib/core/src/lib/mock/public-api.ts index 5209e29c64..c57005d0f5 100644 --- a/lib/core/src/lib/mock/public-api.ts +++ b/lib/core/src/lib/mock/public-api.ts @@ -16,8 +16,6 @@ */ export * from './alfresco-api.mock'; -export * from '../common/mock/app-config.service.mock'; -export * from './apps-service.mock'; export * from './bpm-user.service.mock'; export * from './comment-process-service.mock'; export * from './cookie.service.mock'; diff --git a/lib/core/src/lib/services/public-api.ts b/lib/core/src/lib/services/public-api.ts index eb9136ca82..e44c2dac51 100644 --- a/lib/core/src/lib/services/public-api.ts +++ b/lib/core/src/lib/services/public-api.ts @@ -17,7 +17,6 @@ export * from './alfresco-api.service'; export * from './content.service'; -export * from './apps-process.service'; export * from './page-title.service'; export * from './renditions.service'; export * from './translation.service'; 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 c636b4930e..022a6cc72c 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,8 @@ import { DebugElement, Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { AppsProcessService, setupTestBed } from '@alfresco/adf-core'; +import { setupTestBed } from '@alfresco/adf-core'; +import { AppsProcessService } from './services/apps-process.service'; import { of, throwError } from 'rxjs'; import { defaultApp, deployedApps, nonDeployedApps } from '../mock/apps-list.mock'; 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 6ac54f9848..c7918dc619 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 @@ -15,7 +15,8 @@ * limitations under the License. */ -import { AppsProcessService, TranslationService, CustomEmptyContentTemplateDirective } from '@alfresco/adf-core'; +import { TranslationService, CustomEmptyContentTemplateDirective } from '@alfresco/adf-core'; +import { AppsProcessService } from './services/apps-process.service'; import { AfterContentInit, Component, EventEmitter, Input, OnInit, Output, ContentChild, OnDestroy, ViewEncapsulation } from '@angular/core'; import { Observable, Observer, of, Subject } from 'rxjs'; import { AppDefinitionRepresentationModel } from '../task-list'; diff --git a/lib/core/src/lib/mock/apps-service.mock.ts b/lib/process-services/src/lib/app-list/mocks/apps-service.mock.ts similarity index 100% rename from lib/core/src/lib/mock/apps-service.mock.ts rename to lib/process-services/src/lib/app-list/mocks/apps-service.mock.ts 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 bb25904cbe..d3501db2b0 100644 --- a/lib/process-services/src/lib/app-list/public-api.ts +++ b/lib/process-services/src/lib/app-list/public-api.ts @@ -18,4 +18,6 @@ export * from './apps-list.component'; export * from './select-apps-dialog.component'; +export * from './services/apps-process.service'; + export * from './apps-list.module'; diff --git a/lib/process-services/src/lib/app-list/select-apps-dialog.component.spec.ts b/lib/process-services/src/lib/app-list/select-apps-dialog.component.spec.ts index c968afe892..ba333b2ddc 100644 --- a/lib/process-services/src/lib/app-list/select-apps-dialog.component.spec.ts +++ b/lib/process-services/src/lib/app-list/select-apps-dialog.component.spec.ts @@ -19,7 +19,8 @@ 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, setupTestBed } from '@alfresco/adf-core'; +import { setupTestBed } from '@alfresco/adf-core'; +import { AppsProcessService } from './services/apps-process.service'; import { deployedApps } from '../mock/apps-list.mock'; import { of } from 'rxjs'; diff --git a/lib/process-services/src/lib/app-list/select-apps-dialog.component.ts b/lib/process-services/src/lib/app-list/select-apps-dialog.component.ts index b09e959e51..5dc410779f 100644 --- a/lib/process-services/src/lib/app-list/select-apps-dialog.component.ts +++ b/lib/process-services/src/lib/app-list/select-apps-dialog.component.ts @@ -15,9 +15,9 @@ * limitations under the License. */ -import { AppsProcessService } from '@alfresco/adf-core'; import { Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { AppsProcessService } from './services/apps-process.service'; @Component({ selector: 'adf-select-apps-dialog', diff --git a/lib/core/src/lib/services/apps-process.service.spec.ts b/lib/process-services/src/lib/app-list/services/apps-process.service.spec.ts similarity index 94% rename from lib/core/src/lib/services/apps-process.service.spec.ts rename to lib/process-services/src/lib/app-list/services/apps-process.service.spec.ts index 07d9266d9c..32c67d1fb9 100644 --- a/lib/core/src/lib/services/apps-process.service.spec.ts +++ b/lib/process-services/src/lib/app-list/services/apps-process.service.spec.ts @@ -16,10 +16,9 @@ */ import { TestBed } from '@angular/core/testing'; -import { fakeApps } from '../mock/apps-service.mock'; +import { fakeApps } from '../mocks/apps-service.mock'; import { AppsProcessService } from './apps-process.service'; -import { setupTestBed } from '../testing/setup-test-bed'; -import { CoreTestingModule } from '../testing/core.testing.module'; +import { setupTestBed, CoreTestingModule } from '@alfresco/adf-core'; import { TranslateModule } from '@ngx-translate/core'; declare let jasmine: any; diff --git a/lib/core/src/lib/services/apps-process.service.ts b/lib/process-services/src/lib/app-list/services/apps-process.service.ts similarity index 95% rename from lib/core/src/lib/services/apps-process.service.ts rename to lib/process-services/src/lib/app-list/services/apps-process.service.ts index 1bebe157a0..efc1ad2582 100644 --- a/lib/core/src/lib/services/apps-process.service.ts +++ b/lib/process-services/src/lib/app-list/services/apps-process.service.ts @@ -18,8 +18,7 @@ import { Injectable } from '@angular/core'; import { RuntimeAppDefinitionsApi, AppDefinitionRepresentation } from '@alfresco/js-api'; import { Observable, from, throwError } from 'rxjs'; -import { AlfrescoApiService } from './alfresco-api.service'; -import { LogService } from '../common/services/log.service'; +import { AlfrescoApiService, LogService } from '@alfresco/adf-core'; import { map, catchError } from 'rxjs/operators'; @Injectable({ 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.component.spec.ts index 75efb45ef9..62c58d5c47 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.component.spec.ts @@ -16,9 +16,10 @@ */ import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange } from '@angular/core'; -import { AppsProcessService, setupTestBed } from '@alfresco/adf-core'; +import { setupTestBed } from '@alfresco/adf-core'; import { from, of } from 'rxjs'; import { FilterProcessRepresentationModel } from '../models/filter-process.model'; +import { AppsProcessService } from '../../app-list/services/apps-process.service'; import { ProcessFilterService } from '../services/process-filter.service'; import { ProcessFiltersComponent } from './process-filters.component'; import { ComponentFixture, TestBed } from '@angular/core/testing'; 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.component.ts index b917fb2099..15dcb2696e 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.component.ts @@ -15,12 +15,12 @@ * limitations under the License. */ -import { AppsProcessService } from '@alfresco/adf-core'; import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewEncapsulation } from '@angular/core'; import { ProcessInstanceFilterRepresentation, UserProcessInstanceFilterRepresentation } from '@alfresco/js-api'; import { Observable } from 'rxjs'; import { FilterProcessRepresentationModel } from '../models/filter-process.model'; import { ProcessFilterService } from './../services/process-filter.service'; +import { AppsProcessService } from '../../app-list/services/apps-process.service'; import { IconModel } from '../../app-list/icon.model'; @Component({ diff --git a/lib/process-services/src/lib/process-list/components/start-process.component.spec.ts b/lib/process-services/src/lib/process-list/components/start-process.component.spec.ts index ebe5b27206..44c68854d1 100644 --- a/lib/process-services/src/lib/process-list/components/start-process.component.spec.ts +++ b/lib/process-services/src/lib/process-list/components/start-process.component.spec.ts @@ -17,7 +17,8 @@ import { DebugElement, SimpleChange } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { AppConfigService, setupTestBed, AppsProcessService } from '@alfresco/adf-core'; +import { AppConfigService, setupTestBed } from '@alfresco/adf-core'; +import { AppsProcessService } from '../../app-list/services/apps-process.service'; import { of, throwError } from 'rxjs'; import { MatSelectChange } from '@angular/material/select'; import { ProcessInstanceVariable } from '../models/process-instance-variable.model'; diff --git a/lib/process-services/src/lib/process-list/components/start-process.component.ts b/lib/process-services/src/lib/process-list/components/start-process.component.ts index 51d66cb8e5..b2c6495084 100644 --- a/lib/process-services/src/lib/process-list/components/start-process.component.ts +++ b/lib/process-services/src/lib/process-list/components/start-process.component.ts @@ -22,9 +22,9 @@ import { import { AppConfigService, AppConfigValues, - AppsProcessService, FormValues } from '@alfresco/adf-core'; +import { AppsProcessService } from '../../app-list/services/apps-process.service'; import { ProcessInstanceVariable } from '../models/process-instance-variable.model'; import { ProcessDefinitionRepresentation } from './../models/process-definition.model'; import { ProcessInstance } from './../models/process-instance.model'; 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.component.spec.ts index 292c4ce53f..5e0cd034bc 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.component.spec.ts @@ -17,7 +17,8 @@ import { SimpleChange } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { AppConfigService, AppsProcessService, setupTestBed } from '@alfresco/adf-core'; +import { AppsProcessService } from '../../app-list/services/apps-process.service'; +import { AppConfigService, setupTestBed } from '@alfresco/adf-core'; import { from, of } from 'rxjs'; import { FilterParamsModel, FilterRepresentationModel } from '../models/filter.model'; import { TaskListService } from '../services/tasklist.service'; 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.component.ts index 56529bfb92..bb0de95df6 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.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { AppsProcessService } from '@alfresco/adf-core'; +import { AppsProcessService } from '../../app-list/services/apps-process.service'; import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewEncapsulation } from '@angular/core'; import { Observable } from 'rxjs'; import { FilterParamsModel, FilterRepresentationModel } from '../models/filter.model';