Merge branch 'list-dict-message-tooltip' into 'develop-2.0'

Correct attribute message lookup; fix list and dict tooltips

See merge request weblogic-cloud/weblogic-toolkit-ui!432

Author: robertpatrick

webui/src/js/utils/modelEdit/message-helper.js

@@ -328,10 +328,22 @@ function (ko, i18n, AliasHelper) {
     function hasAssignedAttributeMessage(attribute, suffix, aliasPath) {
       // look for attribute-specific message only
       const key = getAttributeKey(attribute.name);
+      const lastFolder = aliasPath[aliasPath.length - 1];
       const folderPrefix = getFolderPrefix(aliasPath);
-      const folderAttributeKey = `${folderPrefix}-a-${key}-${suffix}`;
-      const attributeKey = `a-${key}-${suffix}`;
-      return messageKeys.includes(folderAttributeKey) || messageKeys.includes(attributeKey);
+
+      const matchKeys = [
+        `${folderPrefix}-a-${key}-${suffix}`,      // specific to folder + attribute
+        `f-any_${lastFolder}-a-${key}-${suffix}`,  // specific to last folder + attribute
+        `a-${key}-${suffix}`,                      // specific to attribute
+        `${folderPrefix}-a-any-${suffix}`          // specific to folder
+      ];
+
+      for (const matchKey of matchKeys) {
+        if(messageKeys.includes(matchKey)) {
+          return true;
+        }
+      }
+      return false;
     }
 
     function getReadableLabel(name) {

webui/src/js/views/modelEdit/dict-attribute-editor.html

@@ -22,18 +22,28 @@
         <td><oj-bind-text value="[[row.data.name]]"></oj-bind-text></td>
         <td><oj-bind-text value="[[row.data.value]]"></oj-bind-text></td>
         <td>
-          <oj-button display="icons" chroming="borderless" on-oj-action="[[deleteItem]]" disabled="[[disabled]]">
+          <oj-c-button
+            display="icons"
+            label="[[deleteLabel]]"
+            chroming="borderless"
+            on-oj-action="[[deleteItem]]"
+            disabled="[[disabled]]"
+          >
             <span slot="endIcon" class="oj-ux-ico-trash"></span>
-            <oj-bind-text value="[[deleteLabel]]"></oj-bind-text>
-          </oj-button>
+          </oj-c-button>
         </td>
       </tr>
     </template>
     <template slot="headerTemplate" data-oj-as="header">
-      <oj-button display="icons" chroming="borderless" on-oj-action="[[addItem]]" disabled="[[disabled]]">
+      <oj-c-button
+        display="icons"
+        label="[[addLabel]]"
+        chroming="borderless"
+        on-oj-action="[[addItem]]"
+        disabled="[[disabled]]"
+      >
         <span slot="endIcon" class="oj-ux-ico-plus"></span>
-        <oj-bind-text value="[[addLabel]]"></oj-bind-text>
-      </oj-button>
+      </oj-c-button>
     </template>
     <template slot="noData">
       <div class="wkt-model-edit-table-no-data"><oj-bind-text value="[[noDataLabel]]"></oj-bind-text></div>

webui/src/js/views/modelEdit/list-attribute-editor.html

@@ -18,18 +18,28 @@
     <tr data-bind="attr: {'data-uid': row.data.uid}">
       <td><oj-bind-text value="[[row.data.name]]"></oj-bind-text></td>
       <td>
-        <oj-button display="icons" chroming="borderless" on-oj-action="[[deleteItem]]" disabled="[[disabled]]">
+        <oj-c-button
+          display="icons"
+          label="[[deleteLabel]]"
+          chroming="borderless"
+          on-oj-action="[[deleteItem]]"
+          disabled="[[disabled]]"
+        >
           <span slot="endIcon" class="oj-ux-ico-trash"></span>
-          <oj-bind-text value="[[deleteLabel]]"></oj-bind-text>
-        </oj-button>
+        </oj-c-button>
       </td>
     </tr>
   </template>
   <template slot="headerTemplate" data-oj-as="header">
-    <oj-button display="icons" chroming="borderless" on-oj-action="[[addItem]]" disabled="[[disabled]]">
+    <oj-c-button
+      display="icons"
+      label="[[addLabel]]"
+      chroming="borderless"
+      on-oj-action="[[addItem]]"
+      disabled="[[disabled]]"
+    >
       <span slot="endIcon" class="oj-ux-ico-plus"></span>
-      <oj-bind-text value="[[addLabel]]"></oj-bind-text>
-    </oj-button>
+    </oj-c-button>
   </template>
   <template slot="noData">
     <div class="wkt-model-edit-table-no-data"><oj-bind-text value="[[noDataLabel]]"></oj-bind-text></div>