@kaspernj/api-maker 1.0.236 → 1.0.237

package/.eslintrc.cjs

@@ -100,6 +100,7 @@ module.exports = {
     "line-comment-position": "off",
     "lines-around-comment": "error",
     "lines-between-class-members": "off",
+    "logical-assignment-operators": "error",
     "max-classes-per-file": "off",
     "max-depth": "error",
     "max-nested-callbacks": "error",

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.236",
+  "version": "1.0.237",
   "type": "module",
   "description": "",
   "main": "index.js",

package/src/serializer.mjs

@@ -16,7 +16,7 @@ export default class Serializer {
   }
 
   serializeArgument (arg) {
-    if (typeof arg == "object" && arg.constructor.apiMakerType == "BaseModel") {
+    if (typeof arg == "object" && arg && arg.constructor.apiMakerType == "BaseModel") {
       return {
         api_maker_type: "model",
         model_class_name: digg(arg.modelClassData(), "name"),
@@ -44,7 +44,7 @@ export default class Serializer {
       }
     } else if (Array.isArray(arg)) {
       return this.serializeArray(arg)
-    } else if (typeof arg == "object" && arg.constructor && arg.constructor.apiMakerType == "Collection") {
+    } else if (typeof arg == "object" && arg && arg.constructor && arg.constructor.apiMakerType == "Collection") {
       return {
         api_maker_type: "collection",
         value: this.serializeObject(arg)

package/src/table/table-settings.js

@@ -4,6 +4,7 @@ import {digg} from "diggerize"
 import inflection from "inflection"
 import {serialize as objectToFormData} from "object-to-formdata"
 import {TableSetting} from "../models.mjs.erb"
+import {v4 as uuidv4} from "uuid"
 
 export default class ApiMakerTableSettings {
   constructor({table}) {
@@ -62,13 +63,13 @@ export default class ApiMakerTableSettings {
   }
 
   loadTableSetting = async () => {
-    if (!TableSetting) throw new Error("TableSetting model couldn't be imported")
+    if (!TableSetting) throw new Error("TableSetting model isn't globally available")
 
     const tableSetting = await TableSetting
       .ransack({
         identifier_eq: this.identifier(),
-        user_id_eq: this.currentUser().id(),
-        user_type_eq: digg(this.currentUser().modelClassData(), "name")
+        user_id_eq: this.currentUserIdOrFallback(),
+        user_type_eq: this.currentUserTypeOrFallback()
       })
       .preload("columns")
       .first()
@@ -76,11 +77,39 @@ export default class ApiMakerTableSettings {
     return tableSetting
   }
 
+  currentUserIdOrFallback() {
+    const currentUser = this.currentUser()
+
+    if (currentUser) return currentUser.id()
+
+    return this.anonymouseUserId()
+  }
+
+  currentUserTypeOrFallback() {
+    const currentUser = this.currentUser()
+
+    if (currentUser) return digg(currentUser.modelClassData(), "name")
+
+    return null
+  }
+
+  anonymouseUserId() {
+    const variableName = `ApiMakerTableAnonymousUserId-${this.identifier()}`
+
+    if (!(variableName in localStorage)) {
+      const generatedId = uuidv4()
+
+      localStorage[variableName] = generatedId
+    }
+
+    return digg(localStorage, variableName)
+  }
+
   createInitialTableSetting = async () => {
     const tableSettingData = {
       identifier: this.identifier(),
-      user_id: this.currentUser().id(),
-      user_type: digg(this.currentUser().modelClassData(), "name"),
+      user_id: this.currentUserIdOrFallback(),
+      user_type: this.currentUserTypeOrFallback(),
       columns_attributes: {}
     }
 
@@ -116,9 +145,6 @@ export default class ApiMakerTableSettings {
   }
 
   updateTableSetting = async (tableSetting) => {
-    // This should remove columns no longer found
-    // This should update columns that have changed
-
     const columns = this.columns()
     const columnsData = {}
     const tableSettingData = {columns_attributes: columnsData}
@@ -149,7 +175,7 @@ export default class ApiMakerTableSettings {
       const column = columns.find((column) => columnIdentifier(column) == tableSettingColumn.identifier())
 
       if (column) {
-        // Update column if changed
+        // TODO: Update column if changed
       } else {
         // Removed saved columns no longer found
         const columnKey = ++columnsKeyCount
@@ -158,6 +184,7 @@ export default class ApiMakerTableSettings {
           id: tableSettingColumn.id(),
           _destroy: true
         }
+        changed = true
       }
     }
 
@@ -165,9 +192,6 @@ export default class ApiMakerTableSettings {
       const tableSettingFormData = objectToFormData({table_setting: tableSettingData})
 
       await tableSetting.saveRaw(tableSettingFormData)
-
-      // Maybe not necessary?
-      // tableSetting = this.loadTableSetting()
     }
 
     return tableSetting