fix: better naming conventions for uploaded files #77

package.json

@@ -10,6 +10,7 @@
     "dev:fields-mat": "ng build fields-mat --configuration=development --watch",
     "dev:segments-mat": "ng build segments-mat --configuration=development --watch",
     "dev:page-builder": "ng build page-builder --configuration=development --watch",
+    "dev:tinymce": "ng build tinymce --configuration=development --watch",
     "build:form-builder": "ng build form-builder && cp ./README.md ./dist/@jaspero/form-builder && cp LICENSE ./dist/@jaspero/form-builder",
     "build:fields-mat": "ng build fields-mat && cp ./README.md ./dist/@jaspero/fb-fields-mat && cp LICENSE ./dist/@jaspero/fb-fields-mat",
     "build:segments-mat": "ng build segments-mat && cp ./README.md ./dist/@jaspero/fb-segments-mat && cp LICENSE ./dist/@jaspero/fb-segments-mat",
@@ -44,7 +45,7 @@
     "@jaspero/fb-form-ui": "2.4.7",
     "@jaspero/fb-page-builder": "3.17.1",
     "@jaspero/fb-segments-mat": "file:projects/segments-mat",
-    "@jaspero/fb-tinymce": "2.4.5",
+    "@jaspero/fb-tinymce": "file:projects/tinymce",
     "@jaspero/form-builder": "file:projects/form-builder",
     "@jaspero/ng-helpers": "5.2.0",
     "@jaspero/utils": "1.7.0",

projects/fields-mat/src/lib/fields/file/file.component.ts

@@ -95,7 +95,7 @@ export class FileComponent extends FieldComponent<FileData> implements OnInit {
         const current = window.jpFb.exists(data);
 
         if (!current.exists || !window.jpFb.change(data)) {
-          return of();
+          return of(true);
         }
 
         if (current.value && typeof current.value !== 'string') {
@@ -111,7 +111,7 @@ export class FileComponent extends FieldComponent<FileData> implements OnInit {
              * Maybe we should put a type extension based on type
              * instead of taking from the name
              */
-            name += (current.value.name.split('.')[1]);;
+            name += '.' + (current.value.name.split('.')[1]);;
           }
 
           return from(
@@ -129,7 +129,7 @@ export class FileComponent extends FieldComponent<FileData> implements OnInit {
             );
         }
 
-        return of();
+        return of(true);
       }
     })
   }

projects/fields-mat/src/lib/fields/gallery/gallery.component.ts

@@ -119,15 +119,15 @@ export class GalleryComponent extends FieldComponent<GalleryData> implements OnI
         const current = window.jpFb.exists(data);
 
         if (!current.exists) {
-          return of();
+          return of(true);
         }
 
         if (
           !data.cData.toRemove.length &&
           !current.value ||
           !current.value.find((val: any) => !val.live)
         ) {
-          return of();
+          return of(true);
         }
 
         return forkJoin([
@@ -154,7 +154,7 @@ export class GalleryComponent extends FieldComponent<GalleryData> implements OnI
                  * Maybe we should put a type extension based on type
                  * instead of taking from the name
                  */
-                name += (current.value.name.split('.')[1]);;
+                name += '.' + (cur.pushToLive.name.split('.')[1]);;
               }
 
               acc.push(

projects/fields-mat/src/lib/fields/image/image.component.ts

@@ -108,7 +108,7 @@ export class ImageComponent extends FieldComponent<ImageData> implements OnInit
         const current = window.jpFb.exists(data);
 
         if (!current.exists || !window.jpFb.change(data)) {
-          return of();
+          return of(true);
         }
 
         if (current.value && typeof current.value !== 'string') {
@@ -124,7 +124,7 @@ export class ImageComponent extends FieldComponent<ImageData> implements OnInit
              * Maybe we should put a type extension based on type
              * instead of taking from the name
              */
-            name += (current.value.name.split('.')[1]);;
+            name += '.' + (current.value.name.split('.')[1]);;
           }
 
           return from(
@@ -144,7 +144,7 @@ export class ImageComponent extends FieldComponent<ImageData> implements OnInit
             );
         }
 
-        return of();
+        return of(true);
       }
     });
   }

projects/form-builder/src/lib/form-builder.component.ts

@@ -139,6 +139,8 @@ export class FormBuilderComponent implements OnChanges, OnDestroy {
       .sort((p1, p2) => p1[1].priority - p2[1].priority)
       .filter(process => process[1].save);
 
+    console.log(processes);
+
     if (!processes.length) {
       return of(data);
     }

projects/page-builder/src/lib/fields/background/background.component.ts

@@ -151,12 +151,12 @@ export class BackgroundComponent extends ImageComponent implements OnInit {
         const current = window.jpFb.exists(data);
 
         if (!current.exists) {
-          return of();
+          return of(true);
         }
 
         if (this.color.value) {
           set(data.outputValue, data.pointer, this.imageUrl.value);
-          return of();
+          return of(true);
         }
 
         if (current.value && typeof current.value !== 'string') {
@@ -172,7 +172,7 @@ export class BackgroundComponent extends ImageComponent implements OnInit {
              * Maybe we should put a type extension based on type
              * instead of taking from the name
              */
-            name += (current.value.name.split('.')[1]);;
+            name += '.' + (current.value.name.split('.')[1]);;
           }
 
           return from(
@@ -192,7 +192,7 @@ export class BackgroundComponent extends ImageComponent implements OnInit {
             );
         }
 
-        return of();
+        return of(true);
       }
     });
   }

