fixed deleting field

Author: elsamaryv

app/helpers/miq_ae_class_helper.rb

@@ -249,7 +249,7 @@ def schema_data(schema_data)
           cells.push({:text => ae_field.send(fname)})
         end
       end
-      push_data({:id => index.to_s, :clickable => false, :cells => cells})
+      push_data({:id => index.to_s, :field_id => ae_field.id, :clickable => false, :cells => cells})
     end
   end
 

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

@@ -28,18 +28,20 @@ export const ClassFieldsEditor = (props) => {
     const rowItems = [];
     const headers = schemaHeaders(true);
     fieldData.forEach(({
-      cells, id, clickable, clickId,
+      // eslint-disable-next-line camelcase
+      id, field_id, cells, clickable,
     }) => {
       const reducedItems = cells.reduce((result, item, index) => {
         result[headers[index].name] = item;
         result.id = id;
-        if (clickId) result.clickId = clickId;
+        // eslint-disable-next-line camelcase
+        result.field_id = field_id;
         result.clickable = clickable;
         return result;
       }, {});
-      // reducedItems.id = id;
       rowItems.push(reducedItems);
     });
+
     return rowItems;
   };
 
@@ -59,9 +61,11 @@ export const ClassFieldsEditor = (props) => {
     setState((state) => ({ ...state, isModalOpen: false }));
   };
 
-  const formatFieldValues = (field, id) => {
+  const formatFieldValues = (field, rowId) => {
     if (!field || typeof field !== 'object') return [];
-    const getFieldName = () => `${field.display_name} (${field.name})`;
+
+    const getFieldName = () => ((field.display_name) ? `${field.display_name} (${field.name})` : `${field.name}`);
+
     const getIconForValue = () => {
       const aeMatch = aeTypeOptions.find((option) => option[1] === field.aetype);
       const aeTypeIcon = (aeMatch && aeMatch[2] && aeMatch[2]['data-icon']) || '';
@@ -74,8 +78,11 @@ export const ClassFieldsEditor = (props) => {
       return [aeTypeIcon, dTypeIcon, subIcon];
     };
 
+    debugger
+
     const row = {
-      id: (field.id || id).toString(),
+      id: field.id,
+      row_id: rowId.toString(),
       name: {
         text: getFieldName(),
         icon: getIconForValue() || [],

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

@@ -18,8 +18,9 @@ const createSchemaEditSchema = (rows, setState, isSchemaModified) => {
   };
 
   const handleFieldDelete = (index) => {
-    // const rowId = parseInt(index, 10);
-    http.post(`/miq_ae_class/field_delete?arr_id=${index}`, { skipErrors: [400] })
+    const field = rows.find((field) => field.id === index);
+    const fId = field.field_id || null;
+    http.post(`/miq_ae_class/field_delete/${fId}?arr_id=${index}`, { skipErrors: [400] })
       .then(() => {
         setState((prev) => ({
           ...prev,

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

@@ -4,7 +4,6 @@ import { transformSelectOptions } from '../helper';
 const createClassFieldsSchema = (aeClassId, selectedRowId, aeTypeOptions,
   dTypeOptions, schemaField = {}, handleSchemaFieldChange, updateFieldValueInState) => {
   const classField = schemaField;
-  console.log("Class field -- ", classField);
 
   const formatName = () => {
     const fullName = classField.name.text;
@@ -122,8 +121,8 @@ const createClassFieldsSchema = (aeClassId, selectedRowId, aeTypeOptions,
         id: 'datatype',
         label: __('Data Type'),
         placeholder: __('<Choose>'),
-        options: transformSelectOptions(dTypeOptions),
         includeEmpty: true,
+        options: transformSelectOptions(dTypeOptions),
         initialValue: getType(dTypeOptions, getIcons(1)),
         ...(selectedRowId && {
           onChange: (val) => {