@silexlabs/silex 3.0.0-alpha.164 → 3.0.0-alpha.166

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@silexlabs/silex",
   "description": "Free and easy website builder for everyone.",
-  "version": "3.0.0-alpha.164",
+  "version": "3.0.0-alpha.166",
   "version:backwardcompat": "3.0.0",
   "author": {
     "name": "Alex Hoyau",

package/src/ts/client/grapesjs/PublicationManager.ts

@@ -160,7 +160,8 @@ export class PublicationManager {
       }
       this.status = PublicationStatus.STATUS_NONE
       // Save the website with the new settings
-      await this.editor.store(null)
+      // WIP: prevent saving during publication
+      // await this.editor.store(null)
       // Display the dialog
       this.dialog && this.dialog.displayPending(this.job, this.status)
       return
@@ -190,7 +191,8 @@ export class PublicationManager {
             this.settings.options = data.options
             this.status = PublicationStatus.STATUS_NONE
             // Save the website with the new settings
-            await this.editor.store(null)
+            // WIP: prevent saving during publication
+            // await this.editor.store(null)
             // Display the dialog
             this.dialog && this.dialog.displayPending(this.job, this.status)
             //await this.startPublication()

package/src/ts/client/grapesjs/storage.ts

@@ -19,6 +19,8 @@ import { ConnectorId, WebsiteId, WebsiteData, ConnectorUser, ConnectorType, ApiE
 import { websiteLoad, websiteSave } from '../api'
 import { cmdLogin, eventLoggedIn, eventLoggedOut, getCurrentUser, updateUser } from './LoginDialog'
 import { addTempDataToPages, addTempDataToAssetUrl, addTempDataToStyles, removeTempDataFromAssetUrl, removeTempDataFromPages, removeTempDataFromStyles } from '../assetUrl'
+import { PublicationStatus } from './PublicationManager'
+import { ClientEvent } from '../events'
 
 export const storagePlugin = (editor) => {
   editor.Storage.add('connector', {
@@ -57,6 +59,13 @@ export const storagePlugin = (editor) => {
     },
 
     async store(data: WebsiteData, options: { id: WebsiteId, connectorId: ConnectorId }) {
+      console.log('store', editor.PublicationManager.status, PublicationStatus.STATUS_PENDING)
+      if(editor.PublicationManager.status === PublicationStatus.STATUS_PENDING) {
+        console.warn('Publication is pending, saving later')
+        return new Promise((resolve) => {
+          editor.once(ClientEvent.PUBLISH_END, () => resolve(this.store(data, options)))
+        })
+      }
       try {
         if(await getCurrentUser(editor)) {
           const user = await getCurrentUser(editor)