From 3e7376d3234aa2b968c415aad34008da8d8674eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henry=20T=C3=A4schner?= <129834483+HenryT-CG@users.noreply.github.com> Date: Wed, 31 Jan 2024 20:36:59 +0100 Subject: [PATCH] Fix delete theme and moved generate to shared (#59) * fix: delete theme * fix: move generated to shared --- .eslintrc.json | 2 +- .prettierignore | 2 +- angular.json | 7 +------ package.json | 2 +- sonar-local-project.properties | 2 +- src/app/{ => shared}/generated/.gitignore | 0 .../generated/.openapi-generator-ignore | 0 .../generated/.openapi-generator/FILES | 0 .../generated/.openapi-generator/VERSION | 0 src/app/{ => shared}/generated/README.md | 0 src/app/{ => shared}/generated/api.module.ts | 0 src/app/{ => shared}/generated/api/api.ts | 0 .../{ => shared}/generated/api/themes.service.ts | 0 src/app/{ => shared}/generated/configuration.ts | 0 src/app/{ => shared}/generated/encoder.ts | 0 src/app/{ => shared}/generated/git_push.sh | 0 src/app/{ => shared}/generated/index.ts | 0 .../generated/model/createThemeRequest.ts | 0 .../generated/model/createThemeResponse.ts | 0 .../{ => shared}/generated/model/eximTheme.ts | 0 .../generated/model/exportThemeRequest.ts | 0 .../generated/model/getThemeResponse.ts | 0 .../generated/model/getThemesResponse.ts | 0 .../generated/model/importThemeResponse.ts | 0 .../generated/model/importThemeResponseStatus.ts | 0 src/app/{ => shared}/generated/model/models.ts | 0 .../generated/model/pagingResponse.ts | 0 .../generated/model/problemDetailInvalidParam.ts | 0 .../generated/model/problemDetailParam.ts | 0 .../generated/model/problemDetailResponse.ts | 0 .../generated/model/searchThemeRequest.ts | 0 .../generated/model/searchThemeResponse.ts | 0 src/app/{ => shared}/generated/model/theme.ts | 0 .../generated/model/themeSnapshot.ts | 0 .../generated/model/themeUpdateCreate.ts | 0 .../generated/model/updateThemeRequest.ts | 0 .../generated/model/updateThemeResponse.ts | 0 .../generated/model/validationConstraint.ts | 0 .../{ => shared}/generated/model/workspace.ts | 0 src/app/{ => shared}/generated/param.ts | 0 src/app/{ => shared}/generated/variables.ts | 0 .../image-container/image-container.component.ts | 2 +- src/app/shared/shared.module.ts | 2 +- .../theme-designer.component.spec.ts | 2 +- .../theme-designer/theme-designer.component.ts | 8 +++++++- .../theme-detail/theme-detail.component.spec.ts | 2 +- .../theme/theme-detail/theme-detail.component.ts | 5 ++--- .../theme-intern/theme-intern.component.html | 16 ++++++++-------- .../theme-intern/theme-intern.component.ts | 2 +- .../theme-import/theme-import.component.spec.ts | 2 +- .../theme/theme-import/theme-import.component.ts | 2 +- .../theme-search/theme-search.component.spec.ts | 2 +- .../theme/theme-search/theme-search.component.ts | 2 +- src/app/theme/theme.module.ts | 4 ++-- tsconfig.app.json | 9 +-------- tsconfig.spec.json | 2 +- 56 files changed, 35 insertions(+), 42 deletions(-) rename src/app/{ => shared}/generated/.gitignore (100%) rename src/app/{ => shared}/generated/.openapi-generator-ignore (100%) rename src/app/{ => shared}/generated/.openapi-generator/FILES (100%) rename src/app/{ => shared}/generated/.openapi-generator/VERSION (100%) rename src/app/{ => shared}/generated/README.md (100%) rename src/app/{ => shared}/generated/api.module.ts (100%) rename src/app/{ => shared}/generated/api/api.ts (100%) rename src/app/{ => shared}/generated/api/themes.service.ts (100%) rename src/app/{ => shared}/generated/configuration.ts (100%) rename src/app/{ => shared}/generated/encoder.ts (100%) rename src/app/{ => shared}/generated/git_push.sh (100%) rename src/app/{ => shared}/generated/index.ts (100%) rename src/app/{ => shared}/generated/model/createThemeRequest.ts (100%) rename src/app/{ => shared}/generated/model/createThemeResponse.ts (100%) rename src/app/{ => shared}/generated/model/eximTheme.ts (100%) rename src/app/{ => shared}/generated/model/exportThemeRequest.ts (100%) rename src/app/{ => shared}/generated/model/getThemeResponse.ts (100%) rename src/app/{ => shared}/generated/model/getThemesResponse.ts (100%) rename src/app/{ => shared}/generated/model/importThemeResponse.ts (100%) rename src/app/{ => shared}/generated/model/importThemeResponseStatus.ts (100%) rename src/app/{ => shared}/generated/model/models.ts (100%) rename src/app/{ => shared}/generated/model/pagingResponse.ts (100%) rename src/app/{ => shared}/generated/model/problemDetailInvalidParam.ts (100%) rename src/app/{ => shared}/generated/model/problemDetailParam.ts (100%) rename src/app/{ => shared}/generated/model/problemDetailResponse.ts (100%) rename src/app/{ => shared}/generated/model/searchThemeRequest.ts (100%) rename src/app/{ => shared}/generated/model/searchThemeResponse.ts (100%) rename src/app/{ => shared}/generated/model/theme.ts (100%) rename src/app/{ => shared}/generated/model/themeSnapshot.ts (100%) rename src/app/{ => shared}/generated/model/themeUpdateCreate.ts (100%) rename src/app/{ => shared}/generated/model/updateThemeRequest.ts (100%) rename src/app/{ => shared}/generated/model/updateThemeResponse.ts (100%) rename src/app/{ => shared}/generated/model/validationConstraint.ts (100%) rename src/app/{ => shared}/generated/model/workspace.ts (100%) rename src/app/{ => shared}/generated/param.ts (100%) rename src/app/{ => shared}/generated/variables.ts (100%) diff --git a/.eslintrc.json b/.eslintrc.json index 367b0d9..aef10d8 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -9,7 +9,7 @@ "dist/**", "helm/**", "node_modules/**", - "src/app/generated/**", + "src/app/shared/generated/**", "src/app/api/*", "src/app/model/*", "src/**/*.ico", diff --git a/.prettierignore b/.prettierignore index 6f46742..5a7360f 100644 --- a/.prettierignore +++ b/.prettierignore @@ -15,6 +15,6 @@ README.md Dockerfile *.log *.sh -src/app/generated/** +src/app/shared/generated/** src/app/api/* src/app/model/* diff --git a/angular.json b/angular.json index a4fea92..c3e418b 100644 --- a/angular.json +++ b/angular.json @@ -109,12 +109,7 @@ "assets": ["src/favicon.ico", "src/assets"], "styles": ["src/styles.scss"], "scripts": [], - "codeCoverageExclude": [ - "**/*.module.ts", - "src/app/test/**", - "src/app/environments/**", - "src/app/generated/**" - ] + "codeCoverageExclude": ["**/*.module.ts", "src/app/environments/**", "src/app/shared/generated/**"] } }, "lint": { diff --git a/package.json b/package.json index 486af2b..9e8e229 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ ], "config": { "openapiYaml": "src/assets/api/themes-bff-api.yaml", - "openapiOutput": "src/app/generated" + "openapiOutput": "src/app/shared/generated" }, "scripts": { "build": "ng build", diff --git a/sonar-local-project.properties b/sonar-local-project.properties index 99cc1fb..261ea6d 100644 --- a/sonar-local-project.properties +++ b/sonar-local-project.properties @@ -18,7 +18,7 @@ sonar.testExecutionReportPaths=reports/sonarqube_report.xml sonar.sourceEncoding=UTF-8 #sonar.sources=src/app #sonar.working.directory=dist/sonar -sonar.coverage.exclusions=*.ts,*.js,src/*.ts,src/**/*.module.ts,src/environments/*,src/assets/**/*,src/app/generated/**/*,src/app/test/* +sonar.coverage.exclusions=*.ts,*.js,src/*.ts,src/**/*.module.ts,src/environments/*,src/assets/**/*,src/app/shared/generated/**/* #sonar.exclusions=src/app/generated/**/* #sonar.cpd.exclusions= #sonar.tests=src/app diff --git a/src/app/generated/.gitignore b/src/app/shared/generated/.gitignore similarity index 100% rename from src/app/generated/.gitignore rename to src/app/shared/generated/.gitignore diff --git a/src/app/generated/.openapi-generator-ignore b/src/app/shared/generated/.openapi-generator-ignore similarity index 100% rename from src/app/generated/.openapi-generator-ignore rename to src/app/shared/generated/.openapi-generator-ignore diff --git a/src/app/generated/.openapi-generator/FILES b/src/app/shared/generated/.openapi-generator/FILES similarity index 100% rename from src/app/generated/.openapi-generator/FILES rename to src/app/shared/generated/.openapi-generator/FILES diff --git a/src/app/generated/.openapi-generator/VERSION b/src/app/shared/generated/.openapi-generator/VERSION similarity index 100% rename from src/app/generated/.openapi-generator/VERSION rename to src/app/shared/generated/.openapi-generator/VERSION diff --git a/src/app/generated/README.md b/src/app/shared/generated/README.md similarity index 100% rename from src/app/generated/README.md rename to src/app/shared/generated/README.md diff --git a/src/app/generated/api.module.ts b/src/app/shared/generated/api.module.ts similarity index 100% rename from src/app/generated/api.module.ts rename to src/app/shared/generated/api.module.ts diff --git a/src/app/generated/api/api.ts b/src/app/shared/generated/api/api.ts similarity index 100% rename from src/app/generated/api/api.ts rename to src/app/shared/generated/api/api.ts diff --git a/src/app/generated/api/themes.service.ts b/src/app/shared/generated/api/themes.service.ts similarity index 100% rename from src/app/generated/api/themes.service.ts rename to src/app/shared/generated/api/themes.service.ts diff --git a/src/app/generated/configuration.ts b/src/app/shared/generated/configuration.ts similarity index 100% rename from src/app/generated/configuration.ts rename to src/app/shared/generated/configuration.ts diff --git a/src/app/generated/encoder.ts b/src/app/shared/generated/encoder.ts similarity index 100% rename from src/app/generated/encoder.ts rename to src/app/shared/generated/encoder.ts diff --git a/src/app/generated/git_push.sh b/src/app/shared/generated/git_push.sh similarity index 100% rename from src/app/generated/git_push.sh rename to src/app/shared/generated/git_push.sh diff --git a/src/app/generated/index.ts b/src/app/shared/generated/index.ts similarity index 100% rename from src/app/generated/index.ts rename to src/app/shared/generated/index.ts diff --git a/src/app/generated/model/createThemeRequest.ts b/src/app/shared/generated/model/createThemeRequest.ts similarity index 100% rename from src/app/generated/model/createThemeRequest.ts rename to src/app/shared/generated/model/createThemeRequest.ts diff --git a/src/app/generated/model/createThemeResponse.ts b/src/app/shared/generated/model/createThemeResponse.ts similarity index 100% rename from src/app/generated/model/createThemeResponse.ts rename to src/app/shared/generated/model/createThemeResponse.ts diff --git a/src/app/generated/model/eximTheme.ts b/src/app/shared/generated/model/eximTheme.ts similarity index 100% rename from src/app/generated/model/eximTheme.ts rename to src/app/shared/generated/model/eximTheme.ts diff --git a/src/app/generated/model/exportThemeRequest.ts b/src/app/shared/generated/model/exportThemeRequest.ts similarity index 100% rename from src/app/generated/model/exportThemeRequest.ts rename to src/app/shared/generated/model/exportThemeRequest.ts diff --git a/src/app/generated/model/getThemeResponse.ts b/src/app/shared/generated/model/getThemeResponse.ts similarity index 100% rename from src/app/generated/model/getThemeResponse.ts rename to src/app/shared/generated/model/getThemeResponse.ts diff --git a/src/app/generated/model/getThemesResponse.ts b/src/app/shared/generated/model/getThemesResponse.ts similarity index 100% rename from src/app/generated/model/getThemesResponse.ts rename to src/app/shared/generated/model/getThemesResponse.ts diff --git a/src/app/generated/model/importThemeResponse.ts b/src/app/shared/generated/model/importThemeResponse.ts similarity index 100% rename from src/app/generated/model/importThemeResponse.ts rename to src/app/shared/generated/model/importThemeResponse.ts diff --git a/src/app/generated/model/importThemeResponseStatus.ts b/src/app/shared/generated/model/importThemeResponseStatus.ts similarity index 100% rename from src/app/generated/model/importThemeResponseStatus.ts rename to src/app/shared/generated/model/importThemeResponseStatus.ts diff --git a/src/app/generated/model/models.ts b/src/app/shared/generated/model/models.ts similarity index 100% rename from src/app/generated/model/models.ts rename to src/app/shared/generated/model/models.ts diff --git a/src/app/generated/model/pagingResponse.ts b/src/app/shared/generated/model/pagingResponse.ts similarity index 100% rename from src/app/generated/model/pagingResponse.ts rename to src/app/shared/generated/model/pagingResponse.ts diff --git a/src/app/generated/model/problemDetailInvalidParam.ts b/src/app/shared/generated/model/problemDetailInvalidParam.ts similarity index 100% rename from src/app/generated/model/problemDetailInvalidParam.ts rename to src/app/shared/generated/model/problemDetailInvalidParam.ts diff --git a/src/app/generated/model/problemDetailParam.ts b/src/app/shared/generated/model/problemDetailParam.ts similarity index 100% rename from src/app/generated/model/problemDetailParam.ts rename to src/app/shared/generated/model/problemDetailParam.ts diff --git a/src/app/generated/model/problemDetailResponse.ts b/src/app/shared/generated/model/problemDetailResponse.ts similarity index 100% rename from src/app/generated/model/problemDetailResponse.ts rename to src/app/shared/generated/model/problemDetailResponse.ts diff --git a/src/app/generated/model/searchThemeRequest.ts b/src/app/shared/generated/model/searchThemeRequest.ts similarity index 100% rename from src/app/generated/model/searchThemeRequest.ts rename to src/app/shared/generated/model/searchThemeRequest.ts diff --git a/src/app/generated/model/searchThemeResponse.ts b/src/app/shared/generated/model/searchThemeResponse.ts similarity index 100% rename from src/app/generated/model/searchThemeResponse.ts rename to src/app/shared/generated/model/searchThemeResponse.ts diff --git a/src/app/generated/model/theme.ts b/src/app/shared/generated/model/theme.ts similarity index 100% rename from src/app/generated/model/theme.ts rename to src/app/shared/generated/model/theme.ts diff --git a/src/app/generated/model/themeSnapshot.ts b/src/app/shared/generated/model/themeSnapshot.ts similarity index 100% rename from src/app/generated/model/themeSnapshot.ts rename to src/app/shared/generated/model/themeSnapshot.ts diff --git a/src/app/generated/model/themeUpdateCreate.ts b/src/app/shared/generated/model/themeUpdateCreate.ts similarity index 100% rename from src/app/generated/model/themeUpdateCreate.ts rename to src/app/shared/generated/model/themeUpdateCreate.ts diff --git a/src/app/generated/model/updateThemeRequest.ts b/src/app/shared/generated/model/updateThemeRequest.ts similarity index 100% rename from src/app/generated/model/updateThemeRequest.ts rename to src/app/shared/generated/model/updateThemeRequest.ts diff --git a/src/app/generated/model/updateThemeResponse.ts b/src/app/shared/generated/model/updateThemeResponse.ts similarity index 100% rename from src/app/generated/model/updateThemeResponse.ts rename to src/app/shared/generated/model/updateThemeResponse.ts diff --git a/src/app/generated/model/validationConstraint.ts b/src/app/shared/generated/model/validationConstraint.ts similarity index 100% rename from src/app/generated/model/validationConstraint.ts rename to src/app/shared/generated/model/validationConstraint.ts diff --git a/src/app/generated/model/workspace.ts b/src/app/shared/generated/model/workspace.ts similarity index 100% rename from src/app/generated/model/workspace.ts rename to src/app/shared/generated/model/workspace.ts diff --git a/src/app/generated/param.ts b/src/app/shared/generated/param.ts similarity index 100% rename from src/app/generated/param.ts rename to src/app/shared/generated/param.ts diff --git a/src/app/generated/variables.ts b/src/app/shared/generated/variables.ts similarity index 100% rename from src/app/generated/variables.ts rename to src/app/shared/generated/variables.ts diff --git a/src/app/shared/image-container/image-container.component.ts b/src/app/shared/image-container/image-container.component.ts index 4d68a9f..3d00dbe 100644 --- a/src/app/shared/image-container/image-container.component.ts +++ b/src/app/shared/image-container/image-container.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnChanges, SimpleChanges } from '@angular/core' import { Location } from '@angular/common' -import { environment } from '../../../environments/environment' +import { environment } from 'src/environments/environment' @Component({ selector: 'app-image-container', diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 62b2bdd..0e8e340 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -34,7 +34,7 @@ import { PortalApiConfiguration } from '@onecx/portal-integration-angular' -import { Configuration } from 'src/app/generated' +import { Configuration } from 'src/app/shared/generated' import { LabelResolver } from './label.resolver' import { environment } from 'src/environments/environment' import { ImageContainerComponent } from './image-container/image-container.component' diff --git a/src/app/theme/theme-designer/theme-designer.component.spec.ts b/src/app/theme/theme-designer/theme-designer.component.spec.ts index f1e3c2a..26f5010 100644 --- a/src/app/theme/theme-designer/theme-designer.component.spec.ts +++ b/src/app/theme/theme-designer/theme-designer.component.spec.ts @@ -20,7 +20,7 @@ import { ConfirmDialog, ConfirmDialogModule } from 'primeng/confirmdialog' import { ConfigurationService, PortalMessageService, ThemeService } from '@onecx/portal-integration-angular' -import { ThemesAPIService } from 'src/app/generated' +import { ThemesAPIService } from 'src/app/shared/generated' import { prepareUrl } from 'src/app/shared/utils' import { themeVariables } from './theme-variables' import { ThemeDesignerComponent } from './theme-designer.component' diff --git a/src/app/theme/theme-designer/theme-designer.component.ts b/src/app/theme/theme-designer/theme-designer.component.ts index 6fbcf97..08ca5a0 100644 --- a/src/app/theme/theme-designer/theme-designer.component.ts +++ b/src/app/theme/theme-designer/theme-designer.component.ts @@ -7,7 +7,13 @@ import { ConfirmationService, SelectItem } from 'primeng/api' import { Action, AppStateService, PortalMessageService, ThemeService } from '@onecx/portal-integration-angular' import { dropDownSortItemsByLabel, dropDownGetLabelByValue, prepareUrl } from 'src/app/shared/utils' -import { GetThemeResponse, Theme, ThemesAPIService, ThemeUpdateCreate, UpdateThemeResponse } from 'src/app/generated' +import { + GetThemeResponse, + Theme, + ThemesAPIService, + ThemeUpdateCreate, + UpdateThemeResponse +} from 'src/app/shared/generated' import { themeVariables } from './theme-variables' @Component({ diff --git a/src/app/theme/theme-detail/theme-detail.component.spec.ts b/src/app/theme/theme-detail/theme-detail.component.spec.ts index b93c940..f9d18c5 100644 --- a/src/app/theme/theme-detail/theme-detail.component.spec.ts +++ b/src/app/theme/theme-detail/theme-detail.component.spec.ts @@ -12,7 +12,7 @@ import FileSaver from 'file-saver' import { ConfigurationService, PortalMessageService } from '@onecx/portal-integration-angular' import { prepareUrl } from 'src/app/shared/utils' -import { ThemesAPIService } from 'src/app/generated' +import { ThemesAPIService } from 'src/app/shared/generated' import { ThemeDetailComponent } from './theme-detail.component' describe('ThemeDetailComponent', () => { diff --git a/src/app/theme/theme-detail/theme-detail.component.ts b/src/app/theme/theme-detail/theme-detail.component.ts index bd487d1..bfe4d0d 100644 --- a/src/app/theme/theme-detail/theme-detail.component.ts +++ b/src/app/theme/theme-detail/theme-detail.component.ts @@ -8,7 +8,7 @@ import FileSaver from 'file-saver' import { Action, ObjectDetailItem, PortalMessageService, UserService } from '@onecx/portal-integration-angular' import { limitText, prepareUrl, sortByLocale } from 'src/app/shared/utils' -import { ExportThemeRequest, Theme, ThemesAPIService, Workspace } from 'src/app/generated' +import { ExportThemeRequest, Theme, ThemesAPIService, Workspace } from 'src/app/shared/generated' @Component({ templateUrl: './theme-detail.component.html', @@ -18,7 +18,6 @@ export class ThemeDetailComponent implements OnInit { theme: Theme | undefined usedInWorkspace: Workspace[] | undefined themeName!: string - themeId!: string themeDeleteVisible = false themeDeleteMessage = '' themePortalList = '' @@ -174,7 +173,7 @@ export class ThemeDetailComponent implements OnInit { } private deleteTheme(): void { - this.themeApi.deleteTheme({ id: this.themeId }).subscribe({ + this.themeApi.deleteTheme({ id: this.theme?.id! }).subscribe({ next: () => { this.router.navigate(['..'], { relativeTo: this.route }) this.msgService.success({ summaryKey: 'ACTIONS.DELETE.THEME_OK' }) diff --git a/src/app/theme/theme-detail/theme-intern/theme-intern.component.html b/src/app/theme/theme-detail/theme-intern/theme-intern.component.html index 66657dd..37129b4 100644 --- a/src/app/theme/theme-detail/theme-intern/theme-intern.component.html +++ b/src/app/theme/theme-detail/theme-intern/theme-intern.component.html @@ -6,14 +6,14 @@ pInputText type="text" readonly - id="portal_detail_item_creationDate" + id="theme_detail_item_creationDate" class="w-full pt-3 pb-2" [value]="theme?.creationDate | date : dateFormat" [pTooltip]="'DETAIL.TOOLTIPS.CREATION_DATE' | translate" tooltipPosition="top" tooltipEvent="focus" /> - + @@ -21,14 +21,14 @@ pInputText type="text" readonly - id="portal_detail_item_creationUser" + id="theme_detail_item_creationUser" class="w-full pt-3 pb-2" [value]="theme?.creationUser" [pTooltip]="'DETAIL.TOOLTIPS.CREATION_USER' | translate" tooltipPosition="top" tooltipEvent="focus" /> - + @@ -36,14 +36,14 @@ pInputText type="text" readonly - id="portal_detail_item_modificationDate" + id="theme_detail_item_modificationDate" class="w-full pt-3 pb-2" [value]="theme?.modificationDate | date : dateFormat" [pTooltip]="'DETAIL.TOOLTIPS.MODIFICATION_DATE' | translate" tooltipPosition="top" tooltipEvent="focus" /> - + @@ -51,14 +51,14 @@ pInputText type="text" readonly - id="portal_detail_item_modificationUser" + id="theme_detail_item_modificationUser" class="w-full pt-3 pb-2" [value]="theme?.modificationUser" [pTooltip]="'DETAIL.TOOLTIPS.MODIFICATION_USER' | translate" tooltipPosition="top" tooltipEvent="focus" /> - + diff --git a/src/app/theme/theme-detail/theme-intern/theme-intern.component.ts b/src/app/theme/theme-detail/theme-intern/theme-intern.component.ts index db33501..52c4c19 100644 --- a/src/app/theme/theme-detail/theme-intern/theme-intern.component.ts +++ b/src/app/theme/theme-detail/theme-intern/theme-intern.component.ts @@ -1,7 +1,7 @@ import { Component, Input } from '@angular/core' import { TranslateService } from '@ngx-translate/core' -import { Theme } from 'src/app/generated' +import { Theme } from 'src/app/shared/generated' @Component({ selector: 'app-theme-intern', diff --git a/src/app/theme/theme-import/theme-import.component.spec.ts b/src/app/theme/theme-import/theme-import.component.spec.ts index 3c453f0..30aced3 100644 --- a/src/app/theme/theme-import/theme-import.component.spec.ts +++ b/src/app/theme/theme-import/theme-import.component.spec.ts @@ -8,7 +8,7 @@ import { of, throwError } from 'rxjs' import { PortalMessageService } from '@onecx/portal-integration-angular' -import { ThemesAPIService } from 'src/app/generated' +import { ThemesAPIService } from 'src/app/shared/generated' import { ThemeImportComponent } from './theme-import.component' describe('ThemeImportComponent', () => { diff --git a/src/app/theme/theme-import/theme-import.component.ts b/src/app/theme/theme-import/theme-import.component.ts index 6f29efd..7b27bf3 100644 --- a/src/app/theme/theme-import/theme-import.component.ts +++ b/src/app/theme/theme-import/theme-import.component.ts @@ -5,7 +5,7 @@ import { ActivatedRoute, Router } from '@angular/router' import { PortalMessageService } from '@onecx/portal-integration-angular' -import { Theme, ThemesAPIService, ThemeSnapshot } from 'src/app/generated' +import { Theme, ThemesAPIService, ThemeSnapshot } from 'src/app/shared/generated' @Component({ selector: 'app-theme-import', diff --git a/src/app/theme/theme-search/theme-search.component.spec.ts b/src/app/theme/theme-search/theme-search.component.spec.ts index a2deb23..bab95ad 100644 --- a/src/app/theme/theme-search/theme-search.component.spec.ts +++ b/src/app/theme/theme-search/theme-search.component.spec.ts @@ -8,7 +8,7 @@ import { TranslateTestingModule } from 'ngx-translate-testing' import { DataViewModule } from 'primeng/dataview' import { of } from 'rxjs' -import { ThemesAPIService } from 'src/app/generated' +import { ThemesAPIService } from 'src/app/shared/generated' import { ThemeSearchComponent } from './theme-search.component' describe('ThemeSearchComponent', () => { diff --git a/src/app/theme/theme-search/theme-search.component.ts b/src/app/theme/theme-search/theme-search.component.ts index 2c23633..e78c458 100644 --- a/src/app/theme/theme-search/theme-search.component.ts +++ b/src/app/theme/theme-search/theme-search.component.ts @@ -6,7 +6,7 @@ import { DataView } from 'primeng/dataview' import { Action, DataViewControlTranslations } from '@onecx/portal-integration-angular' -import { GetThemesResponse, ThemesAPIService } from 'src/app/generated' +import { GetThemesResponse, ThemesAPIService } from 'src/app/shared/generated' import { limitText } from 'src/app/shared/utils' @Component({ diff --git a/src/app/theme/theme.module.ts b/src/app/theme/theme.module.ts index eaee486..7b63eec 100644 --- a/src/app/theme/theme.module.ts +++ b/src/app/theme/theme.module.ts @@ -8,8 +8,8 @@ import { ConfirmationService } from 'primeng/api' import { addInitializeModuleGuard, InitializeModuleGuard, PortalCoreModule } from '@onecx/portal-integration-angular' -import { LabelResolver } from '../shared/label.resolver' -import { SharedModule } from '../shared/shared.module' +import { LabelResolver } from 'src/app/shared/label.resolver' +import { SharedModule } from 'src/app/shared/shared.module' import { ThemeSearchComponent } from './theme-search/theme-search.component' import { ThemeImportComponent } from './theme-import/theme-import.component' diff --git a/tsconfig.app.json b/tsconfig.app.json index adc32c1..5a7de6d 100644 --- a/tsconfig.app.json +++ b/tsconfig.app.json @@ -9,12 +9,5 @@ }, "files": ["src/main.ts", "src/polyfills.ts", "src/app/onecx-theme-remote.module.ts"], "include": ["src/**/*.ts", "src/**/*.d.ts"], - "exclude": [ - "src/test.ts", - "src/test-setup.ts", - "src/app/test/**/*", - "src/**/*.spec.ts", - "src/**/*.stories.ts", - "src/**/*.stories.js" - ] + "exclude": ["src/test.ts", "src/test-setup.ts", "src/**/*.spec.ts", "src/**/*.stories.ts", "src/**/*.stories.js"] } diff --git a/tsconfig.spec.json b/tsconfig.spec.json index 9b2f08e..a366065 100644 --- a/tsconfig.spec.json +++ b/tsconfig.spec.json @@ -10,6 +10,6 @@ "useDefineForClassFields": false }, "files": ["src/test.ts", "src/polyfills.ts"], - "exclude": ["src/app/generated/**/*", "node_modules"], + "exclude": ["src/app/shared/generated/**/*", "node_modules"], "include": ["**/*.spec.ts", "**/*.d.ts"] }