spice-js 2.6.17 → 2.6.19

package/build/models/SpiceModel.js

@@ -877,6 +877,8 @@ class SpiceModel {
 
             columnList.push("_permissions"); // Always include _permissions
 
+            columnList.push("_permissions_"); // Always include _permissions
+
             columnList.push("id"); // Always include _permissions
 
             return _.map(data, entry => _.pick(entry, columnList));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spice-js",
-  "version": "2.6.17",
+  "version": "2.6.19",
   "description": "spice",
   "main": "build/index.js",
   "repository": {

package/src/models/SpiceModel.js

@@ -779,6 +779,7 @@ export default class SpiceModel {
             return column.includes(".") ? _.last(column.split(".")) : column;
           }); // Convert comma-separated string to array
           columnList.push("_permissions"); // Always include _permissions
+          columnList.push("_permissions_"); // Always include _permissions
           columnList.push("id"); // Always include _permissions
           return _.map(data, (entry) => _.pick(entry, columnList));
         }
@@ -846,6 +847,15 @@ export default class SpiceModel {
         }
       }
 
+      function formatSortComponent(sortComponent) {
+        // Split the string by spaces to get individual parts
+        const parts = sortComponent.split(" ");
+        // Assuming the first part is the column name, add backticks around it
+        parts[0] = `\`${parts[0]}\``;
+        // Rejoin the parts back into a string and return
+        return parts.join(" ");
+      }
+
       if (hasSQLInjection(query)) {
         return [];
       }
@@ -864,7 +874,9 @@ export default class SpiceModel {
         let new_sort_array = [];
         for (let i = 0; i < sort_array.length; i++) {
           if (!sort_array[i].includes(".")) {
-            new_sort_array.push(`\`${this.type}\`.\`${sort_array[i]}\``);
+            new_sort_array.push(
+              `\`${this.type}\`.${formatSortComponent(sort_array[i])}`
+            );
           } else {
             new_sort_array.push(sort_array[i]);
           }
@@ -943,9 +955,8 @@ export default class SpiceModel {
               this.type
             ).get(key);
             results = cached_results?.value;
-            let shouleForceRefresh = await this.shouldForceRefresh(
-              cached_results
-            );
+            let shouleForceRefresh =
+              await this.shouldForceRefresh(cached_results);
             if (cached_results?.value == undefined || shouleForceRefresh) {
               results = await this.database.search(
                 this.type,
@@ -989,6 +1000,8 @@ export default class SpiceModel {
             await this.propsToBeRemoved(results.data)
           );
         }
+        if (this.type == "resourcedetail");
+
         if (args.skip_hooks != true) {
           await this.run_hook(results.data, "list", "after");
         }