-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #20 from bcgov/dev
Releasing dev to production
- Loading branch information
Showing
35 changed files
with
2,452 additions
and
1,485 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,206 @@ | ||
| import { Input, Radio, AutoComplete, InputNumber, Button } from "antd"; | ||
| import { Scenario } from "@/app/types/scenario"; | ||
| import { getAutoCompleteOptions, rawDataProps } from "./InputStyler"; | ||
|
|
||
| interface TemplateObject { | ||
| [key: string]: any; | ||
| } | ||
|
|
||
| interface ParsedSchema { | ||
| arrayName: string; | ||
| objectTemplate: TemplateObject; | ||
| } | ||
|
|
||
| export const parseSchemaTemplate = (template: string): ParsedSchema | null => { | ||
| if (!template) return null; | ||
| const match = template.match(/(\w+)\[\{(.*)\}\]/); | ||
| if (!match) { | ||
| return null; | ||
| } | ||
|
|
||
| const arrayName = match[1]; | ||
| const properties = match[2].split(",").map((prop) => prop.trim()); | ||
|
|
||
| const objectTemplate: TemplateObject = {}; | ||
| properties.forEach((prop) => { | ||
| const [propertyName, propertyType] = prop.split(":"); | ||
| switch (propertyType.toLowerCase()) { | ||
| case "string": | ||
| objectTemplate[propertyName] = ""; | ||
| break; | ||
| case "boolean": | ||
| objectTemplate[propertyName] = false; | ||
| break; | ||
| case "number": | ||
| objectTemplate[propertyName] = 0; | ||
| break; | ||
| default: | ||
| objectTemplate[propertyName] = undefined; | ||
| break; | ||
| } | ||
| }); | ||
|
|
||
| return { arrayName, objectTemplate }; | ||
| }; | ||
|
|
||
| export const generateArrayFromSchema = (template: string, initialSize: number = 1): TemplateObject[] | null => { | ||
| if (!template || typeof template !== "string") return null; | ||
| const { objectTemplate } = parseSchemaTemplate(template) ?? {}; | ||
| if (!objectTemplate) return null; | ||
|
|
||
| const array: TemplateObject[] = []; | ||
| for (let i = 0; i < initialSize; i++) { | ||
| array.push({ ...objectTemplate }); | ||
| } | ||
|
|
||
| return array; | ||
| }; | ||
|
|
||
| export default function ArrayFormatter( | ||
| value: any, | ||
| property: string, | ||
| editable: boolean, | ||
| scenarios: Scenario[] = [], | ||
| rawData: rawDataProps | null | undefined, | ||
| setRawData: any | ||
| ) { | ||
| const valuesArray = getAutoCompleteOptions(property, scenarios); | ||
| let type = typeof value; | ||
| if (valuesArray.length > 0) { | ||
| type = typeof valuesArray[0].value; | ||
| } | ||
|
|
||
| const handleArrayInputItemChange = (arrayName: string, index: number, key: string, newValue: any) => { | ||
| const queryValue = newValue; | ||
|
|
||
| const updatedData: rawDataProps = { ...rawData }; | ||
| if (updatedData) { | ||
| if (!updatedData[arrayName]) { | ||
| updatedData[arrayName] = []; | ||
| } | ||
| if (!updatedData[arrayName][index]) { | ||
| updatedData[arrayName][index] = {}; | ||
| } | ||
| updatedData[arrayName][index][key] = queryValue; | ||
| setRawData(updatedData); | ||
| } | ||
| }; | ||
|
|
||
| const handleArrayItemChange = (arrayName: string, index: number, key: string, newValue: any) => { | ||
| let queryValue: any = newValue; | ||
| if (typeof newValue === "string") { | ||
| if (newValue.toLowerCase() === "true") { | ||
| queryValue = true; | ||
| } else if (newValue.toLowerCase() === "false") { | ||
| queryValue = false; | ||
| } else if (!isNaN(Number(newValue))) { | ||
| queryValue = Number(newValue); | ||
| } | ||
| } | ||
|
|
||
| const updatedData: rawDataProps = { ...rawData }; | ||
| if (updatedData) { | ||
| if (!updatedData[arrayName]) { | ||
| updatedData[arrayName] = []; | ||
| } | ||
| if (!updatedData[arrayName][index]) { | ||
| updatedData[arrayName][index] = {}; | ||
| } | ||
| updatedData[arrayName][index][key] = queryValue; | ||
| setRawData(updatedData); | ||
| } | ||
| }; | ||
|
|
||
| const parsedValue = generateArrayFromSchema(property); | ||
| const parsedSchema = parseSchemaTemplate(property); | ||
| const parsedPropertyName = parsedSchema?.arrayName || property; | ||
|
|
||
| // Utility function to get value from a nested object using a path | ||
| const getValueFromPath = (property: string, path: { [key: string]: any }) => { | ||
| if (path.hasOwnProperty(property)) { | ||
| return path[property]; | ||
| } else { | ||
| return null; | ||
| } | ||
| }; | ||
|
|
||
| // Utility function to set value at a path in a nested object | ||
| const setValueAtPath = (obj: any, path: (string | number)[], value: any): any => { | ||
| if (path.length === 0) return value; | ||
| const [first, ...rest] = path; | ||
| const newObj = typeof first === "number" ? [] : {}; | ||
| return { | ||
| ...obj, | ||
| [first]: rest.length ? setValueAtPath(obj[first] || newObj, rest, value) : value, | ||
| }; | ||
| }; | ||
|
|
||
| // Utility function to add a copy of an object in an array | ||
| const addCopyInArray = (arrayPath: string, parsedValue: any) => { | ||
| const currentArray = rawData ? getValueFromPath(arrayPath, rawData) || [] : []; | ||
| const newItem = generateArrayFromSchema(property)?.[0] ?? parsedValue; // Adjusting for potential null or undefined | ||
| if (newItem !== null && newItem !== undefined) { | ||
| currentArray.push(newItem); | ||
| } | ||
| const newData = { ...rawData, [arrayPath]: currentArray }; | ||
| setRawData(newData); | ||
| }; | ||
|
|
||
| if (editable) { | ||
| if (Array.isArray(parsedValue)) { | ||
| const customName = (parsedPropertyName.charAt(0).toUpperCase() + parsedPropertyName.slice(1)).slice(0, -1); | ||
| return ( | ||
| <div> | ||
| <Button onClick={() => addCopyInArray(parsedPropertyName, parsedValue[0])}>Add {customName}</Button> | ||
| {(rawData?.[parsedPropertyName] || []).map( | ||
| (item: { [s: string]: unknown } | ArrayLike<unknown>, index: number) => ( | ||
| <div key={index}> | ||
| <h4> | ||
| {customName} {index ? index + 1 : "1"} | ||
| </h4> | ||
| {Object.entries(item).map(([key, val]) => ( | ||
| <div key={key}> | ||
| <label className="labelsmall"> | ||
| {key}: | ||
| {typeof val === "boolean" ? ( | ||
| <Radio.Group | ||
| onChange={(e) => handleArrayInputItemChange(parsedPropertyName, index, key, e.target.value)} | ||
| value={val} | ||
| > | ||
| <Radio value={true}>Yes</Radio> | ||
| <Radio value={false}>No</Radio> | ||
| </Radio.Group> | ||
| ) : typeof val === "number" ? ( | ||
| <InputNumber | ||
| value={val} | ||
| onBlur={(e) => handleArrayItemChange(parsedPropertyName, index, key, e.target.value)} | ||
| onChange={(newVal) => handleArrayInputItemChange(parsedPropertyName, index, key, newVal)} | ||
| /> | ||
| ) : typeof val === "string" ? ( | ||
| <AutoComplete | ||
| options={getAutoCompleteOptions(key)} | ||
| value={val} | ||
| onBlur={(e) => | ||
| handleArrayItemChange(parsedPropertyName, index, key, (e.target as HTMLInputElement).value) | ||
| } | ||
| style={{ width: 200 }} | ||
| onChange={(newVal) => handleArrayInputItemChange(parsedPropertyName, index, key, newVal)} | ||
| /> | ||
| ) : ( | ||
| <Input onBlur={(e) => handleArrayItemChange(parsedPropertyName, index, key, e.target.value)} /> | ||
| )} | ||
| </label> | ||
| </div> | ||
| ))} | ||
| </div> | ||
| ) | ||
| )} | ||
| </div> | ||
| ); | ||
| } else { | ||
| return <></>; | ||
| } | ||
| } else { | ||
| return <></>; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
app/components/RulesDecisionGraph/LinkRuleComponent.module.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| .ruleSelect { | ||
| min-width: 350px; | ||
| margin-bottom: 16px; | ||
| } | ||
|
|
||
| .linkDrawer { | ||
| width: 85% !important; | ||
| } |
Oops, something went wrong.