@reldens/cms 0.42.0 → 0.44.0

package/admin/reldens-admin-client.js

@@ -5,7 +5,10 @@
  */
 
 if(window.trustedTypes?.createPolicy){
-    trustedTypes.createPolicy('default', {createHTML: s => s});
+    trustedTypes.createPolicy('default', {
+        createHTML: s => s,
+        createScriptURL: s => s
+    });
 }
 
 window.addEventListener('DOMContentLoaded', () => {
@@ -198,7 +201,7 @@ window.addEventListener('DOMContentLoaded', () => {
                     let ids = [];
                     for(let checkbox of checkboxes){
                         if(checkbox.checked){
-                            ids.push(parseInt(checkbox.value));
+                            ids.push(checkbox.value);
                         }
                     }
                     if(0 === ids.length){

package/admin/templates/layout.html

@@ -7,8 +7,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=5.0, user-scalable=yes, viewport-fit=cover"/>
     <!-- favicons -->
     <meta name="msapplication-config" content="/assets/favicons/default/browserconfig.xml"/>
-    <link rel="icon" href="/assets/favicons/default/favicon.ico" type="image/x-icon"/>
-    <link rel="shortcut icon" href="/assets/favicons/default/favicon.ico" type="image/x-icon">
+    <link rel="shortcut icon" href="/assets/favicons/default/favicon.ico" type="image/x-icon"/>
     <link rel="manifest" href="/assets/favicons/default/site.webmanifest"/>
     <!-- CSS and JS -->
     <link crossorigin rel="preconnect" href="https://fonts.googleapis.com"/>

package/lib/mysql-installer.js

@@ -6,7 +6,7 @@
 
 const { execSync } = require('child_process');
 const { FileHandler } = require('@reldens/server-utils');
-const { Logger } = require('@reldens/utils');
+const { Logger, sc } = require('@reldens/utils');
 
 class MySQLInstaller
 {
@@ -43,18 +43,33 @@ class MySQLInstaller
         return '';
     }
 
+    static normalizePrismaProvider(client)
+    {
+        if(-1 !== client.indexOf('mysql')){
+            return 'mysql';
+        }
+        if('postgresql' === client || 'postgres' === client){
+            return 'postgresql';
+        }
+        if('mongodb' === client){
+            return 'mongodb';
+        }
+        return client;
+    }
+
     static async generateMinimalPrismaClient(dbConfig, projectRoot)
     {
         let prismaPath = FileHandler.joinPaths(projectRoot, 'prisma');
         let schemaPath = FileHandler.joinPaths(prismaPath, 'schema.prisma');
         FileHandler.createFolder(prismaPath);
+        let provider = MySQLInstaller.normalizePrismaProvider(sc.get(dbConfig, 'client', 'mysql'));
         let schemaContent = 'generator client {\n'
             + '  provider = "prisma-client-js"\n'
             + '  output = "./client"\n'
             + '}\n'
             + '\n'
             + 'datasource db {\n'
-            + '  provider = "' + dbConfig.client + '"\n'
+            + '  provider = "'+provider+'"\n'
             + '  url = env("RELDENS_DB_URL")\n'
             + '}';
         FileHandler.writeFile(schemaPath, schemaContent);

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@reldens/cms",
     "scope": "@reldens",
-    "version": "0.42.0",
+    "version": "0.44.0",
     "description": "Reldens - CMS",
     "author": "Damian A. Pastorini",
     "license": "MIT",
@@ -33,8 +33,8 @@
         "url": "https://github.com/damian-pastorini/reldens-cms/issues"
     },
     "dependencies": {
-        "@reldens/server-utils": "^0.40.0",
-        "@reldens/storage": "^0.77.0",
+        "@reldens/server-utils": "^0.41.0",
+        "@reldens/storage": "^0.80.0",
         "@reldens/utils": "^0.54.0",
         "dotenv": "17.2.3",
         "mustache": "4.2.0"

package/templates/js/functions.js

@@ -6,25 +6,25 @@
 
 function getCookie(name)
 {
-    let value = `; ${document.cookie}`;
-    let parts = value.split(`; ${name}=`);
+    let value = '; '+document.cookie;
+    let parts = value.split('; '+name+'=');
     if(2 === parts.length){
-        return parts.pop().split(';').shift()
+        return parts.pop().split(';').shift();
     }
 }
 
 function deleteCookie(name)
 {
-    document.cookie = name + '=; Path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT;';
+    document.cookie = name+'=; Path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT;';
 }
 
 function escapeHTML(str)
 {
-    return str.replace(/&/g, "&")
-        .replace(/</g, "&lt;")
-        .replace(/>/g, "&gt;")
-        .replace(/"/g, "&quot;")
-        .replace(/'/g, "&#039;");
+    return str.replace(/&/g, '&amp;')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;')
+        .replace(/'/g, '&#039;');
 }
 
 function cloneElement(element)
@@ -35,7 +35,7 @@ function cloneElement(element)
         clonedCanvas.height = element.height;
         let ctx = clonedCanvas.getContext('2d');
         ctx.drawImage(element, 0, 0);
-        return clonedCanvas
+        return clonedCanvas;
     }
     return element.cloneNode(true);
 }
@@ -68,7 +68,7 @@ function showConfirmDialog(callback)
 function activateExpandCollapse()
 {
     let expandCollapseButtons = document.querySelectorAll('[data-expand-collapse]');
-    if(expandCollapseButtons){
+    if(!expandCollapseButtons){
         return;
     }
     for(let expandCollapseButton of expandCollapseButtons){