Merge pull request #20 from stackhpc/fix/horizon-angular-rebased

Fix/horizon angular rebased
stackhpc · May 25, 2023 · 1bcb92c · 1bcb92c
2 parents 056336e + ad1dc9e
commit 1bcb92c
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/horizon/static/framework/widgets/metadata/tree/metadata-tree-item.controller.js b/horizon/static/framework/widgets/metadata/tree/metadata-tree-item.controller.js
@@ -17,6 +17,7 @@
   'use strict';
 
   var READONLY_PROPERTIES = ['os_hash_algo', 'os_hash_value'];
+  var DUPLICATE_PROPERTIES = ['description'];
 
   angular
     .module('horizon.framework.widgets.metadata.tree')
@@ -34,13 +35,18 @@
     ctrl.formatErrorMessage = formatErrorMessage;
     ctrl.opened = false;
 
-    if ('item' in ctrl && 'leaf' in ctrl.item &&
-      READONLY_PROPERTIES.includes(ctrl.item.leaf.name)) {
-      ctrl.item.leaf.readonly = true;
-      ctrl.item.leaf.required = false;
-    }
-
     this.$onInit = function init() {
+      if ('item' in ctrl && 'leaf' in ctrl.item &&
+        READONLY_PROPERTIES.includes(ctrl.item.leaf.name)) {
+        ctrl.item.leaf.readonly = true;
+        ctrl.item.leaf.required = false;
+      }
+
+      if ('item' in ctrl && 'leaf' in ctrl.item &&
+        DUPLICATE_PROPERTIES.includes(ctrl.item.leaf.name)) {
+        delete ctrl.item;
+      }
+
       if ('item' in ctrl && 'leaf' in ctrl.item && ctrl.item.leaf.type === 'array') {
         ctrl.values = ctrl.item.leaf.items.enum.filter(filter).sort();