ebta-workflow-prod 4.0.14 → 4.0.16

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ebta-workflow-prod",
   "private": false,
-  "version": "4.0.14",
+  "version": "4.0.16",
   "description": "",
   "license": "UNLICENSED",
   "author": "",

package/src/elements/AttributeFilter.tsx

@@ -166,18 +166,34 @@ function AttributeFilter(props: AttributeFilterProps): React.ReactElement {
                 // Iterate through each attribute in the 'attributes' object of the feature
                 // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
                 for (const [key, value] of Object.entries(feature.attributes)) {
-                    // Check if the attribute is in the short list
                     if (shortListOfAttributes.includes(key)) {
-                        // If it's not already in the attributeSummary, initialize it
+                        if (value === null || value === undefined) continue;
+
                         if (!attributeSummary[key]) {
                             attributeSummary[key] = {};
                         }
-                        let valueKey
-                        if (props.fields.find(obj => obj.name == key)?.type == "date" && Number(value) > 0) {
-                            valueKey = dayjs.unix(Number(value) / 1000).format("DD/MM/YYYY")
+
+                        let valueKey: string;
+                        const fieldType = props.fields.find(obj => obj.name == key)?.type;
+
+                        if (fieldType === "date") {
+                            const epoch = Number(value);
+                            if (!epoch || epoch <= 0) continue;
+                            valueKey = dayjs.unix(epoch / 1000).format("DD/MM/YYYY");
+
+                        } else if (fieldType && ['integer', 'number', 'float', 'short', 'long', 'big integer'].includes(fieldType)) {
+                            // Numeric: value passed null check above, but still guard NaN
+                            const num = Number(value);
+                            if (isNaN(num)) continue;
+                            valueKey = String(value);
+
+                        } else {
+                            // String: reject known meaningless values
+                            valueKey = String(value).trim();
+                            const meaningless = ['', 'null', 'undefined', '{}', 'N/A', 'n/a', '<Null>', '<null>'];
+                            if (meaningless.includes(valueKey)) continue;
                         }
-                        // Count the occurrence of each value for the attribute
-                        else { valueKey = String(value); }
+
                         if (!attributeSummary[key][valueKey]) {
                             attributeSummary[key][valueKey] = 0;
                         }
@@ -213,10 +229,10 @@ function AttributeFilter(props: AttributeFilterProps): React.ReactElement {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         let result = props.fields.filter(obj => !attributeList || attributeList.length === 0 || attributeList.includes(obj.name)) // Filter only if nameList is valid
             .filter(obj => {
-                if (RawOriginalData.length==0){return true}
+                if (RawOriginalData.length == 0) { return true }
                 let matchingRawDataValues = RawOriginalData.find(item => item.name === obj.name)?.uniqValue;
                 let meanless = ['{}', ' ', 'null']
-                return (matchingRawDataValues && matchingRawDataValues.length > 0 && !meanless.includes(matchingRawDataValues[0].value))
+                return matchingRawDataValues !== undefined && matchingRawDataValues.length > 0 && !matchingRawDataValues.every((val) => meanless.includes(val.value))
             })
             .map(obj => {
                 let newObj: Attribute = { name: obj.name };
@@ -253,7 +269,16 @@ function AttributeFilter(props: AttributeFilterProps): React.ReactElement {
             const filteredAttributes = {};
             for (const key of attributeList) {
                 if (key in feature.attributes) {
-                    filteredAttributes[key] = originalData.find(attri => attri.name === key)?.type == 'date' ? epoch2MelbDate(Number(feature.attributes[key]) / 1000) : feature.attributes[key];
+                    const isDate = originalData.find(attri => attri.name === key)?.type == 'date';
+                    const rawVal = feature.attributes[key];
+                    if (isDate) {
+                        const epoch = Number(rawVal);
+                        filteredAttributes[key] = (rawVal !== null && rawVal !== undefined && epoch > 0)
+                            ? epoch2MelbDate(epoch / 1000)
+                            : null;  // keep as null, generateAttributeSummary will skip it
+                    } else {
+                        filteredAttributes[key] = rawVal;
+                    }
                 }
             }
             return filteredAttributes;
@@ -874,7 +899,9 @@ function AttributeFilter(props: AttributeFilterProps): React.ReactElement {
         // Iterate through the features array
         features.forEach((feature) => {
             const value = feature[attributeName];
+            if (value === null || value === undefined || value === '') return;
             if (value) {
+                
                 // Count the occurrence of each value for the attribute
                 if (!attributeSummary[value]) {
                     attributeSummary[value] = 0;
@@ -1211,7 +1238,7 @@ function AttributeFilter(props: AttributeFilterProps): React.ReactElement {
             limitInUse = (attribute.type == 'date' && (dayjs.unix(minDate.current).format('DD/MM/YYYY') != startDate.format('DD/MM/YYYY') || (dayjs.unix(maxDate.current).format('DD/MM/YYYY') != endDate.format('DD/MM/YYYY')))) || searchValue.length > 0 || (minValue !== -Infinity || maxValue !== Infinity)
         }
         if (attribute.uniqValue && attribute.uniqValue.length > 0) {
-          displayedValues = (attribute.uniqValue.length < defaultNumber + 2) || showAll ? attribute.uniqValue : attribute.uniqValue.slice(0, defaultNumber);
+            displayedValues = (attribute.uniqValue.length < defaultNumber + 2) || showAll ? attribute.uniqValue : attribute.uniqValue.slice(0, defaultNumber);
         }
 
         if (limitInUse && filteredValues.length > 0) {
@@ -1529,14 +1556,14 @@ function AttributeFilter(props: AttributeFilterProps): React.ReactElement {
         const matchedItems = attri.uniqValue?.filter(item =>
             keywords.every(keyword => item.value.toLowerCase().includes(keyword))
         );
-        return sortItemsBySelection(matchedItems,attri.selection) || [];
+        return sortItemsBySelection(matchedItems, attri.selection) || [];
     }
 
     function filterRange(attri: Attribute, min: number, max: number) {
         const matchedItems = attri.uniqValue?.filter(item =>
             Number(item.value) <= max && Number(item.value) >= min
         );
-        return sortItemsBySelection(matchedItems,attri.selection) || []
+        return sortItemsBySelection(matchedItems, attri.selection) || []
     }
 
     const groupByMelbourneDate = (data: fieldValue[]) => {
@@ -1563,7 +1590,7 @@ function AttributeFilter(props: AttributeFilterProps): React.ReactElement {
                 itemDate.isSame(start, 'day') || itemDate.isSame(end, 'day'); // Inclusive comparison
         });
 
-        return sortItemsBySelection(matchedItems,attri.selection);
+        return sortItemsBySelection(matchedItems, attri.selection);
     }
 
 
@@ -1574,7 +1601,7 @@ function AttributeFilter(props: AttributeFilterProps): React.ReactElement {
             const matchedItems = attri.uniqValue?.filter(item =>
                 keywords.every(keyword => item.value.toLowerCase().includes(keyword))
             );
-            return sortItemsBySelection(matchedItems,attri.selection) || [];
+            return sortItemsBySelection(matchedItems, attri.selection) || [];
         }
         if (props.openedAttribute !== undefined && (openAttriTime.current) !== (props.openedAttribute.timestamp)) {
             let newAttriData: fieldValue[] | undefined
@@ -1683,7 +1710,7 @@ function AttributeFilter(props: AttributeFilterProps): React.ReactElement {
         if (startDate == undefined) { setProperty("startDate" as any, defaultStart) }
         if (endDate == undefined) { setProperty("endDate" as any, defaultEnd) }
         if (filteredValues == undefined) { setProperty("filteredValues" as any, []) }
-        if (sqlRule== undefined) {props.setProperty("sqlRule" as any, "AND") }
+        if (sqlRule == undefined) { props.setProperty("sqlRule" as any, "AND") }
     }, [defaultEnd, defaultStart, endDate, filteredValues, layerName, maxValue, minValue, props, rule, searchQuery, searchValue, setProperty, sqlRule, startDate, summary]);
 
     React.useEffect(() => {
@@ -1754,18 +1781,18 @@ function AttributeFilter(props: AttributeFilterProps): React.ReactElement {
                     )}
                 </Search> : <></>}
                 {sqlRule && (
-                <RadioGroup
-                    //Radio Group
-                    row
-                    aria-labelledby="demo-row-radio-buttons-group-label"
-                    name="row-radio-buttons-group"
-                    value={sqlRule}
-                    onChange={handleSqlRule}
-                >
-                    <FormControlLabel sx={{ fontSize: 15 }} value="AND" control={<Radio sx={{ color: 'var(--accentIconBorder) !important' }}
-                    />} label={<span style={{ fontSize: '1.2rem' }}>Meet ALL Conditions</span>} />
-                    <FormControlLabel sx={{ fontSize: 15 }} value="OR" control={<Radio sx={{ color: 'var(--accentIconBorder) !important' }} />} label={<span style={{ fontSize: '1.2rem' }}>Meet ANY Conditon</span>} />
-                </RadioGroup>
+                    <RadioGroup
+                        //Radio Group
+                        row
+                        aria-labelledby="demo-row-radio-buttons-group-label"
+                        name="row-radio-buttons-group"
+                        value={sqlRule}
+                        onChange={handleSqlRule}
+                    >
+                        <FormControlLabel sx={{ fontSize: 15 }} value="AND" control={<Radio sx={{ color: 'var(--accentIconBorder) !important' }}
+                        />} label={<span style={{ fontSize: '1.2rem' }}>Meet ALL Conditions</span>} />
+                        <FormControlLabel sx={{ fontSize: 15 }} value="OR" control={<Radio sx={{ color: 'var(--accentIconBorder) !important' }} />} label={<span style={{ fontSize: '1.2rem' }}>Meet ANY Conditon</span>} />
+                    </RadioGroup>
                 )}
                 {
                     props.footerButton ?