feat: Add images endpoint (#71)

* feat: connected images service to theme * feat: add images * feat: add bff security * feat: change image upload * feat: lint update * feat: constraint fix * feat: test change * feat: change img size * fix: url problems fix * feat: url reset * feat: fetchingURLs update * feat: fetching URL change update --------- Co-authored-by: Henry Täschner <[email protected]>
onecx · Feb 19, 2024 · b38bc9b · b38bc9b
1 parent f8daeb4
commit b38bc9b
Show file tree

Hide file tree

Showing 20 changed files with 773 additions and 96 deletions.
diff --git a/src/app/shared/generated/.openapi-generator/FILES b/src/app/shared/generated/.openapi-generator/FILES
@@ -3,6 +3,7 @@
 README.md
 api.module.ts
 api/api.ts
+api/imagesInternal.service.ts
 api/themes.service.ts
 configuration.ts
 encoder.ts
@@ -14,21 +15,22 @@ model/eximTheme.ts
 model/exportThemeRequest.ts
 model/getThemeResponse.ts
 model/getThemesResponse.ts
+model/imageInfo.ts
 model/importThemeResponse.ts
 model/importThemeResponseStatus.ts
 model/models.ts
 model/pagingResponse.ts
 model/problemDetailInvalidParam.ts
 model/problemDetailParam.ts
 model/problemDetailResponse.ts
+model/refType.ts
 model/searchThemeRequest.ts
 model/searchThemeResponse.ts
 model/theme.ts
 model/themeSnapshot.ts
 model/themeUpdateCreate.ts
 model/updateThemeRequest.ts
 model/updateThemeResponse.ts
-model/validationConstraint.ts
 model/workspace.ts
 param.ts
 variables.ts
diff --git a/src/app/shared/generated/api/api.ts b/src/app/shared/generated/api/api.ts
@@ -1,3 +1,5 @@
+export * from './imagesInternal.service';
+import { ImagesInternalAPIService } from './imagesInternal.service';
 export * from './themes.service';
 import { ThemesAPIService } from './themes.service';
-export const APIS = [ThemesAPIService];
+export const APIS = [ImagesInternalAPIService, ThemesAPIService];
diff --git a/src/app/shared/generated/api/imagesInternal.service.ts b/src/app/shared/generated/api/imagesInternal.service.ts
diff --git a/...d/generated/model/validationConstraint.ts → src/app/shared/generated/model/imageInfo.ts b/...d/generated/model/validationConstraint.ts → src/app/shared/generated/model/imageInfo.ts
@@ -11,8 +11,7 @@
  */
 
 
-export interface ValidationConstraint { 
-    name?: string;
-    message?: string;
+export interface ImageInfo { 
+    id?: string;
 }
 
diff --git a/src/app/shared/generated/model/models.ts b/src/app/shared/generated/model/models.ts
@@ -4,18 +4,19 @@ export * from './eximTheme';
 export * from './exportThemeRequest';
 export * from './getThemeResponse';
 export * from './getThemesResponse';
+export * from './imageInfo';
 export * from './importThemeResponse';
 export * from './importThemeResponseStatus';
 export * from './pagingResponse';
 export * from './problemDetailInvalidParam';
 export * from './problemDetailParam';
 export * from './problemDetailResponse';
+export * from './refType';
 export * from './searchThemeRequest';
 export * from './searchThemeResponse';
 export * from './theme';
 export * from './themeSnapshot';
 export * from './themeUpdateCreate';
 export * from './updateThemeRequest';
 export * from './updateThemeResponse';
-export * from './validationConstraint';
 export * from './workspace';
diff --git a/src/app/shared/generated/model/refType.ts b/src/app/shared/generated/model/refType.ts
@@ -0,0 +1,18 @@
+/**
+ * onecx-theme-bff
+ * OneCx theme Bff
+ *
+ * The version of the OpenAPI document: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+export enum RefType {
+    Logo = 'logo',
+    Favicon = 'favicon'
+}
+
diff --git a/src/app/shared/generated/model/theme.ts b/src/app/shared/generated/model/theme.ts
@@ -12,7 +12,7 @@
 
 
 export interface Theme { 
-    version?: number;
+    modificationCount?: number;
     creationDate?: string;
     creationUser?: string;
     modificationDate?: string;

diff --git a/src/app/shared/generated/model/themeUpdateCreate.ts b/src/app/shared/generated/model/themeUpdateCreate.ts
@@ -12,7 +12,7 @@
 
 
 export interface ThemeUpdateCreate { 
-    version?: number;
+    modificationCount?: number;
     creationDate?: string;
     creationUser?: string;
     modificationDate?: string;

diff --git a/src/app/shared/generated/model/workspace.ts b/src/app/shared/generated/model/workspace.ts
@@ -12,7 +12,7 @@
 
 
 export interface Workspace { 
-    workspaceName?: string;
+    name?: string;
     description?: string;
 }
 
diff --git a/src/app/theme/theme-designer/theme-designer.component.html b/src/app/theme/theme-designer/theme-designer.component.html
@@ -80,7 +80,7 @@
               accept=".png, .jpg, .jpeg"
             />
 
-            <div class="field col-12 mb-3">
+            <div class="field col-12 mb-3" *ngIf="constraintUpload()">
               <div class="flex flex-wrap sm:flex-nowrap align-items-center pb-2 row-gap-2 column-gap-4">
                 <app-image-container
                   [imageUrl]="fetchingLogoUrl"
@@ -98,7 +98,13 @@
                       <i class="pi pi-upload"></i>
                     </span>
                     <span class="p-float-label">
-                      <input pInputText type="text" id="theme_detail_upload_logo" formControlName="logoUrl" />
+                      <input
+                        pInputText
+                        type="text"
+                        id="theme_detail_upload_logo"
+                        formControlName="logoUrl"
+                        (input)="inputChange(theme, 'logo')"
+                      />
                       <label for="theme_detail_upload_logo">{{ 'Logo' }}</label>
                     </span>
                     <span
@@ -116,7 +122,7 @@
                 </div>
               </div>
             </div>
-            <div class="field col-12 mb-0">
+            <div class="field col-12 mb-0" *ngIf="constraintUpload()">
               <div class="flex flex-wrap sm:flex-nowrap align-items-center row-gap-2 column-gap-4">
                 <app-image-container
                   [imageUrl]="fetchingFaviconUrl"
@@ -134,7 +140,13 @@
                       <i class="pi pi-upload"></i>
                     </span>
                     <span class="p-float-label">
-                      <input pInputText type="text" id="favicon" formControlName="faviconUrl" />
+                      <input
+                        pInputText
+                        type="text"
+                        id="favicon"
+                        formControlName="faviconUrl"
+                        (input)="inputChange(theme, 'favicon')"
+                      />
                       <label for="favicon">Favicon</label>
                     </span>
                     <div class="flex flex-column">

diff --git a/src/app/theme/theme-designer/theme-designer.component.spec.ts b/src/app/theme/theme-designer/theme-designer.component.spec.ts
@@ -259,25 +259,6 @@ describe('ThemeDesignerComponent', () => {
       expect(component.themeId).toBe('id')
     })
 
-    it('should fetch logo and favicon from backend on edit mode when no http[s] present', () => {
-      const themeData = {
-        name: 'themeName',
-        logoUrl: 'logo_url',
-        faviconUrl: 'fav_url'
-      }
-      const themeResponse = {
-        resource: themeData
-      }
-      themeApiSpy.getThemeByName.and.returnValue(of(themeResponse) as any)
-      component.mode = 'EDIT'
-      component.themeName = 'themeName'
-
-      component.ngOnInit()
-
-      expect(component.fetchingLogoUrl).toBe(prepareUrl(themeData.logoUrl))
-      expect(component.fetchingFaviconUrl).toBe(prepareUrl(themeData.faviconUrl))
-    })
-
     it('should fetch logo and favicon from external source on edit mode when http[s] present', () => {
       const themeData = {
         logoUrl: 'http://myWeb.com/logo_url',
@@ -967,8 +948,8 @@ describe('ThemeDesignerComponent', () => {
           general: jasmine.objectContaining({ 'primary-color': 'rgb(255,255,255)' })
         })
       )
-      expect(component.fetchingFaviconUrl).toBe(prepareUrl('fetchedFavUrl'))
-      expect(component.fetchingLogoUrl).toBe(prepareUrl('fetchedLogoUrl'))
+      expect(component.fetchingFaviconUrl).toBe(undefined)
+      expect(component.fetchingLogoUrl).toBe(prepareUrl(undefined))
     })
   })
 })