@worksafevictoria/wcl7.5 1.17.1 → 1.18.0-beta.1

package/src/components/SubComponents/FormInstance/tests/rule-visible.test.js

@@ -5,302 +5,6 @@ const testComponent = 'rule-visible'
 describe(`Form ${testComponent} parser`, () => {
   it(`should render a ${testComponent} component`, () => {
     const components = FormTestUtils.getParsedComponentsFromJSON(json)
-    console.log(components)
-    console.log(
-      FormTestUtils.getComparisonJSON([
-        {
-          attributes: { counter: 1 },
-          clearOnHide: true,
-          customClass: 'custom-formio-1',
-          disabled: false,
-          hideLabel: false,
-          id: 'kitchen_sink_formio_v1--textbox1',
-          input: true,
-          key: 'textbox1',
-          label: 'textbox1',
-          labelPosition: 'top',
-          mask: false,
-          placeholder:
-            "type 'show' to show textfield2 and hide container with textbox",
-          type: 'textfield',
-          validate: { maxLength: 255, required: false },
-        },
-        {
-          attributes: { counter: 2 },
-          clearOnHide: true,
-          customClass: 'custom-formio-2',
-          disabled: false,
-          hidden: true,
-          hideLabel: false,
-          id: 'kitchen_sink_formio_v1--textbox2',
-          input: true,
-          key: 'textbox2',
-          label: 'textfield2',
-          labelPosition: 'top',
-          logic: [
-            {
-              actions: [
-                {
-                  name: 0,
-                  property: { label: 0, type: 'boolean', value: 'hidden' },
-                  state: false,
-                  type: 'property',
-                },
-              ],
-              defaultProps: { hidden: true },
-              name: 0,
-              trigger: {
-                javascript: "result = (Boolean(data.textbox1 === 'show'))",
-                type: 'javascript',
-              },
-            },
-            {
-              actions: [
-                {
-                  name: 0,
-                  property: { label: 0, type: 'boolean', value: 'hidden' },
-                  state: false,
-                  type: 'property',
-                },
-              ],
-              defaultProps: { hidden: true },
-              name: 0,
-              trigger: {
-                javascript: "result = (Boolean(data.textbox1 === 'show'))",
-                type: 'javascript',
-              },
-            },
-          ],
-          mask: false,
-          type: 'textfield',
-          validate: { maxLength: 255, required: false },
-        },
-        {
-          attributes: { counter: 3 },
-          clearOnHide: true,
-          components: [
-            {
-              attributes: { counter: 7 },
-              clearOnHide: false,
-              customClass: 'custom-formio-7',
-              disabled: false,
-              hideLabel: false,
-              id: 'kitchen_sink_formio_v1--textboxContainer',
-              input: true,
-              key: 'textboxContainer',
-              label: 'Container textbox',
-              labelPosition: 'top',
-              mask: false,
-              placeholder: 'type anything to show textbox3',
-              type: 'textfield',
-              validate: { maxLength: 255, required: false },
-            },
-          ],
-          customClass: 'custom-formio-3',
-          disabled: false,
-          hidden: true,
-          hideLabel: true,
-          id: 'kitchen_sink_formio_v1--c31',
-          input: false,
-          key: 'c31',
-          label: null,
-          labelPosition: 'top',
-          logic: [
-            {
-              actions: [
-                {
-                  name: 0,
-                  property: { label: 0, type: 'boolean', value: 'hidden' },
-                  state: false,
-                  type: 'property',
-                },
-              ],
-              defaultProps: { hidden: true },
-              name: 0,
-              trigger: {
-                javascript: "result = (Boolean(data.textbox1 !== 'show'))",
-                type: 'javascript',
-              },
-            },
-            {
-              actions: [
-                {
-                  name: 0,
-                  property: { label: 0, type: 'boolean', value: 'hidden' },
-                  state: false,
-                  type: 'property',
-                },
-              ],
-              defaultProps: { hidden: true },
-              name: 0,
-              trigger: {
-                javascript: "result = (Boolean(data.textbox1 !== 'show'))",
-                type: 'javascript',
-              },
-            },
-          ],
-          mask: false,
-          type: 'container',
-          validate: {},
-        },
-        {
-          attributes: { counter: 4 },
-          clearOnHide: true,
-          customClass: 'custom-formio-4',
-          disabled: false,
-          hidden: true,
-          hideLabel: false,
-          id: 'kitchen_sink_formio_v1--textbox3',
-          input: true,
-          key: 'textbox3',
-          label: 'textfield3',
-          labelPosition: 'top',
-          logic: [
-            {
-              actions: [
-                {
-                  name: 0,
-                  property: { label: 0, type: 'boolean', value: 'hidden' },
-                  state: false,
-                  type: 'property',
-                },
-              ],
-              defaultProps: { hidden: true },
-              name: 0,
-              trigger: {
-                javascript:
-                  "result = (Boolean((data.c31.textboxContainer !== null && data.c31.textboxContainer !== undefined && data.c31.textboxContainer !== '')))",
-                type: 'javascript',
-              },
-            },
-            {
-              actions: [
-                {
-                  name: 0,
-                  property: { label: 0, type: 'boolean', value: 'hidden' },
-                  state: false,
-                  type: 'property',
-                },
-              ],
-              defaultProps: { hidden: true },
-              name: 0,
-              trigger: {
-                javascript:
-                  "result = (Boolean((data.c31.textboxContainer !== null && data.c31.textboxContainer !== undefined && data.c31.textboxContainer !== '')))",
-                type: 'javascript',
-              },
-            },
-            {
-              actions: [
-                {
-                  name: 0,
-                  property: { label: 0, type: 'boolean', value: 'hidden' },
-                  state: false,
-                  type: 'property',
-                },
-              ],
-              defaultProps: { hidden: true },
-              name: 0,
-              trigger: {
-                javascript:
-                  "result = (Boolean((data.c31.textboxContainer !== null && data.c31.textboxContainer !== undefined && data.c31.textboxContainer !== '')))",
-                type: 'javascript',
-              },
-            },
-            {
-              actions: [
-                {
-                  name: 0,
-                  property: { label: 0, type: 'boolean', value: 'hidden' },
-                  state: false,
-                  type: 'property',
-                },
-              ],
-              defaultProps: { hidden: true },
-              name: 0,
-              trigger: {
-                javascript:
-                  "result = (Boolean((data.c31.textboxContainer !== null && data.c31.textboxContainer !== undefined && data.c31.textboxContainer !== '')))",
-                type: 'javascript',
-              },
-            },
-          ],
-          mask: false,
-          placeholder: "type a pattern ending with 'text4' to show textbox4",
-          type: 'textfield',
-          validate: { maxLength: 255, required: false },
-        },
-        {
-          attributes: { counter: 5 },
-          clearOnHide: true,
-          customClass: 'custom-formio-5',
-          disabled: false,
-          hidden: true,
-          hideLabel: false,
-          id: 'kitchen_sink_formio_v1--textbox4',
-          input: true,
-          key: 'textbox4',
-          label: 'textfield4',
-          labelPosition: 'top',
-          logic: [
-            {
-              actions: [
-                {
-                  name: 0,
-                  property: { label: 0, type: 'boolean', value: 'hidden' },
-                  state: false,
-                  type: 'property',
-                },
-              ],
-              defaultProps: { hidden: true },
-              name: 0,
-              trigger: {
-                javascript:
-                  'result = (Boolean((/text4$/.test(data.textbox1))) || Boolean((/text4$/.test(data.textbox3))))',
-                type: 'javascript',
-              },
-            },
-            {
-              actions: [
-                {
-                  name: 0,
-                  property: { label: 0, type: 'boolean', value: 'hidden' },
-                  state: false,
-                  type: 'property',
-                },
-              ],
-              defaultProps: { hidden: true },
-              name: 0,
-              trigger: {
-                javascript:
-                  'result = (Boolean((/text4$/.test(data.textbox1))) || Boolean((/text4$/.test(data.textbox3))))',
-                type: 'javascript',
-              },
-            },
-            {
-              actions: [
-                {
-                  name: 0,
-                  property: { label: 0, type: 'boolean', value: 'hidden' },
-                  state: false,
-                  type: 'property',
-                },
-              ],
-              defaultProps: { hidden: true },
-              name: 0,
-              trigger: {
-                javascript:
-                  'result = (Boolean((/text4$/.test(data.textbox1))) || Boolean((/text4$/.test(data.textbox3))))',
-                type: 'javascript',
-              },
-            },
-          ],
-          mask: false,
-          type: 'textfield',
-          validate: { maxLength: 255, required: false },
-        },
-      ]),
-    )
     expect(components).toEqual(
       FormTestUtils.getComparisonJSON([
         {
@@ -349,22 +53,6 @@ describe(`Form ${testComponent} parser`, () => {
                 type: 'javascript',
               },
             },
-            {
-              actions: [
-                {
-                  name: 0,
-                  property: { label: 0, type: 'boolean', value: 'hidden' },
-                  state: false,
-                  type: 'property',
-                },
-              ],
-              defaultProps: { hidden: true },
-              name: 0,
-              trigger: {
-                javascript: "result = (Boolean(data.textbox1 === 'show'))",
-                type: 'javascript',
-              },
-            },
           ],
           mask: false,
           type: 'textfield',
@@ -417,22 +105,6 @@ describe(`Form ${testComponent} parser`, () => {
                 type: 'javascript',
               },
             },
-            {
-              actions: [
-                {
-                  name: 0,
-                  property: { label: 0, type: 'boolean', value: 'hidden' },
-                  state: false,
-                  type: 'property',
-                },
-              ],
-              defaultProps: { hidden: true },
-              name: 0,
-              trigger: {
-                javascript: "result = (Boolean(data.textbox1 !== 'show'))",
-                type: 'javascript',
-              },
-            },
           ],
           mask: false,
           type: 'container',
@@ -468,57 +140,6 @@ describe(`Form ${testComponent} parser`, () => {
                 type: 'javascript',
               },
             },
-            {
-              actions: [
-                {
-                  name: 0,
-                  property: { label: 0, type: 'boolean', value: 'hidden' },
-                  state: false,
-                  type: 'property',
-                },
-              ],
-              defaultProps: { hidden: true },
-              name: 0,
-              trigger: {
-                javascript:
-                  "result = (Boolean((data.c31.textboxContainer !== null && data.c31.textboxContainer !== undefined && data.c31.textboxContainer !== '')))",
-                type: 'javascript',
-              },
-            },
-            {
-              actions: [
-                {
-                  name: 0,
-                  property: { label: 0, type: 'boolean', value: 'hidden' },
-                  state: false,
-                  type: 'property',
-                },
-              ],
-              defaultProps: { hidden: true },
-              name: 0,
-              trigger: {
-                javascript:
-                  "result = (Boolean((data.c31.textboxContainer !== null && data.c31.textboxContainer !== undefined && data.c31.textboxContainer !== '')))",
-                type: 'javascript',
-              },
-            },
-            {
-              actions: [
-                {
-                  name: 0,
-                  property: { label: 0, type: 'boolean', value: 'hidden' },
-                  state: false,
-                  type: 'property',
-                },
-              ],
-              defaultProps: { hidden: true },
-              name: 0,
-              trigger: {
-                javascript:
-                  "result = (Boolean((data.c31.textboxContainer !== null && data.c31.textboxContainer !== undefined && data.c31.textboxContainer !== '')))",
-                type: 'javascript',
-              },
-            },
           ],
           mask: false,
           placeholder: "type a pattern ending with 'text4' to show textbox4",
@@ -555,40 +176,6 @@ describe(`Form ${testComponent} parser`, () => {
                 type: 'javascript',
               },
             },
-            {
-              actions: [
-                {
-                  name: 0,
-                  property: { label: 0, type: 'boolean', value: 'hidden' },
-                  state: false,
-                  type: 'property',
-                },
-              ],
-              defaultProps: { hidden: true },
-              name: 0,
-              trigger: {
-                javascript:
-                  'result = (Boolean((/text4$/.test(data.textbox1))) || Boolean((/text4$/.test(data.textbox3))))',
-                type: 'javascript',
-              },
-            },
-            {
-              actions: [
-                {
-                  name: 0,
-                  property: { label: 0, type: 'boolean', value: 'hidden' },
-                  state: false,
-                  type: 'property',
-                },
-              ],
-              defaultProps: { hidden: true },
-              name: 0,
-              trigger: {
-                javascript:
-                  'result = (Boolean((/text4$/.test(data.textbox1))) || Boolean((/text4$/.test(data.textbox3))))',
-                type: 'javascript',
-              },
-            },
           ],
           mask: false,
           type: 'textfield',

package/src/components/SubComponents/FormInstance/tests/sameas.test.js

@@ -20,7 +20,7 @@ describe(`Form ${testComponent} parser`, () => {
           labelPosition: 'top',
           mask: false,
           type: 'textfield',
-          validate: { maxLength: 255, required: true }
+          validate: { maxLength: 255, required: true },
         },
         {
           attributes: { counter: 2 },
@@ -41,36 +41,20 @@ describe(`Form ${testComponent} parser`, () => {
                   name: 0,
                   property: { label: 0, type: 'boolean', value: 'hidden' },
                   state: false,
-                  type: 'property'
-                }
+                  type: 'property',
+                },
               ],
               defaultProps: { hidden: true },
               name: 0,
               trigger: {
                 javascript: 'result = (Boolean((data.samea === false)))',
-                type: 'javascript'
-              }
+                type: 'javascript',
+              },
             },
-            {
-              actions: [
-                {
-                  name: 0,
-                  property: { label: 0, type: 'boolean', value: 'hidden' },
-                  state: false,
-                  type: 'property'
-                }
-              ],
-              defaultProps: { hidden: true },
-              name: 0,
-              trigger: {
-                javascript: 'result = (Boolean((data.samea === false)))',
-                type: 'javascript'
-              }
-            }
           ],
           mask: false,
           type: 'textfield',
-          validate: { maxLength: 255, required: false }
+          validate: { maxLength: 255, required: false },
         },
         {
           attributes: { counter: 3 },
@@ -86,9 +70,9 @@ describe(`Form ${testComponent} parser`, () => {
           labelPosition: 'bottom',
           mask: false,
           type: 'checkbox',
-          validate: { required: false }
-        }
-      ])
+          validate: { required: false },
+        },
+      ]),
     )
   })
 })

