@kaspernj/api-maker 1.0.273 → 1.0.275

package/package.json

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

package/src/cable-subscription-pool.mjs

@@ -16,7 +16,7 @@ export default class ApiMakerCableSubscriptionPool {
   connect (subscriptionData) {
     const globalData = CommandsPool.current().globalRequestData
 
-    logger.log(() => ["Creating subscription", {subscriptionData}])
+    logger.debug(() => ["Creating subscription", {subscriptionData}])
 
     this.subscription = ChannelsConsumer.subscriptions.create(
       {
@@ -128,16 +128,16 @@ export default class ApiMakerCableSubscriptionPool {
   }
 
   onSubscribed = () => {
-    logger.log("onSubscribed")
+    logger.debug("onSubscribed")
   }
 
   onUnsubscribe () {
-    logger.log(() => `activeSubscriptions before unsub: ${this.activeSubscriptions}`)
+    logger.debug(() => `activeSubscriptions before unsub: ${this.activeSubscriptions}`)
     this.activeSubscriptions -= 1
-    logger.log(() => `activeSubscriptions after unsub: ${this.activeSubscriptions}`)
+    logger.debug(() => `activeSubscriptions after unsub: ${this.activeSubscriptions}`)
 
     if (this.activeSubscriptions <= 0) {
-      logger.log("Unsubscribe from ActionCable subscription")
+      logger.debug("Unsubscribe from ActionCable subscription")
       this.subscription.unsubscribe()
       this.connected = false
     }
@@ -146,7 +146,7 @@ export default class ApiMakerCableSubscriptionPool {
   registerSubscriptions (subscriptions) {
     this.subscriptions = subscriptions
 
-    logger.log(() => ["registerSubscriptions", {subscriptions}])
+    logger.debug(() => ["registerSubscriptions", {subscriptions}])
 
     for (const modelName in subscriptions) {
       if (subscriptions[modelName].creates) {
@@ -176,12 +176,12 @@ export default class ApiMakerCableSubscriptionPool {
   }
 
   connectUnsubscriptionForSubscription (subscription) {
-    logger.log(() => ["Connecting to unsubscribe on subscription", {subscription}])
+    logger.debug(() => ["Connecting to unsubscribe on subscription", {subscription}])
 
     this.activeSubscriptions += 1
 
     subscription.events.addListener("unsubscribed", () => {
-      logger.log("Call onUnsubscribe on self")
+      logger.debug("Call onUnsubscribe on self")
 
       this.onUnsubscribe(subscription)
     })

package/src/cable-subscription.mjs

@@ -11,11 +11,11 @@ export default class ApiMakerCableSubscription {
 
   unsubscribe () {
     if (!this.subscribed) {
-      logger.log("Unsubscribed already called")
+      logger.debug("Unsubscribed already called")
       return
     }
 
-    logger.log("Unsubscribe called for subscription")
+    logger.debug("Unsubscribe called for subscription")
 
     this.subscribed = false
     this.events.emit("unsubscribed")

package/src/session-status-updater.mjs

@@ -29,8 +29,6 @@ export default class ApiMakerSessionStatusUpdater {
     wakeEvent(() => this.updateSessionStatus())
   }
 
-  debug = (message) => logger.log(() => message)
-
   async sessionStatus () {
     return new Promise((resolve) => {
       const xhr = new XMLHttpRequest()
@@ -48,7 +46,7 @@ export default class ApiMakerSessionStatusUpdater {
   }
 
   startTimeout () {
-    this.debug("startTimeout")
+    logger.debug("startTimeout")
 
     if (this.updateTimeout)
       clearTimeout(this.updateTimeout)
@@ -68,24 +66,24 @@ export default class ApiMakerSessionStatusUpdater {
   }
 
   async updateSessionStatus () {
-    this.debug("updateSessionStatus")
+    logger.debug("updateSessionStatus")
 
     const result = await this.sessionStatus()
 
-    this.debug(`Result: ${JSON.stringify(result, null, 2)}`)
+    logger.debug(() => `Result: ${JSON.stringify(result, null, 2)}`)
     this.updateMetaElementsFromResult(result)
     this.updateUserSessionsFromResult(result)
   }
 
   updateMetaElementsFromResult (result) {
-    this.debug("updateMetaElementsFromResult")
+    logger.debug("updateMetaElementsFromResult")
     const csrfTokenElement = document.querySelector("meta[name='csrf-token']")
 
     if (csrfTokenElement) {
-      this.debug(`Changing token from "${csrfTokenElement.getAttribute("content")}" to "${result.csrf_token}"`)
+      logger.debug(() => `Changing token from "${csrfTokenElement.getAttribute("content")}" to "${result.csrf_token}"`)
       csrfTokenElement.setAttribute("content", result.csrf_token)
     } else {
-      this.debug("csrf token element couldn't be found")
+      logger.debug("csrf token element couldn't be found")
     }
   }
 
@@ -106,7 +104,7 @@ export default class ApiMakerSessionStatusUpdater {
     const signedInOnBackend = scope.signed_in
 
     if (currentlySignedIn && !signedInOnBackend) {
-      this.debug(`${inflection.camelize(scopeName)} signed in on frontend but not in backend!`)
+      logger.debug(() => `${inflection.camelize(scopeName)} signed in on frontend but not in backend!`)
 
       Devise.setSignedOut({scope: scopeName})
       Devise.callSignOutEvent({scope: scopeName})

package/src/table/table-settings.js

@@ -2,11 +2,14 @@ import columnIdentifier from "./column-identifier.mjs"
 import columnVisible from "./column-visible.mjs"
 import {digg} from "diggerize"
 import * as inflection from "inflection"
+import Logger from "../logger.mjs"
 import {ReadersWriterLock} from "epic-locks"
 import {serialize as objectToFormData} from "object-to-formdata"
 import {TableSetting} from "../models.mjs.erb"
 import {v4 as uuidv4} from "uuid"
 
+const logger = new Logger({name: "ApiMaker / TableSettings"})
+
 // Have a lock for each unique table identifier
 const tableSettingsLocks = {}
 
@@ -162,6 +165,7 @@ export default class ApiMakerTableSettings {
   }
 
   updateTableSetting = async (tableSetting) => {
+    const changedAttributesList = ["attributeName", "sortKey"]
     const columns = this.columns()
     const columnsData = {}
     const tableSettingData = {columns_attributes: columnsData}
@@ -184,6 +188,7 @@ export default class ApiMakerTableSettings {
           }
         )
 
+        logger.debug(() => `Changed because of new column: ${column.label}`)
         changed = true
       }
     }
@@ -193,6 +198,45 @@ export default class ApiMakerTableSettings {
 
       if (column) {
         // TODO: Update column if changed
+        let columnChanged = false
+
+        for (const changedAttribute of changedAttributesList) {
+          let columnAttributeName
+
+          if (changedAttribute == "attributeName") {
+            columnAttributeName = "attribute"
+          } else {
+            columnAttributeName = changedAttribute
+          }
+
+          const oldAttributeValue = tableSettingColumn[changedAttribute]()
+          const newAttributeValue = digg(column, columnAttributeName)
+
+          if (oldAttributeValue != newAttributeValue) {
+            logger.debug(() => `${changedAttribute} changed from ${oldAttributeValue} to ${newAttributeValue} on column: ${column.label}`)
+            columnChanged = true
+          }
+        }
+
+        const columnPathAsString = JSON.stringify(column.path)
+        const tableSettingColumnPathAsString = tableSettingColumn.path()
+
+        if (columnPathAsString != tableSettingColumnPathAsString) {
+          logger.debug(() => `Path changed on ${column.label} from ${columnPathAsString} to ${tableSettingColumnPathAsString}`)
+          columnChanged = true
+        }
+
+        if (columnChanged) {
+          const columnKey = ++columnsKeyCount
+
+          changed = true
+          columnsData[columnKey] = {
+            attribute_name: column.attributeName,
+            id: tableSettingColumn.id(),
+            path: column.path,
+            sort_key: column.sortKey
+          }
+        }
       } else {
         // Removed saved columns no longer found
         const columnKey = ++columnsKeyCount
@@ -202,6 +246,8 @@ export default class ApiMakerTableSettings {
           _destroy: true
         }
         changed = true
+
+        logger.debug(() => `Column got removed: ${tableSettingColumn.identifier()}`)
       }
     }