Fix delete theme and moved generate to shared (#59)

* fix: delete theme

* fix: move generated to shared

.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",

.prettierignore

@@ -15,6 +15,6 @@ README.md
 Dockerfile
 *.log
 *.sh
-src/app/generated/**
+src/app/shared/generated/**
 src/app/api/*
 src/app/model/*

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": {

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",

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

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',

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'

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'

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({

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', () => {

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' })

src/app/theme/theme-detail/theme-intern/theme-intern.component.html

@@ -6,59 +6,59 @@
           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"
         />
-        <label for="portal_detail_item_creationDate">{{ 'DETAIL.CREATION_DATE' | translate }}</label>
+        <label for="theme_detail_item_creationDate">{{ 'DETAIL.CREATION_DATE' | translate }}</label>
       </span>
 
       <span class="p-float-label mb-1">
         <input
           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"
         />
-        <label for="portal_detail_item_creationUser">{{ 'DETAIL.CREATION_USER' | translate }}</label>
+        <label for="theme_detail_item_creationUser">{{ 'DETAIL.CREATION_USER' | translate }}</label>
       </span>
 
       <span class="p-float-label mb-1">
         <input
           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"
         />
-        <label for="portal_detail_item_modificationDate">{{ 'DETAIL.MODIFICATION_DATE' | translate }}</label>
+        <label for="theme_detail_item_modificationDate">{{ 'DETAIL.MODIFICATION_DATE' | translate }}</label>
       </span>
 
       <span class="p-float-label mb-1">
         <input
           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"
         />
-        <label for="portal_detail_item_modificationUser">{{ 'DETAIL.MODIFICATION_USER' | translate }}</label>
+        <label for="theme_detail_item_modificationUser">{{ 'DETAIL.MODIFICATION_USER' | translate }}</label>
       </span>
     </div>
   </div>

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',

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', () => {

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',

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', () => {

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({

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'

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"]
 }

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"]
 }