Minor fixes

Author: GilbertCherrie

app/controllers/miq_ae_class_controller.rb

@@ -1884,11 +1884,12 @@ def class_update_create
       begin
         class_rec.save!
       rescue StandardError
+        errors = []
         class_rec.errors.each do |error|
-          add_flash("#{error.attribute.to_s.capitalize} #{error.message}", :error)
+          errors.push("#{error.attribute.to_s.capitalize} #{error.message}")
         end
         @changed = true
-        javascript_flash
+        render :json => {:error => errors, :status => 500}
       else
         edit_hash = {}
         edit_hash[:new] = {:name => params[:name],
@@ -1902,7 +1903,7 @@ def class_update_create
                               end
         AuditEvent.success(build_saved_audit(class_rec, edit_hash))
         @edit = session[:edit] = nil # clean out the saved info
-        replace_right_cell(:nodetype => x_node, :replace_trees => [:ae])
+        render :json => {:status => 200}
       end
     end
   end

app/javascript/components/miq-ae-class/class-form.schema.js

@@ -1,4 +1,4 @@
-import { componentTypes, validatorTypes } from '@@ddf';
+import { componentTypes } from '@@ddf';
 
 const createSchema = (fqname) => ({
   fields: [
@@ -13,7 +13,7 @@ const createSchema = (fqname) => ({
       name: 'name',
       label: __('Name'),
       maxLength: 128,
-      validate: [{ type: validatorTypes.REQUIRED }],
+      validate: [{ type: 'customValidatorForNameField' }],
       isRequired: true,
     },
     {

app/javascript/components/miq-ae-class/index.jsx

@@ -5,6 +5,7 @@ import MiqFormRenderer, { useFormApi } from '@@ddf';
 import PropTypes from 'prop-types';
 import createSchema from './class-form.schema';
 import miqRedirectBack from '../../helpers/miq-redirect-back';
+import miqFlash from '../../helpers/miq-flash';
 
 const MiqAeClass = ({ classRecord, fqname }) => {
   const [data, setData] = useState({
@@ -49,9 +50,14 @@ const MiqAeClass = ({ classRecord, fqname }) => {
       : http.post(`/miq_ae_class/class_update/`, params);
 
     request
-      .then(() => {
-        const confirmation = isEdit ? __(`Class "${values.name}" was saved`) : __(`Class "${values.name}" was added`);
-        miqRedirectBack(sprintf(confirmation, values.name), 'success', '/miq_ae_class/explorer');
+      .then((response) => {
+        if (response.status === 200) {
+          const confirmation = isEdit ? __(`Class "${values.name}" was saved`) : __(`Class "${values.name}" was added`);
+          miqRedirectBack(sprintf(confirmation, values.name), 'success', '/miq_ae_class/explorer');
+        } else {
+          miqSparkleOff();
+          miqFlash('error', response.error);
+        }
       })
       .catch(miqSparkleOff);
   };
@@ -65,12 +71,25 @@ const MiqAeClass = ({ classRecord, fqname }) => {
     miqRedirectBack(message, 'warning', '/miq_ae_class/explorer');
   };
 
+  const customValidatorMapper = {
+    customValidatorForNameField: () => (value) => {
+      if (!value) {
+        return __('Required');
+      }
+      if (!value.match('^[a-zA-Z0-9_.-]*$')) {
+        return __('Name may contain only alphanumeric and _ . - characters');
+      }
+      return false;
+    },
+  };
+
   return (!data.isLoading
     ? (
       <div className="dialog-provision-form">
         <MiqFormRenderer
           schema={createSchema(fqname)}
           initialValues={data.initialValues}
+          validatorMapper={customValidatorMapper}
           onSubmit={onSubmit}
           onCancel={onCancel}
           canReset={!!classRecord.id}

cypress.config.js

@@ -7,7 +7,7 @@ module.exports = defineConfig({
     baseUrl: 'http://localhost:3000',
     viewportHeight: 800,
     viewportWidth: 1800,
-    numTestsKeptInMemory: 0,
+    numTestsKeptInMemory: 5,
     videoCompression: false,
     // eslint-disable-next-line no-unused-vars
     setupNodeEvents(on, config) {