projects/page-builder/src/lib/page-builder/page-builder.component.ts

@@ -286,7 +286,7 @@ export class PageBuilderComponent extends FieldComponent<BlocksData> implements
             }
           }))
         );
-        return of();
+        return of(true);
       }
     })
   }

projects/tinymce/src/lib/template-editor/interfaces/template-editor-definition.ts

@@ -1,4 +1,4 @@
-import {DefinitionWithConfiguration} from '@jaspero/form-builder/public-api';
+import {DefinitionWithConfiguration} from '@jaspero/form-builder';
 import {TemplateEditorConfig} from '../template-editor.component';
 
 export type TemplateEditorDefinition = DefinitionWithConfiguration<TemplateEditorConfig, '', 'template-editor'>

projects/tinymce/src/lib/tinymce/tinymce-definition.ts

@@ -1,4 +1,4 @@
-import {DefinitionWithConfiguration} from '@jaspero/form-builder/public-api';
+import {DefinitionWithConfiguration} from '@jaspero/form-builder';
 import {TinyConfiguration} from './tinymce.component';
 
 export type TinymceDefinition = DefinitionWithConfiguration<TinyConfiguration, '', 'tinymce'>

projects/tinymce/src/lib/tinymce/tinymce.component.ts

@@ -104,7 +104,7 @@ export class TinymceComponent extends FieldComponent<TinyData>
         const current = window.jpFb.exists(data);
 
         if (!current.exists || !window.jpFb.change(data)) {
-          return of();
+          return of(true);
         }
 
         if (this.imageReplacements.length) {
@@ -166,7 +166,7 @@ export class TinymceComponent extends FieldComponent<TinyData>
           }
         }
 
-        return of();
+        return of(true);
       }
     })
   }

src/app/app.module.ts

@@ -17,6 +17,7 @@ import {ExampleCustomComponent} from './example-custom/example-custom.component'
 import {MockDbService} from './mock/mock-db.service';
 import {MockStorageService} from './mock/mock-storage.service';
 import {translocoLoader} from './transloco.loader';
+import {TinymceModule} from '@jaspero/fb-tinymce';
 
 const routes: Routes = [
   {
@@ -43,6 +44,7 @@ const routes: Routes = [
     HttpClientModule,
     RouterModule.forRoot(routes),
     TranslocoModule,
+    TinymceModule,
     FormBuilderModule.forRoot(),
     FbFieldsMatModule.forRoot({prefix: ''}),
     FbSegmentsMatModule.forRoot({prefix: ''}),

src/app/examples/core/core.component.ts

@@ -1,6 +1,6 @@
 import {AfterViewInit, ChangeDetectionStrategy, Component, QueryList, ViewChildren} from '@angular/core';
 import {FormBuilderComponent} from '@jaspero/form-builder';
-import {EXAMPLE_TWO} from './forms/example-two';
+import {SAVE_METHOD_EXAMPLE} from './forms/save-method-example';
 
 @Component({
   selector: 'sc-core',
@@ -13,7 +13,7 @@ export class CoreComponent implements AfterViewInit {
   @ViewChildren(FormBuilderComponent)
   formComponents: QueryList<FormBuilderComponent>;
 
-  form = EXAMPLE_TWO;
+  form = SAVE_METHOD_EXAMPLE;
 
   ngAfterViewInit() {
     this.formComponents.forEach(log => {

src/app/examples/core/forms/save-method-example.ts

@@ -0,0 +1,45 @@
+import {FormBuilderData} from '../../../../../projects/form-builder/src/lib/interfaces/form-builder-data.interface';
+
+export const SAVE_METHOD_EXAMPLE: FormBuilderData = {
+  schema: {
+    properties: {
+      file: {type: 'string'},
+      image: {type: 'string'},
+      gallery: {type: 'array'},
+      tiny: {type: 'string'}
+    }
+  },
+  definitions: {
+    image: {
+      component: {
+        type: 'image'
+      }
+    },
+    file: {
+      component: {
+        type: 'file'
+      }
+    },
+    gallery: {
+      component: {
+        type: 'gallery'
+      }
+    },
+    tiny: {
+      component: {
+        type: 'tinymce'
+      }
+    }
+  },
+  segments: [
+    {
+      type: 'empty',
+      fields: [
+        '/file',
+        '/image',
+        '/tiny',
+        '/gallery'
+      ]
+    }
+  ]
+};

src/app/mock/mock-storage.service.ts

@@ -9,7 +9,7 @@ export class MockStorageService implements StorageService {
   upload(path: string, data: any, metadata?: any): any {
     return Promise.resolve({
       ref: {
-        getDownloadURL: () => Promise.resolve('https://jaspero.co')
+        getDownloadURL: () => Promise.resolve('https://jaspero.co/' + path)
       }
     });
   }

tsconfig.json

@@ -47,6 +47,9 @@
       ],
       "@jaspero/monaco-editor": [
         "dist/monaco-editor"
+      ],
+      "@jaspero/fb-tinymce": [
+        "dist/tinymce"
       ]
     }
   },