diff --git a/acs-admin/src/components/EdgeManager/Devices/ISA95HierarchyPanel.vue b/acs-admin/src/components/EdgeManager/Devices/ISA95HierarchyPanel.vue
new file mode 100644
index 000000000..1633be8f7
--- /dev/null
+++ b/acs-admin/src/components/EdgeManager/Devices/ISA95HierarchyPanel.vue
@@ -0,0 +1,164 @@
+
+
+
+
+
+
+
+
+ {{ level }}
+
+
+
+
+
+
+
+ No results
+
+ {{ opt.name }}
+
+
+
+
+
+
+
+
diff --git a/acs-admin/src/components/EdgeManager/Devices/OriginMapEditor/OriginMapEditor.vue b/acs-admin/src/components/EdgeManager/Devices/OriginMapEditor/OriginMapEditor.vue
index 0587116c4..713ed1763 100644
--- a/acs-admin/src/components/EdgeManager/Devices/OriginMapEditor/OriginMapEditor.vue
+++ b/acs-admin/src/components/EdgeManager/Devices/OriginMapEditor/OriginMapEditor.vue
@@ -158,6 +158,7 @@ import { useConnectionStore } from '@store/useConnectionStore.js'
import _ from 'lodash'
import NewObjectOverlayForm from './NewObjectOverlayForm.vue'
import { updateEdgeAgentConfig } from '@/utils/edgeAgentConfigUpdater'
+import { ISA95_LEVELS } from '@/store/useISA95Store.js'
import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '@/components/ui/dialog'
import { generateCsv, downloadCsv, parseCsv, applyCsvToModel } from '@/composables/useOriginMapCsv.js'
import Papa from 'papaparse'
@@ -275,11 +276,14 @@ export default {
immediate: true,
handler(newOriginMap) {
console.debug('Origin map changed:', newOriginMap)
- // If the origin map is null or undefined, reset our model
if (newOriginMap === null || newOriginMap === undefined) {
console.debug('Resetting origin map model')
this.resetModel()
- // Trigger a re-render of the schema group
+ this.groupRerenderTrigger = +new Date()
+ } else if (!this.isDirty) {
+ // Accept external updates (e.g. from the ISA-95 sidebar panel)
+ // when there are no unsaved local changes in the editor.
+ this.model = newOriginMap
this.groupRerenderTrigger = +new Date()
}
}
@@ -888,6 +892,46 @@ export default {
this.isDirty = true
},
+ /* Called by Device.vue when the ISA-95 sidebar panel selects a value.
+ * Applies the mutation directly to this.model (the object that gets
+ * saved) rather than relying on device.deviceInformation.originMap,
+ * which may be a different reference after a Pinia store refresh.
+ * Also clears all lower hierarchy levels and triggers a tree re-render. */
+ applyISA95Selection ({ level, value, level_index }) {
+ if (!this.model.Device_Information) this.model.Device_Information = {}
+ if (!this.model.Device_Information.ISA95_Hierarchy) this.model.Device_Information.ISA95_Hierarchy = {}
+
+ const hierarchy = this.model.Device_Information.ISA95_Hierarchy
+
+ if (!hierarchy[level]) hierarchy[level] = {}
+ hierarchy[level].Value = value
+ if (!hierarchy[level].Sparkplug_Type)
+ hierarchy[level].Sparkplug_Type = 'String'
+
+ /* Clear all levels below the one just set.
+ * Use null rather than delete: the save uses a JSON merge patch, where
+ * absent keys are preserved (not deleted). Setting Value to null is the
+ * RFC 7396 signal that tells ConfigDB to delete that key. */
+ for (const lower of ISA95_LEVELS.slice(level_index + 1)) {
+ if (hierarchy[lower] !== undefined) {
+ if (!hierarchy[lower]) hierarchy[lower] = {}
+ hierarchy[lower].Value = null
+ }
+ }
+
+ /* For fresh devices that have no originMap yet, wire device.deviceInformation.originMap
+ * to this.model so the ISA-95 panel's display (which reads from the device prop)
+ * stays in sync with what we will actually save. Once the user saves, Pinia
+ * refreshes the store with the real saved reference, and the two stay aligned
+ * via the existing originMap watcher. */
+ if (this.device?.deviceInformation && !this.device.deviceInformation.originMap) {
+ this.device.deviceInformation.originMap = this.model
+ }
+
+ this.isDirty = true
+ this.groupRerenderTrigger = +new Date()
+ },
+
resetModel() {
// Reset the model to an empty object
this.model = {}
@@ -1066,7 +1110,7 @@ export default {
},
applyParsedCsv () {
- if (!this.csvParsedData) return { applied: 0, skipped: 0 }
+ if (!this.csvParsedData) return { applied: 0, skipped: 0, ignored: 0 }
// Pass the schema to applyCsvToModel so missing metrics can be created
const result = applyCsvToModel(this.csvParsedData, this.model, this.schema, this.set)
@@ -1089,7 +1133,12 @@ export default {
})
}
- toast.warning("Test message", { pauseOnHover: true })
+ if (result.ignored > 0) {
+ toast.warning(`${result.ignored} ISA-95 row${result.ignored === 1 ? '' : 's'} ignored`, {
+ description: 'Set the hierarchy in the ISA-95 Hierarchy panel.',
+ pauseOnHover: true,
+ })
+ }
this.markDirty()
this.groupRerenderTrigger = +new Date()
diff --git a/acs-admin/src/components/EdgeManager/Devices/OriginMapEditor/SchemaGroup.vue b/acs-admin/src/components/EdgeManager/Devices/OriginMapEditor/SchemaGroup.vue
index 3d869d166..ef71273fe 100644
--- a/acs-admin/src/components/EdgeManager/Devices/OriginMapEditor/SchemaGroup.vue
+++ b/acs-admin/src/components/EdgeManager/Devices/OriginMapEditor/SchemaGroup.vue
@@ -116,7 +116,6 @@ import { SidebarMenuButton, SidebarMenuItem } from '@/components/ui/sidebar'
import { ChevronRight } from 'lucide-vue-next'
import { Button } from '@/components/ui/button'
import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs'
-
export default {
name: 'SchemaGroup',
@@ -903,9 +902,11 @@ export default {
computed: {
filteredKeys() {
// Get all keys that aren't reserved words in the order they appear in the schema
- // We use Object.keys to get the keys in the order they were defined in the schema
+ // We use Object.keys to get the keys in the order they were defined in the schema.
+ // ISA95_Hierarchy is always hidden from the tree — it is managed exclusively via
+ // the dedicated ISA-95 Hierarchy panel in the device sidebar.
const allKeys = Object.keys(this.schema.properties).filter(e =>
- !['patternProperties', '$meta', 'Schema_UUID', 'Instance_UUID', 'required'].includes(e)
+ !['patternProperties', '$meta', 'Schema_UUID', 'Instance_UUID', 'required', 'ISA95_Hierarchy'].includes(e)
);
// If not filtering, return all keys in their original order
diff --git a/acs-admin/src/components/EdgeManager/Devices/OriginMapEditor/SparkplugMetric.vue b/acs-admin/src/components/EdgeManager/Devices/OriginMapEditor/SparkplugMetric.vue
index 2eecc9e07..4bd752ef8 100644
--- a/acs-admin/src/components/EdgeManager/Devices/OriginMapEditor/SparkplugMetric.vue
+++ b/acs-admin/src/components/EdgeManager/Devices/OriginMapEditor/SparkplugMetric.vue
@@ -24,7 +24,34 @@
-
+
+
+
+
+
+ No results
+
+ {{ opt.name }}
+
+
+
+
@@ -125,15 +152,21 @@ import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs'
import DetailCard from '@components/DetailCard.vue'
import { Button } from '@/components/ui/button'
import { useConnectionStore } from '@/store/useConnectionStore'
-import { useDriverStore } from '@/store/useDriverStore'
+import { useDriverStore } from '@/store/useDriverStore'
+import { useISA95Store, ISA95_LEVELS } from '@/store/useISA95Store.js'
+import {
+ Combobox, ComboboxAnchor, ComboboxEmpty,
+ ComboboxInput, ComboboxItem, ComboboxList, ComboboxTrigger,
+} from '@/components/ui/combobox'
export default {
name: 'SparkplugMetric',
setup() {
return {
- conn: useConnectionStore(),
+ conn: useConnectionStore(),
driver: useDriverStore(),
+ isa95: useISA95Store(),
}
},
@@ -147,6 +180,13 @@ export default {
SelectItem,
SelectTrigger,
SelectValue,
+ Combobox,
+ ComboboxAnchor,
+ ComboboxEmpty,
+ ComboboxInput,
+ ComboboxItem,
+ ComboboxList,
+ ComboboxTrigger,
Control,
LinkUserDialog,
GroupList,
@@ -251,12 +291,59 @@ export default {
// This handles cases where any part of the path is missing
return this.driverInfo?.presentation?.path?.hidden === true
},
+
+ /* Which ISA-95 level this metric represents, or null if it isn't one.
+ * Detection is based on the metric path: the parent key must be
+ * 'ISA95_Hierarchy' and the leaf key must be one of the five level names. */
+ isa95Level () {
+ const path = this.selectedMetric?.path
+ if (!path || path.length < 2) return null
+ const leaf = path[path.length - 1]
+ const parent = path[path.length - 2]
+ if (parent === 'ISA95_Hierarchy' && ISA95_LEVELS.includes(leaf))
+ return leaf
+ return null
+ },
+
+ /* Valid options for the dropdown at the current ISA-95 level.
+ * For Enterprise this is all enterprises; for lower levels it is the
+ * children of whichever parent node is currently selected. */
+ isa95Options () {
+ if (!this.isa95Level) return []
+
+ const level_index = ISA95_LEVELS.indexOf(this.isa95Level)
+
+ if (level_index === 0) {
+ return this.isa95.enterprises
+ }
+
+ const parent_level = ISA95_LEVELS[level_index - 1]
+ const parent_value = this.model
+ ?.Device_Information
+ ?.ISA95_Hierarchy
+ ?.[parent_level]
+ ?.Value
+
+ console.log('isa95Options', { level: this.isa95Level, parent_level, parent_value, data: this.isa95.data })
+
+ if (!parent_value) return []
+
+ const parent_node = this.isa95.find_by_name(parent_level, parent_value)
+ console.log('parent_node', parent_node)
+
+ const children = this.isa95.children_of(parent_node.uuid)
+
+ console.log('children', {raw_children: parent_node.children, resolved: children, all_data: this.isa95.data})
+
+ return children
+ },
},
mounted() {
// Start the stores
this.conn.start()
this.driver.start()
+ this.isa95.start()
},
watch: {
@@ -338,6 +425,24 @@ export default {
this.isToggling = false;
}, 100);
},
+ /* Handle selection of an ISA-95 hierarchy value. Sets the local value
+ * and clears all levels below this one in the full originMap so the
+ * hierarchy stays consistent. */
+ on_isa95_select (new_value) {
+ this.localModel.Value = new_value
+
+ const level_index = ISA95_LEVELS.indexOf(this.isa95Level)
+ const hierarchy = this.model?.Device_Information?.ISA95_Hierarchy
+ if (!hierarchy) return
+
+ for (const level of ISA95_LEVELS.slice(level_index + 1)) {
+ if (hierarchy[level] !== undefined) {
+ if (!hierarchy[level]) hierarchy[level] = {}
+ hierarchy[level].Value = null
+ }
+ }
+ },
+
isValidType (val, options) {
return options.some(e => e.value === val)
},
diff --git a/acs-admin/src/composables/useOriginMapCsv.js b/acs-admin/src/composables/useOriginMapCsv.js
index f53c39d11..2441d8883 100644
--- a/acs-admin/src/composables/useOriginMapCsv.js
+++ b/acs-admin/src/composables/useOriginMapCsv.js
@@ -3,10 +3,24 @@
*/
import Papa from 'papaparse';
+import { ISA95_HIERARCHY_KEY } from '@/store/useISA95Store.js';
// No 'set' export from vue in Vue 3. Use plain assignment; reactivity is handled by the parent component's set helper if needed.
const RESERVED_KEYS = ['Schema_UUID', 'Instance_UUID', 'patternProperties', '$meta', 'required'];
+/**
+ * Read the value at a path of segments, without creating anything along the
+ * way. Returns undefined if any segment is missing.
+ */
+function valueAt(obj, segments) {
+ let current = obj;
+ for (const segment of segments) {
+ if (current == null || typeof current !== 'object') return undefined;
+ current = current[segment];
+ }
+ return current;
+}
+
/**
* Determine the node type of a schema property.
* @param {object} prop - A value from schema.properties
@@ -86,10 +100,14 @@ function collectMetricRows(schema, model, pathSegments = [], inPlaceholder = fal
* @param {Object} model - The model to mutate
* @param {Object} schema - The schema
* @param {Function} setFn - (optional) function(path, value, obj, delimiter) to set nested properties reactively
+ * @returns {{applied: number, skipped: number, ignored: number}} skipped counts
+ * rows whose path is absent from the schema; ignored counts ISA-95 hierarchy
+ * rows whose value the CSV tried to change.
*/
export function applyCsvToModel(rows, model, schema, setFn) {
let applied = 0;
let skipped = 0;
+ let ignored = 0;
function getMetricSchema(schema, segments) {
let currentSchema = schema;
@@ -125,6 +143,19 @@ export function applyCsvToModel(rows, model, schema, setFn) {
for (const { tagPath, fields } of rows) {
const segments = tagPath.split('/');
+
+ // The ISA-95 hierarchy is a controlled vocabulary, managed exclusively
+ // by ISA95HierarchyPanel. Never let free-text CSV values write to it.
+ // Skip before traversal so we don't create the parent objects either.
+ if (segments.includes(ISA95_HIERARCHY_KEY)) {
+ // Only report rows where the CSV would actually have changed the
+ // value, so an unmodified round-trip stays quiet.
+ const csvValue = String(fields.Value ?? '').trim();
+ const modelValue = String(valueAt(model, segments)?.Value ?? '');
+ if (csvValue !== modelValue) ignored++;
+ continue;
+ }
+
let current = model;
let found = true;
let pathSoFar = [];
@@ -218,7 +249,7 @@ export function applyCsvToModel(rows, model, schema, setFn) {
}
// ...existing code...
- return { applied, skipped };
+ return { applied, skipped, ignored };
}
/**
diff --git a/acs-admin/src/pages/EdgeManager/Devices/Device.vue b/acs-admin/src/pages/EdgeManager/Devices/Device.vue
index 2e69856c9..e012ed4ea 100644
--- a/acs-admin/src/pages/EdgeManager/Devices/Device.vue
+++ b/acs-admin/src/pages/EdgeManager/Devices/Device.vue
@@ -61,7 +61,7 @@
-