@silexlabs/silex 3.0.1-0 → 3.0.1

package/src/ts/client/grapesjs/semantic.ts

@@ -17,7 +17,6 @@
 
 import {html, render} from 'lit-html'
 import {map} from 'lit-html/directives/map.js'
-import grapesjs from 'grapesjs/dist/grapes.min.js'
 
 // constants
 const pluginName = 'semantic'
@@ -48,7 +47,7 @@ const tags = [
 ]
 
 // plugin code
-export const semanticPlugin = grapesjs.plugins.add(pluginName, (editor, opts) => {
+export const semanticPlugin = (editor, opts) => {
   // Add the new trait to all component types
   editor.DomComponents.getTypes().map(type => {
     editor.DomComponents.addType(type.id, {
@@ -61,6 +60,7 @@ export const semanticPlugin = grapesjs.plugins.add(pluginName, (editor, opts) =>
             {
               label: 'Tag name',
               type: 'tag-name',
+              name: 'tag-name',
             },
           ]
         }
@@ -111,4 +111,4 @@ export const semanticPlugin = grapesjs.plugins.add(pluginName, (editor, opts) =>
       doRender(elInput, tagName)
     },
   })
-})
+}

package/src/ts/client/grapesjs/settings-sections.ts

@@ -0,0 +1,117 @@
+import {live} from 'lit-html/directives/live.js'
+import {html, TemplateResult} from 'lit-html'
+import { WebsiteSettings } from '../../types'
+
+// ID of the code editor wrapper
+export const idCodeWrapper = 'settings-head-wrapper'
+
+// Is the model a site or a page?
+export function isSite(model: any) { return !!model.getHtml }
+
+export interface SettingsSection {
+  id: string
+  label: string
+  render: (settings: WebsiteSettings, model: Backbone.Model) => TemplateResult
+}
+
+/**
+ * This is the settings dialog default sections
+ * Each section has an entry in the sidebar
+ * Each section render as part of the settings form
+ * The form is submitted to save the settings with all FormData
+ */
+export const defaultSections: SettingsSection[] = [{
+  id: 'general',
+  label: 'General',
+  render: (settings, model) => html`
+    <div id="settings-general" class="silex-hideable">
+      <div class="gjs-sm-sector-title">General</div>
+      <div class="silex-form__group col2">
+        <label class="silex-form__element">
+          <h3>${isSite(model) ? 'Site name' : 'Page name'}</h3>
+          <p class="silex-help">${isSite(model) ? 'The project name in the editor, for you to remember what it is about.' : 'Label of the page in the editor, and file name of the published HTML page.'}</p>
+          <input type="text" name="name" .value=${live(model.get('name') || '')}/>
+        </label>
+        <label class="silex-form__element">
+          <h3>Website language</h3>
+          <p class="silex-help">This is the default language code for this website. Example: en, fr, es...</p>
+          <input type="text" name="lang" .value=${live(settings.lang || '')}/>
+        </label>
+      </div>
+    </div>
+  `,
+}, {
+  id: 'seo',
+  label: 'SEO',
+  render: (settings, model) => html`
+    <div id="settings-seo" class="silex-hideable silex-hidden">
+      <div class="gjs-sm-sector-title">SEO</div>
+      <div class="silex-form__group col2">
+        <label class="silex-form__element">
+          <h3>Title</h3>
+          <p class="silex-help">Title of the browser window, and title in the search engines results. It is used by search engines to find out what your site is talking about. The title should be a maximum of 70 characters long, including spaces.</p>
+          <input type="text" name="title" .value=${live(settings.title || '')}/>
+        </label>
+        <label class="silex-form__element">
+          <h3>Description</h3>
+          <p class="silex-help">Description displayed by the search engines in search results. It is used by search engines to find out what your site is talking about. It is best to keep meta descriptions between 150 and 160 characters.</p>
+          <input type="text" name="description" .value=${live(settings.description || '')}/>
+        </label>
+        <label class="silex-form__element">
+          <h3>Favicon</h3>
+          <p class="silex-help">Small image displayed in the browser's address bar and in tabs. The recommended size is 16×16 or 32×32 pixels. This can be a URL or a relative path.</p>
+          <input type="text" name="favicon" .value=${live(settings.favicon || '')}/>
+        </label>
+      </div>
+    </div>
+  `,
+}, {
+  id: 'social',
+  label: 'Social',
+  render: (settings, model) => html`
+    <div id="settings-social" class="silex-hideable silex-hidden">
+      <div class="gjs-sm-sector-title">Social</div>
+      <div class="silex-help">
+        <p>Once your website is live, you can use these tools to test sharing:&nbsp;<a target="_blank" href="https://developers.facebook.com/tools/debug/">Facebook</a>,
+        <a target="_blank" href="https://cards-dev.twitter.com/validator">Twitter</a>,
+        <a target="_blank" href="https://www.linkedin.com/post-inspector/inspect/">Linkedin</a></p>
+      </div>
+      <div class="silex-form__group col2">
+        <label class="silex-form__element">
+          <h3>Title</h3>
+          <p class="silex-help">The title of your website displayed when a user shares your website on a social network.
+        Do not include any branding in this title, just eye-catching phrase, e.g. "Learn everything about fishing".
+        Title should be between 60 and 90 characters long.</p>
+          <input type="text" name="og:title" .value=${live(settings['og:title'] || '')}/>
+        </label>
+        <label class="silex-form__element">
+          <h3>Description</h3>
+          <p class="silex-help">Description displayed when a user shares your website on a social network. Make it catchy, and invite readers to visit your website too, e.g. "Sam's website about fishing, check it out!" Title should be between 60 and 90 characters long.</p>
+          <input type="text" name="og:description" .value=${live(settings['og:description'] || '')}/>
+        </label>
+        <label class="silex-form__element">
+          <h3>Image</h3>
+          <div class="silex-help">
+            <p>Thumbnail image which is displayed when your website is shared on a social network. The optimal size is 1200×627 pixels. At this size, your thumbnail will be big and stand out from the crowd. But do not exceed the 5MB size limit. If you use an image that is smaller than 400 pixels x 209 pixels, it will render as a much smaller thumbnail.</p>
+            <p>Please enter the full URL here, e.g. "http://mysite.com/path/to/image.jpg"</p>
+          </div>
+          <input type="text" name="og:image" .value=${live(settings['og:image'] || '')}/>
+        </label>
+      </div>
+    </div>
+  `,
+}, {
+  id: 'code',
+  label: 'Code',
+  render: (settings, model) => html`
+    <div id="settings-code" class="silex-hideable silex-hidden">
+      <div class="gjs-sm-sector-title">Code</div>
+      <div class="silex-form__group">
+        <label class="silex-form__element" id="${idCodeWrapper}">
+          <h3>HTML head</h3>
+          <p class="silex-help">HTML code which will be inserted in the HEAD tag.</p>
+        </label>
+      </div>
+    </div>
+  `,
+}]

package/src/ts/client/grapesjs/settings.ts

@@ -15,30 +15,27 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {html, render} from 'lit-html'
-import {live} from 'lit-html/directives/live.js'
-import * as grapesjs from 'grapesjs/dist/grapes.min.js'
+import {html, render, TemplateResult} from 'lit-html'
+import {defaultSections, idCodeWrapper, isSite, SettingsSection} from './settings-sections'
+
+/**
+ * @fileoverview This file contains the settings dialog. The config API lets plugins add sections to the settings dialog.
+ */
 
 import { WebsiteSettings } from '../../types'
+import { ClientEvent } from '../events'
+import { SILEX_VERSION } from '../../constants'
+
+const sectionsSite = [...defaultSections]
+const sectionsPage = [...defaultSections]
 
-const pluginName = 'settings-dialog'
 const el = document.createElement('div')
 let modal
 
-// Get version from webpack (see plugin in webpack.config.js)
-declare const VERSION: string
-
 export const cmdOpenSettings = 'open-settings'
 
-let version = 'v3'
-export const settingsDialog = grapesjs.plugins.add(pluginName, (editor, opts) => {
-  // Display Silex version from package.json
-  try {
-    version = VERSION
-  } catch (error) {
-    // Cannot get version from webpack (see plugin in webpack.config.js)
-  }
-  console.log('Silex version:', version)
+let headEditor = null
+export const settingsDialog = (editor, opts) => {
   editor.Commands.add(cmdOpenSettings, {
     run: (_, sender, {page}) => {
       modal = editor.Modal.open({
@@ -47,6 +44,7 @@ export const settingsDialog = grapesjs.plugins.add(pluginName, (editor, opts) =>
         attributes: { class: 'settings-dialog' },
       })
         .onceClose(() => {
+          sender?.set && sender.set('active', 0) // Deactivate the button to make it ready to be clicked again, only in case of a grapesjs button (not in the pages panel)
           editor.stopCommand(cmdOpenSettings) // apparently this is needed to be able to run the command several times
         })
       displaySettings(editor, opts, page)
@@ -54,14 +52,20 @@ export const settingsDialog = grapesjs.plugins.add(pluginName, (editor, opts) =>
       const form = el.querySelector('form')
       form.onsubmit = event => {
         event.preventDefault()
+        editor.trigger(ClientEvent.SETTINGS_SAVE_START, page)
         saveSettings(editor, opts, page)
+        editor.trigger(ClientEvent.SETTINGS_SAVE_END, page)
         editor.stopCommand(cmdOpenSettings)
       }
       form.querySelector('input')?.focus()
+      // Notify other plugins
+      editor.trigger(ClientEvent.SETTINGS_OPEN, page)
+      // Return the dialog
       return modal
     },
     stop: () => {
       modal.close()
+      editor.trigger(ClientEvent.SETTINGS_CLOSE)
     },
   })
   // add settings to the website
@@ -73,93 +77,156 @@ export const settingsDialog = grapesjs.plugins.add(pluginName, (editor, opts) =>
     const model = editor.getModel()
     model.set('settings', data.settings || {})
     model.set('name', data.name)
+    editor.once('canvas:frame:load', () => {
+      updateDom(editor)
+    })
+  })
+  // Normal way to apply the head content to the DOM
+  // fix #1559 Custom <head> code must be reapplied
+  editor.on('canvas:frame:load', () => {
     updateDom(editor)
   })
+  // When the page changes, update the dom
   editor.on('page', (e) => {
-    editor.Canvas.getFrameEl().addEventListener('load', () => {
-      updateDom(editor)
-    })
+    updateDom(editor)
+  })
+  headEditor = editor.CodeManager.createViewer({
+    readOnly: false,
+    codeName: 'htmlmixed',
+    lineNumbers: true,
+    lineWrapping: true,
+    autoFormat: false,
   })
-})
+}
+
+function showSection(item: SettingsSection) {
+  // **
+  // Handle the side bar
+  const aside = el.querySelector('aside.silex-bar') as HTMLElement
+  const ul = aside.querySelector('ul.silex-list--menu') as HTMLUListElement
+  const li = ul.querySelector('li#settings-sidebar-' + item.id) as HTMLLIElement
+  currentSection = item
+  if(!li) {
+    console.warn('Cannot find section', item.id, 'in the side bar, fallback to the first section')
+    if(!defaultSections[0] || defaultSections[0].id === item.id) {
+      console.error('Cannot find the default section in the side bar')
+      return
+    }
+    showSection(defaultSections[0]) // Fallback to the first section
+    return
+  }
+  // Update active
+  Array.from(ul.querySelectorAll('.active')).forEach(el => el.classList.remove('active'))
+  li.classList.add('active')
+  // **
+  // Handle the main section
+  const main = el.querySelector('main#settings__main') as HTMLElement
+  const mainItem = main.querySelector(`#settings-${item.id}`)
+  if(!mainItem) {
+    console.warn('Cannot find section', item.id, 'in the settings dialog, fallback to the first section')
+    if(!defaultSections[0] || defaultSections[0].id === item.id) {
+      console.error('Cannot find the default section in the settings dialog')
+      return
+    }
+    showSection(defaultSections[0]) // Fallback to the first section
+    return
+  }
+  // Update hidden
+  Array.from(main.querySelectorAll('.silex-hideable')).forEach(el => el.classList.add('silex-hidden'))
+  mainItem.classList.remove('silex-hidden')
+  // This messes up with the save / cancel mechanism
+  // displaySettings(editor, config, model)
+  // Refresh the code editor just in case it went from hidden to visible
+  // This makes it ready to be used when the user clicks on the tab
+  headEditor.refresh()
+}
+
+export function addSection(section, siteOrPage: 'site' | 'page', position: 'first' | 'last' | number) {
+  const sections = siteOrPage === 'site' ? sectionsSite : sectionsPage
+  if (position === 'first') {
+    sections.unshift(section)
+  } else if (position === 'last') {
+    sections.push(section)
+  } else if (typeof position === 'number') {
+    sections.splice(position, 0, section)
+  } else {
+    throw new Error('Invalid position for settings section')
+  }
+}
+
+export function removeSection(id, siteOrPage: 'site' | 'page') {
+  const sections = siteOrPage === 'site' ? sectionsSite : sectionsPage
+  const index = sections.findIndex(section => section.id === id)
+  if(index === -1) throw new Error(`Cannot find section with id ${id}`)
+  sections.splice(index, 1)
+}
 
-// Is the model a site or a page?
-function isSite(model) { return !!model.getHtml }
 
+let currentSection
 function displaySettings(editor, config, model = editor.getModel()) {
+  // Update the model with the current settings
   const settings = model.get('settings') || {} as WebsiteSettings
   model.set('settings', settings)
+  // Get the current sections for page or site
+  const menuItemsCurrent = isSite(model) ? sectionsSite : sectionsPage
+  // Init the current section selection
+  currentSection = currentSection || menuItemsCurrent[0]
+  const sections: TemplateResult[] = menuItemsCurrent.map(item => {
+    try {
+      return item.render(settings, model)
+    } catch (e) {
+      console.error('Error rendering settings section', item.id, e)
+      return html`<div class="silex-error">Error rendering settings section ${item.id}</div>`
+    }
+  })
+  // Render the settings dialog
   render(html`
-    <p>The page settings will override site settings, <a href="https://github.com/silexlabs/Silex/wiki/Settings" target="_blank">more info about settings here</a>.</p>
     <form class="silex-form">
-      <h2>General settings</h2>
-      <div class="silex-form__group col2">
-        <label class="silex-form__element">
-          <h3>${isSite(model) ? 'Site name' : 'Page name'}</h3>
-          <p>${isSite(model) ? 'The project name in the editor, for you and your team.' : 'Label of the page in the editor, and file name of the HTML page.'}</p>
-          <input type="text" name="name" .value=${live(model.get('name') || '')}/>
-        </label>
-        <label class="silex-form__element">
-          <h3>Website language</h3>
-          <p>This is the default language code for this website. Example: en, fr, es...</p>
-          <input type="text" name="lang" .value=${live(settings.lang || '')}/>
-        </label>
-        <label class="silex-form__element">
-          <h3>Title</h3>
-          <p>Title of the browser window, and title in the search engines results. It is used by search engines to find out what your site is talking about. The title should be a maximum of 70 characters long, including spaces.</p>
-          <input type="text" name="title" .value=${live(settings.title || '')}/>
-        </label>
-        <label class="silex-form__element">
-          <h3>Description</h3>
-          <p>Description displayed by the search engines in search results. It is used by search engines to find out what your site is talking about. It is best to keep meta descriptions between 150 and 160 characters.</p>
-          <input type="text" name="description" .value=${live(settings.description || '')}/>
-        </label>
-        <label class="silex-form__element">
-          <h3>Favicon</h3>
-          <p>Small image displayed in the browser's address bar and in tabs. The recommended size is 16×16 or 32×32 pixels. This can be a URL or a relative path.</p>
-          <input type="text" name="favicon" .value=${live(settings.favicon || '')}/>
-        </label>
-      </div>
-      <h2>Social networks sharing</h2>
-      <div>
-        <p>Once your website is live, you can use these tools to test sharing:&nbsp;<a target="_blank" href="https://developers.facebook.com/tools/debug/">Facebook</a>,
-        <a target="_blank" href="https://cards-dev.twitter.com/validator">Twitter</a>,
-        <a target="_blank" href="https://www.linkedin.com/post-inspector/inspect/">Linkedin</a></p>
-      </div>
-      <div class="silex-form__group col2">
-        <label class="silex-form__element">
-          <h3>Title</h3>
-          <p>The title of your website displayed when a user shares your website on a social network.
-        Do not include any branding in this title, just eye-catching phrase, e.g. "Learn everything about fishing".
-        Title should be between 60 and 90 characters long.</p>
-          <input type="text" name="og:title" .value=${live(settings['og:title'] || '')}/>
-        </label>
-        <label class="silex-form__element">
-          <h3>Description</h3>
-          <p>Description displayed when a user shares your website on a social network. Make it catchy, and invite readers to visit your website too, e.g. "Sam's website about fishing, check it out!" Title should be between 60 and 90 characters long.</p>
-          <input type="text" name="og:description" .value=${live(settings['og:description'] || '')}/>
-        </label>
-        <label class="silex-form__element">
-          <h3>Image</h3>
-          <p>Thumbnail image which is displayed when your website is shared on a social network. The optimal size is 1200×627 pixels. At this size, your thumbnail will be big and stand out from the crowd. But do not exceed the 5MB size limit. If you use an image that is smaller than 400 pixels x 209 pixels, it will render as a much smaller thumbnail.</p>
-          <p>Please enter the full URL here, e.g. "http://mysite.com/path/to/image.jpg"</p>
-          <input type="text" name="og:image" .value=${live(settings['og:image'] || '')}/>
-        </label>
-      </div>
-      <h2>Code</h2>
-      <div class="silex-form__group">
-        <label class="silex-form__element">
-          <h3>HTML head</h3>
-          <p>HTML code which will be inserted in the HEAD tag.</p>
-          <textarea name="head" .value=${live(settings.head || '')}></textarea>
-        </label>
+      <div class="silex-help">
+        ${isSite(model) ? html`
+          <p>Here you can set the name of your website, SEO and social networks sharing data.</p>
+          <p>These settings are overriden by the page settings, <a href="https://github.com/silexlabs/Silex/wiki/Settings" target="_blank">more info about settings here</a>.</p>
+        ` : html`
+          <p>Here you can set the name of your page, SEO and social networks sharing data.</p>
+          <p>These settings override the site settings, <a href="https://github.com/silexlabs/Silex/wiki/Settings" target="_blank">more info about settings here</a>.</p>
+        `}
       </div>
+      <section class="silex-sidebar-dialog">
+        <aside class="silex-bar">
+          <ul class="silex-list silex-list--menu">
+            ${menuItemsCurrent.map(item => html`
+              <li
+                id="settings-sidebar-${item.id}"
+                class=${item.id === currentSection.id ? 'active' : ''}
+                @click=${e => {
+    e.preventDefault()
+    // Show the new section
+    showSection(item)
+    // Notify other plugins
+    editor.trigger(ClientEvent.SETTINGS_SECTION_CHANGE, item.id)
+  }}
+              >
+                ${item.label}
+              </li>
+            `)}
+          </ul>
+        </aside>
+        <main id="settings__main">
+            ${ sections }
+        </main>
+      </section>
       <footer>
-        <p class="silex-version">Silex ${version}</p>
+        <p class="silex-version">Silex ${SILEX_VERSION}</p>
         <input class="silex-button" type="button" @click=${e => editor.stopCommand(cmdOpenSettings)} value="Cancel">
-        <input class="silex-button" type="submit" value="Ok">
+        <input class="silex-button" type="submit" value="Apply">
       </footer>
     </form>
   `, el)
+  // Display the current section
+  showSection(currentSection)
+  // Init the code editor
+  el.querySelector(`#${idCodeWrapper}`)?.appendChild(headEditor.getElement())
+  headEditor.setContent(settings.head || '')
 }
 
 function saveSettings(editor, config, model = editor.getModel()) {
@@ -167,13 +234,19 @@ function saveSettings(editor, config, model = editor.getModel()) {
   const formData = new FormData(form)
   const data = Array.from(formData as any)
     .reduce((aggregate, [key, value]) => {
-      aggregate[key] = value
+      // Keep only the values that are set
+      if(value !== '') {
+        aggregate[key] = value
+      }
       return aggregate
     }, {}) as {[key: string]: any}
-    // take the name out to the main model (by design in grapesjs pages)
+  // take the name out to the main model (by design in grapesjs pages)
   const { name, ...settings } = data
   model.set({
-    settings,
+    settings: {
+      ...data,
+      head: headEditor.getContent(),
+    },
     name,
   })
   // save if auto save is on
@@ -193,13 +266,18 @@ function getHeadContainer(doc, className) {
 }
 function updateDom(editor) {
   const doc = editor.Canvas.getDocument()
-  if(doc) {
-    // Site head
-    getHeadContainer(doc, 'site-head')
-      .innerHTML = editor.getModel().get('settings').head || ''
-    // Pages head
-    getHeadContainer(doc, 'page-head')
-      .innerHTML = editor.Pages.getSelected().get('settings')?.head || ''
+  const settings = editor.getModel().get('settings')
+  const pageSettings = editor.Pages.getSelected().get('settings')
+  if(doc && settings) {
+    // Delay the update to let the DOM be ready
+    setTimeout(() => {
+      // Site head
+      getHeadContainer(doc, 'site-head')
+        .innerHTML = settings.head || ''
+      // Pages head
+      getHeadContainer(doc, 'page-head')
+        .innerHTML = pageSettings?.head || ''
+    })
   } else {
     // No document??
   }

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

@@ -18,57 +18,122 @@
 import { ConnectorId, WebsiteId, WebsiteData, ConnectorUser, ConnectorType, ApiError } from '../../types'
 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 cmdPauseAutoSave = 'pause-auto-save'
+
+// Mechanism to keep only the last save during publication
+let lastPendingSaving: WebsiteData = null
+
+// Mechanism to avoid concurrent saving
+// Note: there is already such a mechanism in grapesjs but it fails when the save is delayed by the publication
+let isSaving = false
 
-async function wait(ms: number) {
-  return new Promise((resolve) => {
-    setTimeout(resolve, ms)
-  })
-}
 export const storagePlugin = (editor) => {
+  // Add useful commands
+  editor.Commands.add(cmdPauseAutoSave, {
+    run: () => {
+      if(!editor.StorageManager.isAutosave()) throw new Error('Autosave is not enabled')
+      editor.StorageManager.setAutosave(false)
+    },
+    stop: () => {
+      editor.editor.set('changesCount', 0)
+      editor.UndoManager.clear()
+      editor.StorageManager.setAutosave(true)
+    },
+  })
+  // Add the storage connector
   editor.Storage.add('connector', {
     async load(options: { id: WebsiteId, connectorId: ConnectorId }): Promise<WebsiteData> {
       try {
-        console.log('storage get user')
         const user: ConnectorUser = await getCurrentUser(editor) ?? await updateUser(editor, ConnectorType.STORAGE, options.connectorId)
-        if(user) {
-          const data = await websiteLoad({websiteId: options.id, connectorId: user.storage.connectorId})
-          return data
-        } else {
-          return new Promise((resolve, reject) => {
-            editor.once(eventLoggedIn, async () => {
-              try {
-                editor.StorageManager.setAutosave(false)
-                const data = await editor.Storage.load(options)
-                editor.StorageManager.setAutosave(true)
-                //editor.loadProjectData(data)
-                resolve(data)
-              } catch (err) {
-                console.error('connectorPlugin load error', err)
-                reject(err)
-              }
-            })
-            editor.Commands.run(cmdLogin)
+        if (!user) throw new ApiError('Not logged in', 401)
+        const data = await websiteLoad({ websiteId: options.id, connectorId: user.storage.connectorId }) as WebsiteData
+        if (data.assets) data.assets = addTempDataToAssetUrl(data.assets, options.id, user.storage.connectorId)
+        if (data.pages) data.pages = addTempDataToPages(data.pages, options.id, user.storage.connectorId)
+        if (data.styles) data.styles = addTempDataToStyles(data.styles, options.id, user.storage.connectorId)
+        return data
+
+      } catch (err) {
+        editor.UndoManager.clear()
+        if (err.httpStatusCode === 401) {
+          editor.once(eventLoggedIn, async () => {
+            try {
+              editor.runCommand(cmdPauseAutoSave)
+              const data = await editor.Storage.load(options)
+              editor.once('canvas:frame:load', () => editor.stopCommand(cmdPauseAutoSave))
+              editor.loadProjectData(data)
+            } catch (err) {
+              console.error('connectorPlugin load error', err)
+              throw err
+            }
           })
+          editor.Commands.run(cmdLogin)
         }
-      } catch (err) {
         console.error('connectorPlugin load error', err)
         throw err
       }
     },
 
     async store(data: WebsiteData, options: { id: WebsiteId, connectorId: ConnectorId }) {
+      // Be sure that it is immutable
+      const myData = { ...data }
+      return await this.addToQueue(myData, options)
+    },
+
+    async addToQueue(data: WebsiteData, options) {
+      // Handle concurrent saving
+      if (lastPendingSaving && lastPendingSaving !== data) {
+        // Cancel previous saving
+      }
+      lastPendingSaving = data
+      // Go ahaed and save
+      return this.doStore(lastPendingSaving, options)
+    },
+
+    async doStore(data, options) {
+      if (editor.PublicationManager?.status === PublicationStatus.STATUS_PENDING) {
+        // Publication is pending, save is delayed
+        return new Promise((resolve) => {
+          editor.once(ClientEvent.PUBLISH_END, () => {
+            resolve(this.doStore(data, options))
+          })
+        })
+      }
       try {
-        if(await getCurrentUser(editor)) {
-          const user = await getCurrentUser(editor)
-          await websiteSave({websiteId: options.id, connectorId: user.storage.connectorId, data})
-        } else {
-          editor.once(eventLoggedIn, () => {
-            return editor.Storage.save(options)
+        if (isSaving) {
+          // Concurrent saving, save is delayed
+          editor.once('storage:start:store', () => {
+            this.doStore(data, options)
           })
-          editor.Commands.run(cmdLogin)
+        } else {
+          if (lastPendingSaving === data) {
+            lastPendingSaving = null
+            isSaving = true
+            const user = await getCurrentUser(editor)
+            if (user) {
+              data.assets = removeTempDataFromAssetUrl(data.assets)
+              data.pages = removeTempDataFromPages(data.pages)
+              data.styles = removeTempDataFromStyles(data.styles)
+              await websiteSave({ websiteId: options.id, connectorId: user.storage.connectorId, data })
+              isSaving = false
+            } else {
+              // Not logged in save is delayed
+              editor.once(eventLoggedIn, () => {
+                isSaving = false
+                return editor.Storage.store()
+              })
+              editor.Commands.run(cmdLogin)
+            }
+          } else {
+            // Canceled saving
+          }
         }
       } catch (err) {
         console.error('connectorPlugin store error', err)
+        isSaving = false
         throw err
       }
     }
@@ -81,7 +146,7 @@ export const storagePlugin = (editor) => {
     handleError(err)
   })
   editor.on('asset:upload:end', (err: Error) => {
-    editor.save()
+    editor.store()
   })
   editor.on('asset:upload:error', (err: Error) => {
     handleError(err)