From cf175c67b878245af8bcced9fdf320373f3cdb69 Mon Sep 17 00:00:00 2001 From: VitoAlbano Date: Mon, 5 Aug 2024 16:54:32 +0100 Subject: [PATCH] [MIGRATION] - Improving the testing build to avoid having to bundle also the js-api --- .github/workflows/pull-request.yml | 1 - .github/workflows/release-branch.yml | 1 - .github/workflows/release.yml | 1 - lib/testing/project.json | 22 +++++-------------- .../core/pages/data-table/date-column.ts | 3 --- .../core/pages/data-table/text-column.ts | 3 --- .../actions/application.ts | 2 +- .../actions/descriptor.ts | 2 +- lib/testing/src/lib/shared/utils/logger.ts | 7 +++--- lib/testing/tsconfig.json | 2 +- lib/testing/tsconfig.lib.json | 4 ++-- ...onfig.lib.prod.json => tsconfig.prod.json} | 0 12 files changed, 14 insertions(+), 34 deletions(-) rename lib/testing/{tsconfig.lib.prod.json => tsconfig.prod.json} (100%) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 2eac12c85d..e6a1cda1e4 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -205,7 +205,6 @@ jobs: - name: install run: | npm ci - npx nx run js-api:bundle npx nx run cli:bundle npx nx run testing:bundle - run: npx nx print-affected $NX_CALCULATION_FLAGS diff --git a/.github/workflows/release-branch.yml b/.github/workflows/release-branch.yml index f4be76f60b..bec76765c7 100644 --- a/.github/workflows/release-branch.yml +++ b/.github/workflows/release-branch.yml @@ -97,7 +97,6 @@ jobs: - name: install run: | npm ci - npx nx run js-api:bundle npx nx run cli:bundle npx nx run testing:bundle - uses: ./.github/actions/upload-node-modules-and-artifacts diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5b706323b6..28ba06261f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -102,7 +102,6 @@ jobs: - name: install run: | npm ci - npx nx run js-api:bundle npx nx run cli:bundle npx nx run testing:bundle - uses: ./.github/actions/upload-node-modules-and-artifacts diff --git a/lib/testing/project.json b/lib/testing/project.json index b0bc76f84e..d2ee016eff 100644 --- a/lib/testing/project.json +++ b/lib/testing/project.json @@ -5,27 +5,17 @@ "projectType": "library", "prefix": "adf", "targets": { + "build": { - "executor": "@nx/webpack:webpack", + "executor": "@angular-devkit/build-angular:ng-packagr", "options": { - "projectRoot": "lib/testing", - "outputPath": "dist/libs/testing", - "main": "lib/testing/index.ts", - "generatePackageJson": true, - "tsConfig": "lib/testing/tsconfig.lib.prod.json", - "stylePreprocessorOptions": { - "includePaths": ["lib", "lib/core/src/lib"] - }, - "target": "node", - "compiler": "tsc" + "tsConfig": "lib/testing/tsconfig.lib.json", + "project": "lib/testing/ng-package.json" }, "configurations": { "production": { - "projectRoot": "lib/testing", - "outputPath": "dist/libs/testing", - "main": "lib/testing/index.ts", - "generatePackageJson": true, - "tsConfig": "lib/testing/tsconfig.lib.prod.json" + "project": "lib/testing/ng-package.json", + "tsConfig": "lib/testing/tsconfig.prod.json" } }, "defaultConfiguration": "production" diff --git a/lib/testing/src/lib/protractor/core/pages/data-table/date-column.ts b/lib/testing/src/lib/protractor/core/pages/data-table/date-column.ts index bf38660a2e..02f82fa79f 100644 --- a/lib/testing/src/lib/protractor/core/pages/data-table/date-column.ts +++ b/lib/testing/src/lib/protractor/core/pages/data-table/date-column.ts @@ -18,9 +18,6 @@ import { Column } from './column'; export class DateColumn extends Column { - columnType: string; - columnName: string; - constructor(columnName: string) { super(columnName, 'date'); } diff --git a/lib/testing/src/lib/protractor/core/pages/data-table/text-column.ts b/lib/testing/src/lib/protractor/core/pages/data-table/text-column.ts index c29f2a9925..2ebfb612f6 100644 --- a/lib/testing/src/lib/protractor/core/pages/data-table/text-column.ts +++ b/lib/testing/src/lib/protractor/core/pages/data-table/text-column.ts @@ -18,9 +18,6 @@ import { Column } from './column'; export class TextColumn extends Column { - columnType: string; - columnName: string; - constructor(columnName: string) { super(columnName, 'text'); } diff --git a/lib/testing/src/lib/protractor/process-services-cloud/actions/application.ts b/lib/testing/src/lib/protractor/process-services-cloud/actions/application.ts index 2d2fd0202a..f62974ca8d 100644 --- a/lib/testing/src/lib/protractor/process-services-cloud/actions/application.ts +++ b/lib/testing/src/lib/protractor/process-services-cloud/actions/application.ts @@ -22,7 +22,6 @@ import { ApiService } from '../../../shared/api/api.service'; import { ApiUtil } from '../../../shared/api/api.util'; export class Application { - requestApiHelper: E2eRequestApiHelper; endPoint = `/deployment-service/v1/applications/`; @@ -57,6 +56,7 @@ export class Application { return this.requestApiHelper.delete(`${this.endPoint}${applicationName}`); } catch (error) { Logger.error(`[Application] Undeploy application ${applicationName} failed with error: ${error.message}`); + return null; } }; return ApiUtil.waitForApi(apiCall, isApplicationUndeployed, 10, 3000); diff --git a/lib/testing/src/lib/protractor/process-services-cloud/actions/descriptor.ts b/lib/testing/src/lib/protractor/process-services-cloud/actions/descriptor.ts index 0cdefbda2d..8218b762bf 100644 --- a/lib/testing/src/lib/protractor/process-services-cloud/actions/descriptor.ts +++ b/lib/testing/src/lib/protractor/process-services-cloud/actions/descriptor.ts @@ -23,7 +23,6 @@ import { ApiUtil } from '../../../shared/api/api.util'; import { ApiService } from '../../../shared/api/api.service'; export class Descriptor { - requestApiHelper: E2eRequestApiHelper; endPoint = `deployment-service/v1/descriptors/`; @@ -61,6 +60,7 @@ export class Descriptor { return this.requestApiHelper.delete(`${this.endPoint}${name}`); } catch (error) { Logger.error(`[Descriptor] Delete descriptor ${name} failed with error: ${error.message}`); + return null; } }; return ApiUtil.waitForApi(apiCall, isDescriptorDeleted, 10, 15000); diff --git a/lib/testing/src/lib/shared/utils/logger.ts b/lib/testing/src/lib/shared/utils/logger.ts index 472433c55f..c70a7afb6e 100644 --- a/lib/testing/src/lib/shared/utils/logger.ts +++ b/lib/testing/src/lib/shared/utils/logger.ts @@ -33,7 +33,7 @@ export class LogLevelsEnum extends Number { static SILENT: number = 0; } -export const logLevels: { level: LogLevelsEnum; name: LOG_LEVEL }[] = [ +export const logLevels: { level: number; name: LOG_LEVEL }[] = [ { level: LogLevelsEnum.TRACE, name: 'TRACE' }, { level: LogLevelsEnum.DEBUG, name: 'DEBUG' }, { level: LogLevelsEnum.INFO, name: 'INFO' }, @@ -51,11 +51,10 @@ export interface LoggerLike { /* eslint-disable no-console */ export class GenericLogger implements LoggerLike { - - private level: LogLevelsEnum; + private level: number; constructor(logLevel: string) { - this.level = logLevels.find(({name}) => name === logLevel)?.level || LogLevelsEnum.ERROR; + this.level = logLevels.find(({ name }) => name === logLevel)?.level || LogLevelsEnum.ERROR; } info(...messages: string[]): void { diff --git a/lib/testing/tsconfig.json b/lib/testing/tsconfig.json index c311f0310d..67ab93a0e7 100644 --- a/lib/testing/tsconfig.json +++ b/lib/testing/tsconfig.json @@ -7,7 +7,7 @@ "path": "./tsconfig.lib.json" }, { - "path": "./tsconfig.lib.prod.json" + "path": "./tsconfig.prod.json" } ], "compilerOptions": { diff --git a/lib/testing/tsconfig.lib.json b/lib/testing/tsconfig.lib.json index 837bd0d5c7..d6772281bc 100644 --- a/lib/testing/tsconfig.lib.json +++ b/lib/testing/tsconfig.lib.json @@ -6,8 +6,8 @@ "declarationMap": true, "resolveJsonModule": true, "paths": { - "@alfresco/js-api": ["../../dist/libs/js-api"], - "@alfresco/js-api/*": ["../../dist/libs/js-api/*"] + "@alfresco/js-api": ["../../../dist/libs/js-api"], + "@alfresco/js-api/*": ["../../../dist/libs/js-api/*"] } } } diff --git a/lib/testing/tsconfig.lib.prod.json b/lib/testing/tsconfig.prod.json similarity index 100% rename from lib/testing/tsconfig.lib.prod.json rename to lib/testing/tsconfig.prod.json