api call for accept action

Author: elsamaryv

app/controllers/miq_ae_class_controller.rb

@@ -1442,8 +1442,8 @@ def create_namespace
   def field_select
     assert_privileges('miq_ae_field_edit')
     fields_get_form_vars
-    @combo_xml = build_type_options
-    @dtype_combo_xml = build_dtype_options
+    # @combo_xml = build_type_options
+    # @dtype_combo_xml = build_dtype_options
     session[:field_data] = {}
     @edit[:new_field][:substitute] = session[:field_data][:substitute] = true
     @changed = (@edit[:new] != @edit[:current])
@@ -1461,14 +1461,15 @@ def field_accept
     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
+    # @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
+    # byebug
     render :json => {
       :message => 'Accepted',
       :data => {:icons => [ae_field_fonticon(params[:aetype]), ae_field_fonticon(params[:datatype])]}
@@ -2396,14 +2397,19 @@ def fields_get_form_vars
         end
       end
     elsif params[:button] == "accept"
+      # byebug
       # 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 params[:name].blank? || params[:aetype].blank?
+        # field = session[:field_data][:name].blank? ? "Name" : "Type"
+        # field += " and Type" if field == "Name" && session[:field_data][:aetype].blank?
+        field = params[:name].blank? ? "Name" : "Type"
+        field += " and Type" if field == "Name" && params[:aetype].blank?
+        add_flash(_("%{field} is required") % {:field => field}, :error)
+        return
+      end
       new_fields = {}
       field_attributes.each do |field_attribute|
+        # byebug
         # 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]

app/javascript/components/data-tables/datastore/index.jsx

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import {
   tableData, addSelected, removeSelected,
 } from './helper';
-import { ClassFieldsEditor } from './class-fields-editor';
+import { ClassFieldsEditor } from './schema/class-fields-editor';
 import MiqDataTable from '../../miq-data-table';
 import { CellAction } from '../../miq-data-table/helper';
 

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

@@ -2,10 +2,10 @@ import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { Button, Modal } from 'carbon-components-react';
 import MiqFormRenderer from '@@ddf';
-import { schemaHeaders, createEditableRows } from './helper';
-import MiqDataTable from '../../miq-data-table';
+import { schemaHeaders, createEditableRows } from '../helper';
+import MiqDataTable from '../../../miq-data-table';
 import createClassFieldsSchema from './modal-form.schema';
-import { CellAction } from '../../miq-data-table/helper';
+import { CellAction } from '../../../miq-data-table/helper';
 // import miqRedirectBack from '../../helpers/miq-redirect-back';
 
 export const ClassFieldsEditor = (props) => {
@@ -177,6 +177,10 @@ export const ClassFieldsEditor = (props) => {
     }
   };
 
+  const onSchemaSave = (values) => {
+    debugger
+  };
+
   // const onCancel = () => {
   //   debugger
   //   miqSparkleOn();
@@ -211,7 +215,7 @@ export const ClassFieldsEditor = (props) => {
           onSubmit={onModalSubmit}
           onCancel={handleModalClose}
           canReset
-          buttonsLabels={{ submitLabel: __('Save') }}
+          buttonsLabels={{ submitLabel: __('Acc/savw') }}
         />
       </Modal>
 
@@ -238,7 +242,7 @@ export const ClassFieldsEditor = (props) => {
       />
       <>
         <MiqFormRenderer
-          onSubmit={() => {}}
+          onSubmit={onSchemaSave}
           onCancel={onCancel}
           canReset
           buttonsLabels={{ submitLabel: __('Save') }}

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

@@ -1,5 +1,5 @@
 import { componentTypes, validatorTypes } from '@@ddf';
-import { transformSelectOptions, handleSchemaFieldChange } from './helper';
+import { transformSelectOptions, handleSchemaFieldChange } from '../helper';
 
 const createClassFieldsSchema = (aeTypeOptions, dTypeOptions, selectedRowId, schemaField = {}) => {
   const classField = schemaField;