@silexlabs/silex 3.0.0-alpha.71 → 3.0.0-alpha.74

package/src/css/silex.scss

@@ -37,6 +37,9 @@
   overflow: auto;
   form.silex-form {
     padding-bottom: 100px; // leave space for fixed footer
+    textarea {
+      min-height: 250px;
+    }
   }
   .silex-form__element {
     padding: 10px 5px;

package/src/ts/client/api.ts

@@ -35,7 +35,7 @@ export enum ApiRoute {
   WEBSITE_META_WRITE = API_PATH + API_WEBSITE_PATH + API_WEBSITE_META_WRITE,
 }
 
-const ROOT_URL = window.location.origin
+const ROOT_URL = window.location.origin + window.location.pathname
 
 export async function getUser({type, connectorId}: {type: ConnectorType, connectorId?: ConnectorId}): Promise<ConnectorUser> {
   return api<ApiConnectorUserQuery, null, ApiConnectorUserResponse>(ApiRoute.CONNECTOR_USER, 'GET', {

package/src/ts/client/assetUrl.ts

@@ -1,7 +1,5 @@
 import { API_PATH, API_WEBSITE_ASSET_READ, API_WEBSITE_PATH } from '../constants'
 import { Asset, ClientSideFileType, Component, ConnectorId, Page, Style, WebsiteId } from '../types'
-import { Editor, Page as GrapesPage, CssRule, ObjectStrings } from 'grapesjs'
-import { onAll } from './utils'
 
 /**
  * @fileoverview Helpers to manage assets URL
@@ -152,7 +150,7 @@ function removeTempDataFromComponents(component: Component): Component {
 /**
  * Add temp data to pages
  */
-export function addTemDataToPages(pages: Page[], websiteId: WebsiteId, storageId: ConnectorId): Page[] {
+export function addTempDataToPages(pages: Page[], websiteId: WebsiteId, storageId: ConnectorId): Page[] {
   return pages.map((page: Page) => {
     return {
       ...page,

package/src/ts/client/config.ts

@@ -50,7 +50,7 @@ export class ClientConfig extends Config {
   /**
    * root url of Silex app
    */
-  rootUrl = window.location.origin
+  rootUrl = window.location.origin + window.location.pathname
 
   /**
    * debug mode

package/src/ts/client/grapesjs/PublicationUi.ts

@@ -174,7 +174,7 @@ export class PublicationUi {
         <p>Publication error</p>
         <div>${unsafeHTML(this.errorMessage)}</div>
       ` : ''}
-      ${job && job.message ? html`
+      ${job?.message ? html`
         <p>${unsafeHTML(job.message)}</p>
       ` : ''}
       ${this.isPending(status) ? html`
@@ -183,7 +183,7 @@ export class PublicationUi {
           style="width: 100%;"
         ></progress>
       ` : ''}
-      ${job && job.logs?.length && job.logs[0].length ? html`
+      ${job?.logs?.length && job.logs[0].length ? html`
         <br><details>
           <summary>Logs</summary>
           <pre style="
@@ -195,7 +195,7 @@ export class PublicationUi {
           </pre>
         </details>
       ` : ''}
-      ${job && job.errors?.length && job.errors[0].length ? html`
+      ${job?.errors?.length && job.errors[0].length ? html`
         <br><details>
           <summary>Errors</summary>
           <pre style="

package/src/ts/client/grapesjs/index.ts

@@ -112,17 +112,12 @@ export function getEditorConfig(id: WebsiteId, connectorId: ConnectorId, rootUrl
 
     storageManager: {
       autoload: false,
-      //type: 'remote',
       type: 'connector',
       options: {
         connector: {
           id,
           connectorId,
         },
-        //remote: {
-        //  urlStore: `${rootUrl}/${API_WEBSITE_WRITE}?id=${id}`,
-        //  urlLoad: `${rootUrl}/${API_WEBSITE_READ}?id=${id}`,
-        //},
       },
     },
 

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

@@ -18,52 +18,47 @@
 import { ConnectorId, WebsiteId, WebsiteData, ConnectorUser, ConnectorType, ApiError, Asset, Page, Component, Style } from '../../types'
 import { websiteLoad, websiteSave } from '../api'
 import { cmdLogin, eventLoggedIn, eventLoggedOut, getCurrentUser, updateUser } from './LoginDialog'
-import { addTemDataToPages, addTempDataToAssetUrl, addTempDataToStyles, removeTempDataFromAssetUrl, removeTempDataFromPages, removeTempDataFromStyles } from '../assetUrl'
+import { addTempDataToPages, addTempDataToAssetUrl, addTempDataToStyles, removeTempDataFromAssetUrl, removeTempDataFromPages, removeTempDataFromStyles } from '../assetUrl'
 
 export const storagePlugin = (editor) => {
   editor.Storage.add('connector', {
     async load(options: { id: WebsiteId, connectorId: ConnectorId }): Promise<WebsiteData> {
       try {
         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}) as WebsiteData
-          if(data.assets) data.assets = addTempDataToAssetUrl(data.assets, options.id, user.storage.connectorId)
-          if(data.pages) data.pages = addTemDataToPages(data.pages, options.id, user.storage.connectorId)
-          if(data.styles) data.styles = addTempDataToStyles(data.styles, options.id, 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) {
+        if(err.httpStatusCode === 401) {
+          editor.once(eventLoggedIn, async () => {
+            try {
+              editor.StorageManager.setAutosave(false)
+              const data = await editor.Storage.load(options)
+              editor.StorageManager.setAutosave(true)
+              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 }) {
-      console.log('connectorPlugin store', data, options)
       try {
         if(await getCurrentUser(editor)) {
-          console.log('connectorPlugin store2', data, options)
           const user = await getCurrentUser(editor)
           data.assets = removeTempDataFromAssetUrl(data.assets)
           data.pages = removeTempDataFromPages(data.pages)
           data.styles = removeTempDataFromStyles(data.styles)
-          console.log('connectorPlugin store3', data, options)
           await websiteSave({websiteId: options.id, connectorId: user.storage.connectorId, data})
         } else {
           editor.once(eventLoggedIn, () => {

package/src/ts/client/grapesjs/symbolDialogs.ts

@@ -31,7 +31,7 @@ export default grapesjs.plugins.add(name, (editor, opts) => {
   editor.Commands.add(cmdPromptAddSymbol, {
     run: (_, sender) => {
       const label = prompt('Label', getNext('Symbol '))
-      const icon = prompt('Icon', 'fa-list')
+      const icon = 'fa-gem'
       editor.runCommand(cmdAddSymbol, { label, icon })
     }
   })

package/src/ts/client/publication-transformers.ts

@@ -18,7 +18,6 @@
 import { Component, CssRule, Editor, ObjectStrings, Page } from 'grapesjs'
 import { ClientSideFile, ClientSideFileType, ClientSideFileWithPermalink, PublicationData } from '../types'
 import { onAll } from './utils'
-import { getPageLink, getPageSlug } from '../page'
 
 /**
  * @fileoverview Silex publication transformers are used to control how the site is rendered and published
@@ -95,15 +94,11 @@ export function renderComponents(editor: Editor) {
       c[ATTRIBUTE_METHOD_STORE_INLINE_CSS] = c.getStyle
       const href = c.get('attributes').href as string | undefined
       if(href?.startsWith('./')) {
-        //const page = editor.Pages.getAll().find(p => getPageLink(p.getName()) === href)
-        //if(page) {
         c[ATTRIBUTE_METHOD_STORE_HREF] = href
         c.set('attributes', {
           ...c.get('attributes'),
-          //href: transformPagePermalin(editor, page),
           href: transformPermalink(editor, href, ClientSideFileType.HTML),
         })
-        //}
       }
       // Handle both c.attributes.src and c.attributes.attributes.src
       // For some reason we need both

package/src/ts/plugins/client/11ty.ts

@@ -1,4 +1,3 @@
-import { Page } from 'grapesjs'
 import { ClientConfig } from '../../client/config'
 import { ClientSideFile, ClientSideFileWithContent } from '../../types'
 

package/src/ts/plugins/server/AuthPlugin.ts

@@ -15,8 +15,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import express from 'express'
-import { Directus } from '@directus/sdk'
+// import express from 'express'
+// import { Directus } from '@directus/sdk'
 
 export default async function(config, opts = {}) {
 //  config.on('silex:startup:start', ({app}) => {

package/src/ts/plugins/server/DownloadConnector.ts

@@ -4,10 +4,8 @@ import { ConnectorOptions, ConnectorType, ConnectorUser, JobData, JobStatus, Pub
 import { ConnectorFile, ConnectorSession, HostingConnector } from '../../server/connectors/connectors'
 import { tmpdir } from 'os'
 import { JobManager } from '../../server/jobs'
-import { Readable } from 'stream'
 import { ServerConfig } from '../../server/config'
 import { ServerEvent } from '../../server/events'
-import { getHostingConnector } from '../../server/api/publicationApi'
 
 import { Request, Response } from 'express'
 

package/src/ts/server/api/connectorApi.ts

@@ -96,7 +96,7 @@ async function routeUser(req: Request, res: Response) {
     const user = await connector.getUser(session)
     res.json(user as ApiConnectorUserResponse)
   } catch (error) {
-    console.error('Error in the login status request', error)
+    console.error('Error in the user request', error, error.code)
     res.status(validateStatus(error?.code ?? error?.httpStatusCode, 500)).json({
       error: true,
       message: error.message,

package/src/ts/server/api/websiteApi.ts

@@ -293,14 +293,14 @@ export default function (config: ServerConfig, opts = {}): Router {
       config.emit(ServerEvent.WEBSITE_ASSET_STORE_START, { files, websiteId, connectorId } as WebsiteAssetStoreStartEventType)
 
       // Write the files
-      await writeAssets(req['session'], websiteId, files, connectorId)
+      const result = await writeAssets(req['session'], websiteId, files, connectorId)
 
       // Return the file URLs to insert in the website
       // As expected by grapesjs (https://grapesjs.com/docs/modules/Assets.html#uploading-assets)
       res.json({
-        data: files.map(file =>
+        data: result.map(path =>
           API_PATH + API_WEBSITE_PATH + API_WEBSITE_ASSET_READ
-          + file.path
+          + path
           + `?websiteId=${websiteId}&connectorId=${connectorId ? connectorId : ''}` // As expected by wesite API (readAsset)
         ),
       } as ApiWebsiteAssetsWriteResponse)
@@ -394,6 +394,7 @@ export default function (config: ServerConfig, opts = {}): Router {
 
   /**
    * Write an asset to the connector
+   * @returns File names on the storage connector, always starting with a slash
    */
   async function writeAssets(session: any, websiteId: string, files: ConnectorFile[], connectorId?: string): Promise<string[]> {
     // Get the desired connector
@@ -406,14 +407,18 @@ export default function (config: ServerConfig, opts = {}): Router {
     }))
 
     // Write the asset to the connector
-    await storageConnector.writeAssets(
+    const result = await storageConnector.writeAssets(
       session,
       websiteId,
       cleanPathFiles,
     )
 
     // Return the files URLs with the website id
-    return files.map(({ path }) => `${path}?websiteId=${websiteId}`)
+    return files.map(({ path }, idx) => `${
+      result && result[idx]
+        ? `/${result[idx].replace(/^\//, '')}` // ensure the leading slash
+        : path
+    }?websiteId=${websiteId}`)
   }
   return router
 }

package/src/ts/server/connectors/connectors.ts

@@ -87,7 +87,7 @@ export interface StorageConnector<Session extends ConnectorSession = ConnectorSe
   updateWebsite(session: Session, websiteId: WebsiteId, data: WebsiteData): Promise<void>
   deleteWebsite(session: Session, websiteId: WebsiteId): Promise<void>
   // CRUD on assets
-  writeAssets(session: Session, websiteId: WebsiteId, files: ConnectorFile[], status?: StatusCallback): Promise<void>
+  writeAssets(session: Session, websiteId: WebsiteId, files: ConnectorFile[], status?: StatusCallback): Promise<string[] | void>
   readAsset(session: Session, websiteId: WebsiteId, fileName: string): Promise<ConnectorFileContent>
   deleteAssets(session: Session, websiteId: WebsiteId, fileNames: string[]): Promise<void>
   //getFileUrl(session: Session, websiteId: WebsiteId, path: string): Promise<string>

package/src/ts/server/events.ts

@@ -15,7 +15,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-// FIXME: this is for client and server, it is confusing, split in 2 files
 import { ConnectorId, PublicationData, WebsiteData, WebsiteId } from '../types'
 import { ConnectorFile } from './connectors/connectors'
 

package/dist/plugins/server/server/api/publicationApi.d.ts

@@ -1,23 +0,0 @@
-import { Router } from 'express';
-import { HostingConnector, StorageConnector } from '../connectors/connectors';
-import { ServerConfig } from '../config';
-/**
- * @fileoverview Publication plugin for Silex
- * Adds a publication API to Silex server
- */
-/**
- * Error thrown by the publication API
- * @param message error message
- * @param code http status code
- */
-export declare class PublicationError extends Error {
-    code: number;
-    constructor(message: string, code: number);
-}
-/**
- * Get the desired connector
- * Can be the default connector or a specific one
- */
-export declare function getHostingConnector(session: any, config: ServerConfig, connectorId?: string): Promise<HostingConnector>;
-export declare function getStorageConnector(session: any, config: ServerConfig, connectorId?: string): Promise<StorageConnector>;
-export default function (config: ServerConfig): Router;

package/dist/plugins/server/server/api/publicationApi.js

@@ -1,148 +0,0 @@
-"use strict";
-/*
- * Silex website builder, free/libre no-code tool for makers.
- * Copyright (c) 2023 lexoyo and Silex Labs foundation
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStorageConnector = exports.getHostingConnector = exports.PublicationError = void 0;
-const express_1 = require("express");
-const constants_1 = require("../../constants");
-const types_1 = require("../../types");
-const connectors_1 = require("../connectors/connectors");
-const validation_1 = require("../utils/validation");
-const events_1 = require("../events");
-const jobs_1 = require("../jobs");
-/**
- * @fileoverview Publication plugin for Silex
- * Adds a publication API to Silex server
- */
-/**
- * Error thrown by the publication API
- * @param message error message
- * @param code http status code
- */
-class PublicationError extends Error {
-    code;
-    constructor(message, code) {
-        super(message);
-        this.code = code;
-    }
-}
-exports.PublicationError = PublicationError;
-const PROJECT_ROOT = require.main ? require.main.path : process.cwd();
-/**
- * Get the desired connector
- * Can be the default connector or a specific one
- */
-async function getHostingConnector(session, config, connectorId) {
-    const hostingConnector = await (0, connectors_1.getConnector)(config, session, types_1.ConnectorType.HOSTING, connectorId); //  ?? config.getHostingConnectors()[0]
-    if (!hostingConnector) {
-        throw new PublicationError('No hosting connector found', 500);
-    }
-    if (!await hostingConnector.isLoggedIn(session)) {
-        throw new PublicationError('Not logged in', 401);
-    }
-    return hostingConnector;
-}
-exports.getHostingConnector = getHostingConnector;
-async function getStorageConnector(session, config, connectorId) {
-    const storageConnector = await (0, connectors_1.getConnector)(config, session, types_1.ConnectorType.STORAGE, connectorId); //  ?? config.getStorageConnectors()[0]
-    if (!storageConnector) {
-        throw new PublicationError('No storage connector found', 500);
-    }
-    if (!await storageConnector.isLoggedIn(session)) {
-        throw new PublicationError('Not logged in to the storage connector', 401);
-    }
-    return storageConnector;
-}
-exports.getStorageConnector = getStorageConnector;
-function default_1(config) {
-    // Create a new router
-    const router = (0, express_1.Router)();
-    // Get publication status
-    router.get(constants_1.API_PUBLICATION_STATUS, async function (req, res) {
-        const query = req.query;
-        const jobId = query.jobId;
-        const job = jobId && (0, jobs_1.getJob)(jobId);
-        if (!job) {
-            console.error(`Error: job not found with id ${jobId}`);
-            res.status(404).json({
-                message: 'Error: job not found.',
-            });
-            return;
-        }
-        res.json({
-            ...job,
-            _timeout: undefined,
-        });
-    });
-    // Publish website
-    router.post(constants_1.API_PUBLICATION_PUBLISH, async function (req, res) {
-        try {
-            const query = req.query;
-            const body = req.body;
-            const websiteId = (0, validation_1.requiredParam)(query.websiteId, 'id in query');
-            const storageId = (0, validation_1.requiredParam)(query.storageId, 'storageId in query');
-            const hostingId = (0, validation_1.requiredParam)(query.hostingId, 'hostingId in query');
-            const session = (0, validation_1.requiredParam)(req['session'], 'session on express request');
-            // Check params
-            const data = body;
-            const { files } = data;
-            if (!files) {
-                throw new PublicationError('Missing files in body', 400);
-            }
-            // Hook for plugins
-            config.emit(events_1.ServerEvent.PUBLISH_START, data);
-            // Get hosting connector and make sure the user is logged in
-            const hostingConnector = await getHostingConnector(session, config, hostingId);
-            // Get storage connector which holds the assets
-            const storage = await getStorageConnector(session, config, storageId);
-            // Load the content if necessary
-            const filesList = await Promise.all(files.map(async (file) => {
-                const prefix = constants_1.API_WEBSITE_ASSET_READ;
-                const fileWithContent = file;
-                const fileWithSrc = file;
-                if (!fileWithContent.content && !fileWithSrc.src)
-                    throw new PublicationError('Missing content or src in file', 400);
-                const src = fileWithSrc.src?.startsWith(prefix) ? fileWithSrc.src.substring(prefix.length) : fileWithSrc.src;
-                return {
-                    path: file.path,
-                    content: fileWithContent.content ??
-                        await storage.readAsset(session, websiteId, src),
-                };
-            }));
-            res.json({
-                url: await hostingConnector.getUrl(session, websiteId),
-                job: await hostingConnector.publish(session, websiteId, filesList, jobs_1.jobManager),
-            });
-        }
-        catch (err) {
-            console.error('Error publishing the website', err);
-            res
-                .status(typeof err.code === 'number' ? err.code : 500)
-                .json({
-                message: `Error publishing the website. ${err.message}`
-            });
-            // Hook for plugins
-            config.emit(events_1.ServerEvent.PUBLISH_END, err);
-            return;
-        }
-        // Hook for plugins
-        config.emit(events_1.ServerEvent.PUBLISH_END);
-    });
-    return router;
-}
-exports.default = default_1;
-//# sourceMappingURL=publicationApi.js.map

package/dist/plugins/server/server/api/publicationApi.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"publicationApi.js","sourceRoot":"","sources":["../../../../../src/ts/server/api/publicationApi.ts"],"names":[],"mappings":"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"}

package/src/example-client-config.js

@@ -1,64 +0,0 @@
-/*
- * Silex website builder, free/libre no-code tool for makers.
- * Copyright (c) 2023 lexoyo and Silex Labs foundation
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-import directusStorage from 'https://unpkg.com/@silexlabs/grapesjs-directus-storage'
-console.log('directusStorage', directusStorage, directusStorage?.default)
-
-// Use the environment variable SILEX_CLIENT_CONFIG or the CLI option --client-config to override the default config with this file
-export default async function (config, options) {
-  console.log('In example config')
-  //await config.addPlugin('gjs-blocks-basic', 'https://unpkg.com/grapesjs-blocks-basic', {
-  //    blocks: ['text', 'image', 'video', 'map'],
-  //})
-
-  // Optional plugins
-  await config.addPlugin([
-    '@silexlabs/grapesjs-directus-storage',
-    './plugins/@silexlabs/grapesjs-directus-storage/dist/index.js',
-  ], {
-    '@silexlabs/grapesjs-directus-storage': {
-      directusUrl: 'http://localhost:8055',
-    },
-    './plugins/@silexlabs/grapesjs-directus-storage/dist/index.js': {
-      directusUrl: 'http://localhost:8055',
-    },
-  })
-
-  // Return an object to override default config
-  return {
-    ...config,
-    ...options,
-    editor: {
-      ...config.editor,
-      storageManager: {
-        autoload: false,
-        type: 'directus',
-      },
-      plugins: [
-        ...config.editor.plugins,
-        directusStorage,
-      ],
-      pluginsOpts: {
-        ...config.editor.pluginsOpts,
-        [directusStorage]: {
-          directusUrl: 'http://localhost:8055',
-        },
-      },
-    },
-  }
-}
-