fixes substitute icon issue

Author: elsamaryv

app/controllers/miq_ae_class_controller.rb

@@ -1481,7 +1481,7 @@ def field_accept
     # byebug
     render :json => {
       :message => 'Accepted',
-      :data => {:icons => [ae_field_fonticon(params[:aetype]), ae_field_fonticon(params[:datatype])]}
+      :status => 200,
     }
   end
 

app/javascript/components/data-tables/datastore/schema/class-fields-editor.jsx

@@ -59,7 +59,7 @@ export const ClassFieldsEditor = (props) => {
     setState((state) => ({ ...state, isModalOpen: false }));
   };
 
-  const formatFieldValues = (field, id, data = {}) => {
+  const formatFieldValues = (field, id) => {
     if (!field || typeof field !== 'object') return [];
     const getFieldName = () => `${field.display_name} (${field.name})`;
     const getIconForValue = () => {
@@ -69,7 +69,9 @@ export const ClassFieldsEditor = (props) => {
       const dtypeMatch = dTypeOptions.find((option) => option[1] === field.datatype);
       const dTypeIcon = (dtypeMatch && dtypeMatch[2] && dtypeMatch[2]['data-icon']) || '';
 
-      return [aeTypeIcon, dTypeIcon];
+      const subIcon = (field.substitute) ? 'pficon pficon-ok' : 'pficon pficon-close';
+
+      return [aeTypeIcon, dTypeIcon, subIcon];
     };
 
     const row = {
@@ -128,8 +130,8 @@ export const ClassFieldsEditor = (props) => {
       updateState(data);
     } else {
       http.post(`/miq_ae_class/field_accept?button=accept`, values, { skipErrors: [400] })
-        .then((response) => {
-          const data = formatFieldValues(values, state.rows.length, response.data);
+        .then(() => {
+          const data = formatFieldValues(values, state.rows.length);
           updateState(data);
         })
         .catch((error) => {
@@ -153,7 +155,6 @@ export const ClassFieldsEditor = (props) => {
         }
         return row;
       });
-      debugger
 
       return {
         ...prevState,
@@ -215,7 +216,6 @@ export const ClassFieldsEditor = (props) => {
   };
 
   // const onCancel = () => {
-  //   debugger
   //   miqSparkleOn();
   //   const message = __('Edit of schema field was cancelled by the user');
   //   miqRedirectBack(message, 'warning', '/miq_ae_class/explorer');
@@ -234,9 +234,7 @@ export const ClassFieldsEditor = (props) => {
       }).catch((error) => {
         console.error('Failed to cancel schema updates:', error);
       });
-  }
-
-  // debugger
+  };
 
   return (
     <>

app/javascript/components/data-tables/datastore/schema/modal-form.schema.js

@@ -4,15 +4,7 @@ import { transformSelectOptions } from '../helper';
 const createClassFieldsSchema = (aeClassId, selectedRowId, aeTypeOptions,
   dTypeOptions, schemaField = {}, handleSchemaFieldChange, updateFieldValueInState) => {
   const classField = schemaField;
-
-  // const formatName = () => {
-  //   const fullName = classField.name.text;
-  //   const match = fullName.match(/^(.+?)\s*\(([^)]+)\)$/);
-  //   return {
-  //     display_name: match[1],
-  //     name: match[2],
-  //   };
-  // };
+  console.log("Class field -- ", classField);
 
   const formatName = () => {
     const fullName = classField.name.text;
@@ -30,6 +22,25 @@ const createClassFieldsSchema = (aeClassId, selectedRowId, aeTypeOptions,
     };
   };
 
+  const getIcons = (index) => {
+    if (
+      classField
+      && typeof classField === 'object'
+      && Object.keys(classField).length > 0
+      && classField.name
+      && 'icon' in classField.name
+    ) {
+      let icons = classField.name.icon;
+      if (icons.length === 2) {
+        // icons come in the order [aetype, dtype, substitute]
+        // aetype and substitute will be present always; so rearrange index 1 and 2
+        icons = [icons[0], '', icons[1]];
+      }
+      return icons[index];
+    }
+    return '';
+  };
+
   const getInitialValue = (field, defaultVal = '') => {
     if (
       classField
@@ -38,10 +49,19 @@ const createClassFieldsSchema = (aeClassId, selectedRowId, aeTypeOptions,
     ) {
       if (selectedRowId) {
         if (field === 'name' || field === 'display_name') {
-          // debugger
           const formatted = formatName();
           return formatted[field] || defaultVal;
         }
+        if (field === 'substitute') {
+          if (classField[field] && 'text' in classField[field]) {
+            return classField[field].text !== undefined && classField[field].text !== null
+              ? classField[field].text
+              : defaultVal;
+          }
+          const icon = getIcons(2);
+          return icon === 'pficon pficon-ok';
+        }
+        return classField[field].text || defaultVal;
       }
 
       if (classField[field] && 'text' in classField[field]) {
@@ -52,20 +72,6 @@ const createClassFieldsSchema = (aeClassId, selectedRowId, aeTypeOptions,
     return defaultVal;
   };
 
-
-  const getIcons = (index) => {
-    if (
-      classField
-      && typeof classField === 'object'
-      && Object.keys(classField).length > 0
-      && classField.name
-      && 'icon' in classField.name
-    ) {
-      return classField.name.icon[index];
-    }
-    return '';
-  };
-
   const getType = (options, icon) => {
     const match = options.find(
       (item) => item[2] && item[2]['data-icon'] === icon
@@ -175,8 +181,7 @@ const createClassFieldsSchema = (aeClassId, selectedRowId, aeTypeOptions,
         label: __('Sub'),
         initialValue: getInitialValue('substitute', true),
         ...(selectedRowId && {
-          onChange: (e) => {
-            const val = e.target.value;
+          onChange: (val) => {
             updateFieldValueInState('substitute', val);
             handleSchemaFieldChange(aeClassId, val, 'substitute');
           },