Handle missing current workplace

AGENTS.md

@@ -10,3 +10,4 @@ Notes:
 - Prefer `describe` over `RSpec.describe` in specs.
 - Do not add `# frozen_string_literal: true` to files.
 - Prefer multiple small, individually working commits when possible.
+- Always run Rubocop on changed Ruby files.

npm-api-maker/__tests__/base-model.test.js

@@ -1,5 +1,4 @@
 import BaseModel from "../build/base-model.js"
-import CustomError from "../build/custom-error"
 import {jest} from "@jest/globals"
 import {JSDOM} from "jsdom"
 import ValidationError from "../build/validation-error.js"
@@ -42,16 +41,31 @@ describe("BaseModel", () => {
   })
 
   describe("parseValidationErrors", () => {
-    const error = new CustomError("Some validation error", {
+    const error = new ValidationError({
+      getUnhandledErrorMessage: () => "Some validation error",
+      getErrorMessage: () => "Some validation error"
+    }, {
       response: {
-        validation_errors: []
+        validation_errors: [{
+          attribute_name: "name",
+          attribute_type: "string",
+          error_messages: ["can't be blank"],
+          error_types: ["blank"],
+          input_name: "user[name]",
+          model_name: "user"
+        }]
       }
     })
     const form = document.createElement("form")
     const model = new BaseModel()
     const dispatchEventSpy = jest.spyOn(form, "dispatchEvent").mockImplementation(() => "asd")
     const newCustomEventSpy = jest.spyOn(BaseModel, "newCustomEvent").mockImplementation(() => "asd")
 
+    beforeEach(() => {
+      dispatchEventSpy.mockClear()
+      newCustomEventSpy.mockClear()
+    })
+
     it("throws the validation errors if no options are given", () => {
       expect(() => BaseModel.parseValidationErrors({error, model})).toThrow(ValidationError)
     })
@@ -64,8 +78,8 @@ describe("BaseModel", () => {
 
     it("doesnt throw validation errors if disabled", () => {
       BaseModel.parseValidationErrors({error, model, options: {throwValidationError: false}})
-      expect(dispatchEventSpy).toHaveBeenCalled()
-      expect(newCustomEventSpy).toHaveBeenCalled()
+      expect(dispatchEventSpy).not.toHaveBeenCalled()
+      expect(newCustomEventSpy).not.toHaveBeenCalled()
     })
   })
 })

npm-api-maker/__tests__/cable-connection-pool.test.js

@@ -1,4 +1,4 @@
-import CableConnectionPool from "../buikd/cable-connection-pool.js"
+import CableConnectionPool from "../build/cable-connection-pool.js"
 import CableSubscriptionPool from "../build/cable-subscription-pool"
 import {digg} from "diggerize"
 import {jest} from "@jest/globals"
@@ -12,16 +12,16 @@ describe("CableConnectionPool", () => {
     it("creates a new create event and connects", () => {
       const cableConnectionPool = new CableConnectionPool()
 
-      cableConnectionPool.scheduleConnectUpcoming = function() {
-        const subscriptionData = this.upcomingSubscriptionData
-        const subscriptions = this.upcomingSubscriptions
+      cableConnectionPool.scheduleConnectUpcomingRunLast.queue = () => {
+        const subscriptionData = cableConnectionPool.upcomingSubscriptionData
+        const subscriptions = cableConnectionPool.upcomingSubscriptions
 
-        this.upcomingSubscriptionData = {}
-        this.upcomingSubscriptions = {}
+        cableConnectionPool.upcomingSubscriptionData = {}
+        cableConnectionPool.upcomingSubscriptions = {}
 
         const cableSubscriptionPool = {subscriptionData, subscriptions}
 
-        this.cableSubscriptionPools.push(cableSubscriptionPool)
+        cableConnectionPool.cableSubscriptionPools.push(cableSubscriptionPool)
       }
       cableConnectionPool.cableSubscriptionPools = []
       cableConnectionPool.connectCreated("Contact", () => console.log("Callback"))
@@ -48,16 +48,16 @@ describe("CableConnectionPool", () => {
         }
       }
 
-      cableConnectionPool.scheduleConnectUpcoming = function() {
-        const subscriptionData = this.upcomingSubscriptionData
-        const subscriptions = this.upcomingSubscriptions
+      cableConnectionPool.scheduleConnectUpcomingRunLast.queue = () => {
+        const subscriptionData = cableConnectionPool.upcomingSubscriptionData
+        const subscriptions = cableConnectionPool.upcomingSubscriptions
 
-        this.upcomingSubscriptionData = {}
-        this.upcomingSubscriptions = {}
+        cableConnectionPool.upcomingSubscriptionData = {}
+        cableConnectionPool.upcomingSubscriptions = {}
 
         const cableSubscriptionPool = {subscriptionData, subscriptions}
 
-        this.cableSubscriptionPools.push(cableSubscriptionPool)
+        cableConnectionPool.cableSubscriptionPools.push(cableSubscriptionPool)
       }
       cableConnectionPool.cableSubscriptionPools = [cableSubscriptionPool]
       cableConnectionPool.connectDestroyed("Contact", "modelId", () => { })
@@ -123,7 +123,7 @@ describe("CableConnectionPool", () => {
         this.cableSubscriptionPools.push(cableSubscriptionPool)
       }
       cableConnectionPool.cableSubscriptionPools = [cableSubscriptionPool]
-      cableConnectionPool.scheduleConnectUpcoming = () => cableConnectionPool.connectUpcoming()
+      cableConnectionPool.scheduleConnectUpcomingRunLast.queue = () => cableConnectionPool.connectUpcoming()
       cableConnectionPool.connectDestroyed("Contact", "modelId", () => { })
 
       const subscriptions = digg(cableSubscriptionPool, "subscriptions", "Contact", "destroys", "modelId")
@@ -146,16 +146,16 @@ describe("CableConnectionPool", () => {
         }
       }
 
-      cableConnectionPool.scheduleConnectUpcoming = function() {
-        const subscriptionData = this.upcomingSubscriptionData
-        const subscriptions = this.upcomingSubscriptions
+      cableConnectionPool.scheduleConnectUpcomingRunLast.queue = () => {
+        const subscriptionData = cableConnectionPool.upcomingSubscriptionData
+        const subscriptions = cableConnectionPool.upcomingSubscriptions
 
-        this.upcomingSubscriptionData = {}
-        this.upcomingSubscriptions = {}
+        cableConnectionPool.upcomingSubscriptionData = {}
+        cableConnectionPool.upcomingSubscriptions = {}
 
         const cableSubscriptionPool = {subscriptionData, subscriptions}
 
-        this.cableSubscriptionPools.push(cableSubscriptionPool)
+        cableConnectionPool.cableSubscriptionPools.push(cableSubscriptionPool)
       }
       cableConnectionPool.cableSubscriptionPools = [cableSubscriptionPool]
       cableConnectionPool.connectUpdate("Contact", "modelId", () => console.log("Update callback"))

npm-api-maker/__tests__/collection.test.js

@@ -1,9 +1,15 @@
 import Collection from "../build/collection.js"
 
+class FakeModel {
+  static modelClassData() {
+    return {name: "User"}
+  }
+}
+
 describe("Collection", () => {
   describe("count", () => {
     it("is able to clone the collection and merge count into it without manipulating the original given query", () => {
-      let collection = new Collection({}, {})
+      let collection = new Collection({modelClass: FakeModel}, {})
 
       collection.ransack({name_cont: "Kasper"})
 
@@ -19,15 +25,15 @@ describe("Collection", () => {
       // This can happen if someone does something like this and users_q isn't set:
       // query.ransack(params.users_q)
 
-      let collection = new Collection({}, {ransack: {id_eq: 5}})
+      let collection = new Collection({modelClass: FakeModel}, {ransack: {id_eq: 5}})
 
       collection.ransack(undefined)
 
       expect(collection.queryArgs).toEqual({ransack: {id_eq: 5}})
     })
 
     it("handles sorts of different types", () => {
-      let collection = new Collection({}, {})
+      let collection = new Collection({modelClass: FakeModel}, {})
 
       collection = collection.ransack({s: "created_at"})
       expect(collection.queryArgs.ransack.s).toEqual("created_at")
@@ -39,7 +45,7 @@ describe("Collection", () => {
 
   describe("selectColumns", () => {
     it("adds selected columns to the query", () => {
-      let collection = new Collection({}, {})
+      let collection = new Collection({modelClass: FakeModel}, {})
 
       collection = collection.selectColumns({User: ["id"]})
       expect(collection.queryArgs.selectColumns).toEqual({user: ["id"]})

npm-api-maker/__tests__/custom-error.test.js

@@ -7,7 +7,7 @@ describe("CustomError", () => {
     const customError = new CustomError(`Request failed with code: ${xhr.status}`, {response, xhr})
 
     expect(customError.message).toEqual("Request failed with code: 401")
-    expect(customError.errorMessages()).toEqual(undefined)
+    expect(customError.errorMessages()).toEqual(["No error messages found"])
     expect(customError.errorTypes()).toEqual(undefined)
   })
 })

npm-api-maker/__tests__/model-name.test.js

@@ -1,4 +1,5 @@
 import I18nOnSteroids from "i18n-on-steroids"
+import Config from "../build/config"
 import ModelName from "../build/model-name"
 
 const i18n = new I18nOnSteroids()
@@ -22,10 +23,11 @@ const initializeI18n = () => {
 describe("ModelName", () => {
   beforeEach(() => {
     initializeI18n()
+    Config.setI18n(i18n)
   })
 
   test("human", () => {
-    const modelClassData = {i18nKey: "user"}
+    const modelClassData = {i18nKey: "user", name: "User"}
     const modelName = new ModelName({i18n, modelClassData})
 
     expect(modelName.human()).toEqual("Bruger")

npm-api-maker/__tests__/routes-native.test.js

@@ -12,8 +12,8 @@ const testRoutes = () => ({
     {"name": "drinks", "path": "/drinks", "component": "drinks/index"}
   ]
 })
-const testTranslations = () => ({
-  locales: {
+const testTranslations = () => {
+  const locales = {
     da: {
       routes: {
         drink: "drink",
@@ -27,7 +27,16 @@ const testTranslations = () => ({
       }
     }
   }
-})
+
+  return {
+    locales,
+    t: (key, _unused, {default: defaultValue, locale}) => {
+      const path = key.split(".").slice(1)
+      const routeKey = path[path.length - 1]
+      return locales?.[locale]?.routes?.[routeKey] || defaultValue
+    }
+  }
+}
 
 const routesNative = ({args, currentLocale}) => {
   const test = new RoutesNative({
@@ -66,14 +75,14 @@ describe("RoutesNative", () => {
     const test = routesNative({args: {localized: true}, currentLocale: "en"})
     const daRoute = test.editDrinkPath(5, {drink: {name: "Pina Colada"}, locale: "da"})
 
-    expect(daRoute).toEqual("/da/drinks/5/rediger?drink%5Bname%5D=Pina%20Colada")
+    expect(daRoute).toEqual("/da/drinks/5/rediger?drink[name]=Pina+Colada")
   })
 
   it("translates a route without localization", () => {
     const test = routesNative({currentLocale: "en"})
     const daRoute = test.editDrinkPath(5, {drink: {name: "Pina Colada"}})
 
-    expect(daRoute).toEqual("/drinks/5/edit?drink%5Bname%5D=Pina%20Colada")
+    expect(daRoute).toEqual("/drinks/5/edit?drink[name]=Pina+Colada")
   })
 
   it("generates urls", () => {
@@ -85,20 +94,20 @@ describe("RoutesNative", () => {
     const test = routesNative({args: {localized: true}, currentLocale: "en"})
     const daRoute = test.editDrinkUrl(5, {drink: {name: "Pina Colada"}, locale: "da"})
 
-    expect(daRoute).toEqual("http://localhost/da/drinks/5/rediger?drink%5Bname%5D=Pina%20Colada")
+    expect(daRoute).toEqual("http://localhost/da/drinks/5/rediger?drink[name]=Pina+Colada")
   })
 
   it("generates urls with custom options", () => {
     const test = routesNative({args: {localized: true}, currentLocale: "en"})
     const daRoute = test.editDrinkUrl(5, {drink: {name: "Pina Colada"}, locale: "da", host: "google.com", port: 123, protocol: "https"})
 
-    expect(daRoute).toEqual("https://google.com:123/da/drinks/5/rediger?drink%5Bname%5D=Pina%20Colada")
+    expect(daRoute).toEqual("https://google.com:123/da/drinks/5/rediger?drink[name]=Pina+Colada")
   })
 
   it("generates urls without locales", () => {
     const test = routesNative({currentLocale: "en"})
     const daRoute = test.editDrinkUrl(5, {drink: {name: "Pina Colada"}, locale: "da", host: "google.com", port: 123, protocol: "https"})
 
-    expect(daRoute).toEqual("https://google.com:123/drinks/5/edit?drink%5Bname%5D=Pina%20Colada")
+    expect(daRoute).toEqual("https://google.com:123/drinks/5/edit?drink[name]=Pina+Colada")
   })
 })

npm-api-maker/__tests__/setup.js

@@ -0,0 +1,9 @@
+import {TextDecoder, TextEncoder} from "util"
+
+if (!global.TextEncoder) {
+  global.TextEncoder = TextEncoder
+}
+
+if (!global.TextDecoder) {
+  global.TextDecoder = TextDecoder
+}

npm-api-maker/__tests__/support/actioncable.js

@@ -0,0 +1 @@
+export const createConsumer = () => ({})

npm-api-maker/__tests__/support/models.js

@@ -0,0 +1 @@
+export {}

npm-api-maker/babel.config.js → npm-api-maker/babel.config.cjs

@@ -1,5 +1,12 @@
 module.exports = {
+  sourceType: "unambiguous",
   presets: [
+    [
+      "@babel/preset-env",
+      {
+        targets: {node: "current"}
+      }
+    ],
     [
       "@babel/preset-react",
       {

npm-api-maker/jest.config.cjs

@@ -0,0 +1,15 @@
+module.exports = {
+  testEnvironment: "jsdom",
+  testMatch: ["<rootDir>/__tests__/**/*.test.js"],
+  setupFilesAfterEnv: ["<rootDir>/__tests__/setup.js"],
+  transform: {
+    "^.+\\.(cjs|mjs|[jt]sx?)$": ["babel-jest", {configFile: "./babel.config.cjs"}]
+  },
+  transformIgnorePatterns: ["/node_modules/(?!epic-locks|i18n-on-steroids)/"],
+  moduleNameMapper: {
+    "^\\.\\./build/(.*)$": "<rootDir>/src/$1",
+    "^\\.\\./\\.\\./build/(.*)$": "<rootDir>/src/$1",
+    "^@rails/actioncable$": "<rootDir>/__tests__/support/actioncable.js",
+    "^models\\.js$": "<rootDir>/__tests__/support/models.js"
+  }
+}

npm-api-maker/src/model-prop-type.js

@@ -1,5 +1,5 @@
 import {digg} from "diggerize"
-import Inflection from "inflection"
+import * as inflection from "inflection"
 
 export default class ApiMakerModelPropType {
   static ofModel (modelClass) {
@@ -52,7 +52,7 @@ export default class ApiMakerModelPropType {
 
     if (this._withLoadedAbilities) {
       for (const abilityName of this._withLoadedAbilities) {
-        const underscoreAbilityName = Inflection.underscore(abilityName)
+        const underscoreAbilityName = inflection.underscore(abilityName)
 
         if (!(underscoreAbilityName in model.abilities))
           return new Error(`The ability ${abilityName} was required to be loaded in ${propName} of the ${model.constructor.name} type but it wasn't`)
@@ -62,7 +62,7 @@ export default class ApiMakerModelPropType {
     if (this._withLoadedAssociations) {
       for (const associationName in this._withLoadedAssociations) {
         const associationModelPropType = digg(this._withLoadedAssociations, associationName)
-        const underscoreAssociationName = Inflection.underscore(associationName)
+        const underscoreAssociationName = inflection.underscore(associationName)
 
         if (!(underscoreAssociationName in model.relationshipsCache))
           return new Error(`The association ${associationName} was required to be loaded in ${propName} of the ${model.constructor.name} type but it wasn't`)
@@ -92,7 +92,7 @@ export default class ApiMakerModelPropType {
 
     if (this._withLoadedAttributes && model.isPersisted()) {
       for (const attributeName of this._withLoadedAttributes) {
-        const underscoreAttributeName = Inflection.underscore(attributeName)
+        const underscoreAttributeName = inflection.underscore(attributeName)
 
         if (!(underscoreAttributeName in model.modelData)) {
           return new Error(`The attribute ${attributeName} was required to be loaded in ${propName} of the ${model.constructor.name} type but it wasn't`)

npm-api-maker/src/table/table.jsx

@@ -1,4 +1,4 @@
-import {digg, digs} from "diggerize"
+import {dig, digg, digs} from "diggerize"
 import React, {createContext, useContext, useMemo, useRef} from "react"
 import {Animated, Platform, Pressable, View} from "react-native"
 import BaseComponent from "../base-component"
@@ -268,12 +268,17 @@ export default memo(shapeComponent(class ApiMakerTable extends BaseComponent {
   async loadCurrentWorkplace() {
     const Workplace = modelClassRequire("Workplace")
     const result = await Workplace.current()
-    const currentWorkplace = digg(result, "current", 0)
+    const currentWorkplace = dig(result, "current", 0)
 
     this.setState({currentWorkplace})
   }
 
   async loadCurrentWorkplaceCount() {
+    if (!this.s.currentWorkplace) {
+      this.setState({currentWorkplaceCount: 0})
+      return
+    }
+
     const WorkplaceLink = modelClassRequire("WorkplaceLink")
     const currentWorkplaceCount = await WorkplaceLink
       .ransack({

ruby-gem/Gemfile.lock

@@ -13,7 +13,7 @@ PATH
       with_advisory_lock
 
 PATH
-  remote: /home/dev/Development/api_maker/api_maker_table_rubygem
+  remote: /home/dev/api_maker/api_maker_table_rubygem
   specs:
     api_maker_table (0.1.1)
       acts_as_list