Fix update, adjust tests

src/app/app.component.spec.ts

@@ -1,8 +1,9 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core'
 import { TestBed } from '@angular/core/testing'
-import { AppComponent } from './app.component'
 import { RouterTestingModule } from '@angular/router/testing'
 
+import { AppComponent } from 'src/app/app.component'
+
 describe('AppComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({

src/app/services/menu-state.service.spec.ts

@@ -1,7 +1,7 @@
 import { TestBed } from '@angular/core/testing'
 import { HttpClientTestingModule } from '@angular/common/http/testing'
 
-import { MenuStateService } from './menu-state.service'
+import { MenuStateService } from 'src/app/services/menu-state.service'
 
 describe('MenuStateService', () => {
   let service: MenuStateService

src/app/services/menu-state.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core'
-import { MenuItem } from '../shared/generated'
+import { MenuItem } from 'src/app/shared/generated'
 
 export interface MenuState {
   selectedPortal?: string

src/app/services/menu-tree.service.spec.ts

@@ -2,8 +2,8 @@ import { TestBed } from '@angular/core/testing'
 import { HttpClientTestingModule } from '@angular/common/http/testing'
 import { TreeNode } from 'primeng/api'
 
-import { MenuTreeService } from './menu-tree.service'
-import { /* MenuItemDetailsDTO, MenuItemStructureDTO, */ MenuItem } from '../shared/generated'
+import { MenuTreeService } from 'src/app/services/menu-tree.service'
+import { MenuItem } from 'src/app/shared/generated'
 
 describe('MenuTreeService', () => {
   let service: MenuTreeService

src/app/services/menu-tree.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core'
 import { TreeNode } from 'primeng/api'
-import { MenuItem } from '../shared/generated'
+import { MenuItem } from 'src/app/shared/generated'
 
 export interface NewPosition {
   id: string | undefined

src/app/shared/generated/.openapi-generator/FILES

@@ -16,7 +16,7 @@ model/createProductRequest.ts
 model/createUpdateMenuItem.ts
 model/createUpdateMicrofrontend.ts
 model/createUpdateProductResponse.ts
-model/createWorkspaceMenuItemStructrueRequest.ts
+model/createWorkspaceMenuItemStructureRequest.ts
 model/createWorkspaceRequest.ts
 model/createWorkspaceResponse.ts
 model/eximMenuStructure.ts

src/app/shared/generated/api/workspace.service.ts

@@ -37,6 +37,8 @@ import { SearchWorkspacesResponse } from '../model/searchWorkspacesResponse';
 // @ts-ignore
 import { UpdateWorkspaceRequest } from '../model/updateWorkspaceRequest';
 // @ts-ignore
+import { Workspace } from '../model/workspace';
+// @ts-ignore
 import { WorkspaceSnapshot } from '../model/workspaceSnapshot';
 
 // @ts-ignore
@@ -655,9 +657,9 @@ export class WorkspaceAPIService {
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public updateWorkspace(requestParameters: UpdateWorkspaceRequestParams, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any>;
-    public updateWorkspace(requestParameters: UpdateWorkspaceRequestParams, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<any>>;
-    public updateWorkspace(requestParameters: UpdateWorkspaceRequestParams, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<any>>;
+    public updateWorkspace(requestParameters: UpdateWorkspaceRequestParams, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<Workspace>;
+    public updateWorkspace(requestParameters: UpdateWorkspaceRequestParams, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<Workspace>>;
+    public updateWorkspace(requestParameters: UpdateWorkspaceRequestParams, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<Workspace>>;
     public updateWorkspace(requestParameters: UpdateWorkspaceRequestParams, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
         const id = requestParameters.id;
         if (id === null || id === undefined) {
@@ -706,7 +708,7 @@ export class WorkspaceAPIService {
         }
 
         let localVarPath = `/workspaces/${this.configuration.encodeParam({name: "id", value: id, in: "path", style: "simple", explode: false, dataType: "string", dataFormat: undefined})}`;
-        return this.httpClient.request<any>('put', `${this.configuration.basePath}${localVarPath}`,
+        return this.httpClient.request<Workspace>('put', `${this.configuration.basePath}${localVarPath}`,
             {
                 context: localVarHttpContext,
                 body: updateWorkspaceRequest,

src/app/shared/image-container/image-container.component.ts

@@ -1,5 +1,5 @@
 import { Component, Input, OnChanges, SimpleChanges } from '@angular/core'
-import { environment } from '../../../environments/environment'
+import { environment } from 'src/environments/environment'
 
 @Component({
   selector: 'app-image-container',

src/app/shared/label.resolver.spec.ts

@@ -1,5 +1,5 @@
 import { Observable, of } from 'rxjs'
-import { LabelResolver } from './label.resolver'
+import { LabelResolver } from 'src/app/shared/label.resolver'
 
 let labelResolver: LabelResolver
 

src/app/shared/shared.module.ts

@@ -41,7 +41,7 @@ import {
 
 import { Configuration } from 'src/app/shared/generated'
 import { environment } from 'src/environments/environment'
-import { LabelResolver } from './label.resolver'
+import { LabelResolver } from 'src/app/shared/label.resolver'
 
 import { ImageContainerComponent } from './image-container/image-container.component'
 import { ThemeColorBoxComponent } from './theme-color-box/theme-color-box.component'

src/app/shared/theme-color-box/theme-color-box.component.spec.ts

@@ -1,39 +1,39 @@
-// import { NO_ERRORS_SCHEMA } from '@angular/core'
-// import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'
-// // import { HttpClient } from '@angular/common/http'
-// import { HttpClientTestingModule } from '@angular/common/http/testing'
-// // import { TranslateLoader, TranslateModule } from '@ngx-translate/core'
+import { NO_ERRORS_SCHEMA } from '@angular/core'
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'
+// import { HttpClient } from '@angular/common/http'
+import { HttpClientTestingModule } from '@angular/common/http/testing'
+// import { TranslateLoader, TranslateModule } from '@ngx-translate/core'
 
-// import { ThemeColorBoxComponent } from './theme-color-box.component'
+import { ThemeColorBoxComponent } from './theme-color-box.component'
 
-// describe('ThemeColorBoxComponent', () => {
-//   let component: ThemeColorBoxComponent
-//   let fixture: ComponentFixture<ThemeColorBoxComponent>
+describe('ThemeColorBoxComponent', () => {
+  let component: ThemeColorBoxComponent
+  let fixture: ComponentFixture<ThemeColorBoxComponent>
 
-//   beforeEach(waitForAsync(() => {
-//     TestBed.configureTestingModule({
-//       declarations: [ThemeColorBoxComponent],
-//       imports: [
-//         HttpClientTestingModule
-//         /* TranslateModule.forRoot({
-//           loader: {
-//             provide: TranslateLoader,
-//             useFactory: HttpLoaderFactory,
-//             deps: [HttpClient]
-//           }
-//         }) */
-//       ],
-//       schemas: [NO_ERRORS_SCHEMA]
-//     }).compileComponents()
-//   }))
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ThemeColorBoxComponent],
+      imports: [
+        HttpClientTestingModule
+        /* TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useFactory: HttpLoaderFactory,
+            deps: [HttpClient]
+          }
+        }) */
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents()
+  }))
 
-//   beforeEach(() => {
-//     fixture = TestBed.createComponent(ThemeColorBoxComponent)
-//     component = fixture.componentInstance
-//     fixture.detectChanges()
-//   })
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ThemeColorBoxComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
-//   it('should create', () => {
-//     expect(component).toBeTruthy()
-//   })
-// })
+  it('should create', () => {
+    expect(component).toBeTruthy()
+  })
+})

src/app/shared/utils.ts

@@ -1,7 +1,8 @@
 // import { MicrofrontendDTO } from '@onecx/portal-integration-angular'
 import { AbstractControl, FormArray, FormGroup } from '@angular/forms'
 import { SelectItem } from 'primeng/api'
-import { Workspace /* , ThemeDTO */ } from './generated'
+
+import { Workspace /* , ThemeDTO */ } from 'src/app/shared/generated'
 
 export function limitText(text: string, limit: number): string {
   if (text) {

src/app/workspace/workspace-create/workspace-create.component.spec.ts

@@ -1,44 +1,43 @@
-/* import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'
 import { WorkspaceCreateComponent } from './workspace-create.component'
 import { TranslateModule, TranslateLoader } from '@ngx-translate/core'
-
 import { HttpClient } from '@angular/common/http'
 import { HttpClientTestingModule } from '@angular/common/http/testing'
 import { ReactiveFormsModule } from '@angular/forms'
 import { RouterTestingModule } from '@angular/router/testing'
 import { NO_ERRORS_SCHEMA } from '@angular/core'
-import { PortalFormComponent } from '../portal-form/portal-form.component'
-import { By } from '@angular/platform-browser'
+// import { By } from '@angular/platform-browser'
 import { ConfirmationService, MessageService } from 'primeng/api'
 import { DropdownModule } from 'primeng/dropdown'
-import { environment } from '../../../environments/environment'
-import { APP_CONFIG, AUTH_SERVICE } from '@onecx/portal-integration-angular'
-import { PortalInternalAPIService } from '../../generated'
+
+import { environment } from 'src/environments/environment'
+import { APP_CONFIG, AppStateService, createTranslateLoader } from '@onecx/portal-integration-angular'
+// import { PortalInternalAPIService } from 'src/app/generated'
 
 describe('WorkspaceCreateComponent', () => {
   let component: WorkspaceCreateComponent
   let fixture: ComponentFixture<WorkspaceCreateComponent>
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      declarations: [WorkspaceCreateComponent, PortalFormComponent],
+      declarations: [WorkspaceCreateComponent],
       imports: [
         HttpClientTestingModule,
         RouterTestingModule,
         ReactiveFormsModule,
         DropdownModule,
         TranslateModule.forRoot({
+          isolate: true,
           loader: {
             provide: TranslateLoader,
-            useFactory: HttpLoaderFactory2,
-            deps: [HttpClient]
+            useFactory: createTranslateLoader,
+            deps: [HttpClient, AppStateService]
           }
         })
       ],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
-        { provide: AUTH_SERVICE, useClass: IAuthMockService },
-        PortalInternalAPIService,
+        // PortalInternalAPIService,
         MessageService,
         ConfirmationService
       ],
@@ -56,19 +55,18 @@ describe('WorkspaceCreateComponent', () => {
     expect(component).toBeTruthy()
   })
 
-  it('should start with values', () => {
-    expect(component.isIdEmpty).toBe(false, 'off at first')
-    expect(component.isLoading).toBe(true, 'on at first')
-  })
+  // it('should start with values', () => {
+  //   expect(component.isIdEmpty).toBe(false, 'off at first')
+  //   expect(component.isLoading).toBe(true, 'on at first')
+  // })
 
-  it('should display portal page', () => {
-    const item = fixture.debugElement.query(By.directive(PortalPageComponent))
-    expect(item).toBeDefined()
-  })
+  // it('should display portal page', () => {
+  //   const item = fixture.debugElement.query(By.directive(PortalPageComponent))
+  //   expect(item).toBeDefined()
+  // })
 
-  it('should display portal mgmt form', () => {
-    const items = fixture.debugElement.queryAll(By.directive(PortalFormComponent))
-    expect(items[0]).toBeDefined()
-  })
+  // it('should display portal mgmt form', () => {
+  //   const items = fixture.debugElement.queryAll(By.directive(PortalFormComponent))
+  //   expect(items[0]).toBeDefined()
+  // })
 })
- */

src/app/workspace/workspace-create/workspace-create.component.ts

@@ -8,7 +8,7 @@ import { FileUpload } from 'primeng/fileupload'
 
 import { PortalMessageService, UserService } from '@onecx/portal-integration-angular'
 
-import { LogoState } from './logo-state'
+import { LogoState } from 'src/app/workspace/workspace-create/logo-state'
 // import { setFetchUrls , sortThemeByName } from '../../shared/utils'
 import {
   /* ImageV1APIService, */