package/src/components/SubComponents/FormInstance/tests/twig.test.js

@@ -5,6 +5,8 @@ const testComponent = 'twig'
 describe(`Form ${testComponent} parser`, () => {
   it(`should render a ${testComponent} component`, () => {
     const components = FormTestUtils.getParsedComponentsFromJSON(json)
+
+    console.log('🚀 ~ components:', components)
     expect(components).toEqual(
       FormTestUtils.getComparisonJSON([
         {
@@ -26,7 +28,7 @@ describe(`Form ${testComponent} parser`, () => {
           requireDecimal: false,
           truncateMultipleSpaces: true,
           type: 'number',
-          validate: { required: false }
+          validate: { required: false },
         },
         {
           attributes: { counter: 2 },
@@ -47,7 +49,7 @@ describe(`Form ${testComponent} parser`, () => {
           requireDecimal: false,
           truncateMultipleSpaces: true,
           type: 'number',
-          validate: { required: false }
+          validate: { required: false },
         },
         {
           attributes: { counter: 3 },
@@ -66,9 +68,9 @@ describe(`Form ${testComponent} parser`, () => {
           refreshOnChange: true,
           tag: 'div',
           type: 'htmlelement',
-          validate: { required: false }
-        }
-      ])
+          validate: { required: false },
+        },
+      ]),
     )
   })
 })

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

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

package/src/includes/scss/vars/src/colors.module.scss

@@ -20,6 +20,8 @@ $yellow: #ffd229;
 $lightyellow: #fff6d4;
 $outline: #da47ff;
 $outline-dark: #ffffff;
+$lavendergray: #e5e8f2;
+
 // Functional colours
 $wsv-fun-dark-green: #576D2F;
 $wsv-fun-dark-blue: #104f77;
@@ -58,6 +60,7 @@ $theme-colors: (
   'lightyellow': $lightyellow,
   'outline': $outline,
   'outline-dark': $outline-dark,
+  'lavendergray': $lavendergray,
   // Functional colours
   'wsv-fun-dark-green':$wsv-fun-dark-green,
   'wsv-fun-dark-blue':$wsv-fun-dark-blue,

package/src/includes/scss/vars/src/colors.scss

@@ -20,6 +20,8 @@ $yellow: #ffd229;
 $lightyellow: #fff6d4;
 $outline: #da47ff;
 $outline-dark: #ffffff;
+$lavendergray: #e5e8f2;
+
 // Functional colours
 $wsv-fun-dark-green: #576D2F;
 $wsv-fun-dark-blue: #104f77;
@@ -59,6 +61,7 @@ $theme-colors: (
   'lightyellow': $lightyellow,
   'outline': $outline,
   'outline-dark': $outline-dark,
+  'lavendergray': $lavendergray,
   // Functional colours
   'wsv-fun-dark-green':$wsv-fun-dark-green,
   'wsv-fun-dark-blue':$wsv-fun-dark-blue,

package/src/index.js

@@ -59,6 +59,12 @@ import Search from './components/SubComponents/Search/index.vue'
 import VideoThumbnail from './components/SubComponents/VideoThumbnail/index.vue'
 import ResourceGroup from './components/SubComponents/ResourceGroup/index.vue'
 
+// Export Return to Work components
+import RtwHeader from './components/Paragraphs/RTWPlanner/Header/index.vue'
+import RtwFooter from './components/Paragraphs/RTWPlanner/Footer/index.vue'
+import RtwHomepageApp from './components/Paragraphs/RTWPlanner/HomePage/index.vue'
+export { RtwHeader, RtwFooter, RtwHomepageApp }
+
 // Export Global Components
 export {
   Container,