@worksafevictoria/wcl7.5 1.17.0-beta.6 → 1.17.0-beta.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@worksafevictoria/wcl7.5",
-  "version": "1.17.0-beta.6",
+  "version": "1.17.0-beta.7",
   "description": "WorkSafe Victoria Component Library - GitHub Actions Migration Test",
   "main": "src/index.js",
   "license": "MIT",

package/src/components/SubComponents/FormInstance/services/logic-parser.js

@@ -1,7 +1,7 @@
 import {
   convertStringWithDotNotationToObject,
   generateUniqueId,
-  isEmpty
+  isEmpty,
 } from '../models/form-utils'
 
 export function parseElementStates(webformElement) {
@@ -75,17 +75,38 @@ function ruleToString(rule) {
 }
 
 function ruleItemToString(ruleItem, itemKey) {
-  const fieldName = itemKey.split(' ')[1] || itemKey.split(' ')[0]
-  const formElementID = fieldName?.match(/"([^']+)"/)[1]
+  // Regex 1: Matches standard selectors (name="foo"). Captures 'foo'.
+  const standardMatch = itemKey.match(/name="([^"]+)"/)
+  // Regex 2: Matches array selectors (name="foo[bar]"). Captures 'foo' and 'bar'.
+  const arrayMatch = itemKey.match(/name="([^"]+)\[([^\]]+)\]"/)
+
+  let formComponentID = null // The Formio component key (e.g., 'checkboxes')
+  let checkboxOptionKey = null // The specific option key (e.g., 'foo bar')
+
+  if (arrayMatch && arrayMatch[1] && arrayMatch[2]) {
+    // Array Notation found (e.g., name="checkboxes[foo bar]")
+    formComponentID = arrayMatch[1]
+    checkboxOptionKey = arrayMatch[2]
+  } else if (standardMatch && standardMatch[1]) {
+    // Standard Notation found (e.g., name="foobar")
+    formComponentID = standardMatch[1]
+  }
+
+  // ... (rest of the function)
+
+  // Now pass BOTH keys to getTrigger for array-based lookups
   const conditions = Object.keys(ruleItem)
     .map((elementProp) =>
-      formElementID ? getTrigger(formElementID, ruleItem, elementProp) : null
+      formComponentID
+        ? getTrigger(formComponentID, ruleItem, elementProp, checkboxOptionKey)
+        : null,
     )
     .filter((trigger) => !!trigger)
     .reduce((triggers, trigger) => {
       triggers.push(trigger)
       return triggers
     }, [])
+
   return conditions.join('')
 }
 
@@ -95,7 +116,7 @@ function createNewLogic(actionName, actionValue) {
     convertStringWithDotNotationToObject(
       defaultProps,
       actionName,
-      !!!actionValue
+      !!!actionValue,
     )
   } else {
     defaultProps[actionName] = !!!actionValue
@@ -104,7 +125,7 @@ function createNewLogic(actionName, actionValue) {
     name: generateUniqueId(),
     trigger: {
       type: 'javascript',
-      javascript: ''
+      javascript: '',
     },
     defaultProps,
     actions: [
@@ -114,20 +135,31 @@ function createNewLogic(actionName, actionValue) {
         property: {
           label: generateUniqueId(),
           value: actionName,
-          type: 'boolean'
+          type: 'boolean',
         },
-        state: actionValue
-      }
-    ]
+        state: actionValue,
+      },
+    ],
   }
 }
 
-function getTrigger(formElementID, ruleItem, prop) {
+function getTrigger(formComponentID, ruleItem, prop, checkboxOptionKey = null) {
   if (ruleItem.hasOwnProperty(prop)) {
     const value = ruleItem[prop] ?? ''
+
+    let variable = `data.{${formComponentID}}`
+    console.log('🚀 ~ getTrigger ~ variable:', variable)
     let valueDelimeter = typeof value === 'string' ? "'" : ''
     let expression = `${valueDelimeter}${value}${valueDelimeter}`
-    let variable = `data.{${formElementID}}`
+
+    if (checkboxOptionKey && prop === 'checked' && value === true) {
+      return `(${variable}['${checkboxOptionKey}']===true)`
+    }
+
+    if (checkboxOptionKey && prop === 'unchecked' && value === true) {
+      return `(!(${variable}['${checkboxOptionKey}']===true))`
+    }
+
     if (typeof value !== 'object' && prop === 'value') {
       return `${variable} === ${expression}`
     } else if (typeof value === 'object' && prop === 'value') {

package/src/components/SubComponents/ResourceGroup/index.vue

@@ -177,7 +177,7 @@ export default {
     },
     initialDisplyLimit: {
       type: Number,
-      default: 0,
+      default: 1000,
     },
     fetchContent: {
       type: Function,