icons updated in ui

Author: elsamaryv

app/controllers/miq_ae_class_controller.rb

@@ -1,4 +1,5 @@
 require "rexml/document"
+require 'byebug'
 class MiqAeClassController < ApplicationController
   include MiqAeClassHelper
   include AutomateTreeHelper
@@ -1456,17 +1457,22 @@ def field_select
 
   # AJAX driven routine to select a classification entry
   def field_accept
+    # byebug
     assert_privileges('miq_ae_field_edit')
     fields_get_form_vars
     @changed = (@edit[:new] != @edit[:current])
     @combo_xml = build_type_options
     @dtype_combo_xml = build_dtype_options
-    render :update do |page|
-      page << javascript_prologue
-      page.replace("class_fields_div", :partial => "class_fields")
-      page << javascript_for_miq_button_visibility(@changed)
-      page << "miqSparkle(false);"
-    end
+    # render :update do |page|
+    #   page << javascript_prologue
+    #   page.replace("class_fields_div", :partial => "class_fields")
+    #   page << javascript_for_miq_button_visibility(@changed)
+    #   page << "miqSparkle(false);"
+    # end
+    render :json => {
+      :message => 'Accepted',
+      :data => {:icons => [ae_field_fonticon(params[:aetype]), ae_field_fonticon(params[:datatype])]}
+    }
   end
 
   # AJAX driven routine to delete a classification entry
@@ -2390,18 +2396,20 @@ def fields_get_form_vars
         end
       end
     elsif params[:button] == "accept"
-      if session[:field_data][:name].blank? || session[:field_data][:aetype].blank?
-        field = session[:field_data][:name].blank? ? "Name" : "Type"
-        field += " and Type" if field == "Name" && session[:field_data][:aetype].blank?
-        add_flash(_("%{field} is required") % {:field => field}, :error)
-        return
-      end
+      # if session[:field_data][:name].blank? || session[:field_data][:aetype].blank?
+      #   field = session[:field_data][:name].blank? ? "Name" : "Type"
+      #   field += " and Type" if field == "Name" && session[:field_data][:aetype].blank?
+      #   add_flash(_("%{field} is required") % {:field => field}, :error)
+      #   return
+      # end
       new_fields = {}
       field_attributes.each do |field_attribute|
-        new_fields[field_attribute] = @edit[:new_field][field_attribute.to_sym]
+        # new_fields[field_attribute] = @edit[:new_field][field_attribute.to_sym]
+        # new_fields[field_attribute] = params[:field][field_attribute.to_sym]
+        new_fields[field_attribute] = params[field_attribute.to_sym]
       end
       @edit[:new][:fields].push(new_fields)
-      @edit[:new_field] = session[:field_data] = {}
+      # @edit[:new_field] = session[:field_data] = {}
     end
   end
 

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

@@ -15,6 +15,8 @@ export const ClassFieldsEditor = (props) => {
 
   const fieldData = createEditableRows(initialData);
 
+  debugger
+
   const transformedRows = () => {
     const rowItems = [];
     const headers = schemaHeaders(true);
@@ -109,12 +111,12 @@ export const ClassFieldsEditor = (props) => {
     </div>
   );
 
-  const formatFieldValues = (field, id) => {
+  const formatFieldValues = (field, id, data = {}) => {
     if (!field || typeof field !== 'object') return [];
 
     const row = {
       id: (field.id || id).toString(),
-      name: { text: field.name, icon: field.icons },
+      name: { text: field.name, icon: data.icons || [] },
       aetype: { text: field.aetype },
       datatype: { text: field.datatype },
       default_value: { text: field.default_value || '' },
@@ -149,7 +151,6 @@ export const ClassFieldsEditor = (props) => {
 
   const onModalSubmit = (values) => {
     const isEdit = state.selectedRowId !== undefined;
-    const data = formatFieldValues(values, isEdit ? state.selectedRowId : state.rows.length);
 
     const updateState = (newData) => {
       setState((prevState) => ({
@@ -162,10 +163,14 @@ export const ClassFieldsEditor = (props) => {
     };
 
     if (isEdit) {
+      const data = formatFieldValues(values, state.selectedRowId);
       updateState(data);
     } else {
       http.post(`/miq_ae_class/field_accept?button=accept`, values, { skipErrors: [400] })
-        .then(() => updateState(data))
+        .then((response) => {
+          const data = formatFieldValues(values, state.rows.length, response.data);
+          updateState(data);
+        })
         .catch((error) => {
           console.error('Failed to save new field:', error);
         });

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

@@ -3,6 +3,7 @@ import { transformSelectOptions, handleSchemaFieldChange } from './helper';
 
 const createClassFieldsSchema = (aeTypeOptions, dTypeOptions, selectedRowId, schemaField = {}) => {
   const classField = schemaField;
+  console.log("Classfield -- ", classField);
   // const getFieldName = (fname, index) =>
   // (typeof index !== 'undefined' ? `fields_${fname}_${index}` : `field_${fname}`);
 
@@ -24,10 +25,10 @@ const createClassFieldsSchema = (aeTypeOptions, dTypeOptions, selectedRowId, sch
       classField
       && typeof classField === 'object'
       && Object.keys(classField).length > 0
-      && classField.Name
-      && 'icon' in classField.Name
+      && classField.name
+      && 'icon' in classField.name
     ) {
-      return classField.Name.icon[index];
+      return classField.name.icon[index];
     }
     return '';
   };