Merge pull request #9455 from kbrock/no_settings

Drop Tenant#use_config_for_attributes

Author: Fryguy

app/controllers/ops_controller.rb

@@ -751,7 +751,7 @@ def extra_js_commands(presenter)
     presenter[:right_cell_text] = @right_cell_text
     presenter[:osf_node] = x_node
     presenter.reset_one_trans
-    presenter.focus('server_company')
+    presenter.focus('server_name')
     presenter[:ajax_action] = {
       :controller => controller_name,
       :action     => @ajax_action,

app/controllers/ops_controller/settings/common.rb

@@ -433,7 +433,6 @@ def settings_update_save
           add_flash(_("Configuration settings saved"))
         end
         if @sb[:active_tab] == "settings_server" && @sb[:selected_server_id] == MiqServer.my_server.id # Reset session variables for names fields, if editing current server config
-          session[:customer_name] = @update[:server][:company]
           session[:vmdb_name] = @update[:server][:name]
         end
         set_user_time_zone if @sb[:active_tab] == "settings_server"

app/helpers/application_helper.rb

@@ -1332,9 +1332,7 @@ def provider_paused?(record)
 
   # Return a proper column for an appropriate target klass
   def columns_for_klass(klass)
-    if klass == 'Tenant'
-      [:name, :use_config_for_attributes]
-    elsif klass.safe_constantize.column_names.include?('name')
+    if klass.safe_constantize.column_names.include?('name')
       [:name]
     else
       [:description]

app/javascript/components/ops-tenant-form/ops-tenant-form.jsx

@@ -19,7 +19,7 @@ const OpsTenantForm = ({
   useEffect(() => {
     if (recordId) {
       miqSparkleOn();
-      API.get(`/api/tenants/${recordId}?expand=resources&attributes=name,description,use_config_for_attributes,ancestry,divisible`)
+      API.get(`/api/tenants/${recordId}?expand=resources&attributes=name,description,ancestry,divisible`)
         .then(setInitialValues)
         .then(() => {
           miqSparkleOff();
@@ -78,7 +78,7 @@ const OpsTenantForm = ({
     <div>
       <MiqFormRenderer
         initialValues={initialValues}
-        schema={createSchema(!recordId, !initialValues.ancestry, ancestry || initialValues.ancestry, initialValues.id)}
+        schema={createSchema(!recordId, ancestry || initialValues.ancestry, initialValues.id)}
         onSubmit={handleSubmit}
         onCancel={handleCancel}
         canReset={!!recordId}

app/javascript/components/ops-tenant-form/ops-tenant-form.schema.js

@@ -16,7 +16,7 @@ export const asyncValidator = (value = '', ancestry, itemId) =>
 
 const asyncValidatorDebounced = debouncePromise(asyncValidator);
 
-const createSchema = (newRecord, showUseConfig, ancestry, itemId) => {
+const createSchema = (newRecord, ancestry, itemId) => {
   let fields = [{
     component: componentTypes.TEXT_FIELD,
     id: 'name',
@@ -36,44 +36,6 @@ const createSchema = (newRecord, showUseConfig, ancestry, itemId) => {
     validateOnMount: true,
   }];
 
-  if (!newRecord && showUseConfig) {
-    fields.push({
-      component: componentTypes.SWITCH,
-      id: 'use_config_for_attributes',
-      name: 'use_config_for_attributes',
-      label: 'Use Configuration Settings',
-      onText: __('Yes'),
-      offText: __('No'),
-    });
-
-    const enabledName = {
-      ...fields[0],
-      isDisabled: false,
-      condition: {
-        when: 'use_config_for_attributes',
-        is: false,
-      },
-    };
-
-    const disabledName = {
-      component: componentTypes.SUB_FORM,
-      id: 'disabled-placeholder',
-      name: 'disabled-placeholder',
-      fields: [{
-        ...fields[0],
-        isDisabled: true,
-      }],
-      condition: {
-        when: 'use_config_for_attributes',
-        is: true,
-      },
-    };
-    fields = [
-      enabledName,
-      disabledName,
-      ...fields.slice(1),
-    ];
-  }
   return {
     fields,
   };