feat: validations support added in fields

Author: mitulgolakiya

src/Generators/Scaffold/ViewGenerator.php

@@ -148,30 +148,10 @@ private function generateTableHeaderFields(): string
                 continue;
             }
 
-            if ($this->config->options->localized) {
-                /**
-                 * Replacing $FIELD_NAME$ before fill_template_with_field_data_locale() otherwise also
-                 * $FIELD_NAME$ get replaced with @lang('models/$modelName.fields.$value')
-                 * and so we don't have $FIELD_NAME$ in table_header_locale.stub
-                 * We could need 'raw' field name in header for example for sorting.
-                 * We still have $FIELD_NAME_TITLE$ replaced with @lang('models/$modelName.fields.$value').
-                 *
-                 * @see issue https://github.com/InfyOmLabs/laravel-generator/issues/887
-                 */
-                $preFilledHeaderFieldTemplate = str_replace('$FIELD_NAME$', $field->name, '');
-
-                $headerFields[] = fill_template_with_field_data_locale(
-                    $this->config->dynamicVars,
-                    ['$FIELD_NAME_TITLE$' => 'fieldTitle', '$FIELD_NAME$' => 'name'],
-                    $preFilledHeaderFieldTemplate,
-                    $field
-                );
-            } else {
-                $headerFields[] = view(
-                    $this->templateType.'::templates.scaffold.table.blade.header',
-                    $field->variables()
-                )->render();
-            }
+            $headerFields[] = view(
+                $this->templateType.'::templates.scaffold.table.blade.header',
+                $field->variables()
+            )->render();
         }
 
         return implode(infy_nl_tab(1, 4), $headerFields);
@@ -210,27 +190,6 @@ private function generateFields()
                 continue;
             }
 
-            $validations = explode('|', $field->validations);
-            $minMaxRules = '';
-            foreach ($validations as $validation) {
-                if (!Str::contains($validation, ['max:', 'min:'])) {
-                    continue;
-                }
-
-                $validationText = substr($validation, 0, 3);
-                $sizeInNumber = substr($validation, 4);
-
-                $sizeText = ($validationText == 'min') ? 'minlength' : 'maxlength';
-                if ($field->htmlType == 'number') {
-                    $sizeText = $validationText;
-                }
-
-                $size = ",'$sizeText' => $sizeInNumber";
-                $minMaxRules .= $size;
-            }
-            // TODO:
-//            $this->config->addDynamicVariable('$SIZE$', $minMaxRules);
-
             $htmlFields[] = HTMLFieldGenerator::generateHTML(
                 $field,
                 $this->templateViewPath

src/Utils/HTMLFieldGenerator.php

@@ -2,6 +2,7 @@
 
 namespace InfyOm\Generator\Utils;
 
+use Illuminate\Support\Str;
 use InfyOm\Generator\Common\GeneratorField;
 
 class HTMLFieldGenerator
@@ -11,6 +12,10 @@ public static function generateHTML(GeneratorField $field, $templateType): strin
         $viewName = $field->htmlType;
         $variables = [];
 
+        if (!empty($validations = self::generateValidations($field))) {
+            $variables['options'] = ', '.implode(', ', $validations);
+        }
+
         switch ($field->htmlType) {
             case 'select':
             case 'enum':
@@ -43,7 +48,10 @@ public static function generateHTML(GeneratorField $field, $templateType): strin
 
                 return view($templateType.'.fields.radio_group', array_merge(
                     ['radioButtons' => implode(infy_nl(), $radioButtons)],
-                    $field->variables()
+                    array_merge(
+                        $field->variables(),
+                        $variables
+                    )
                 ))->render();
         }
 
@@ -55,4 +63,35 @@ public static function generateHTML(GeneratorField $field, $templateType): strin
             )
         )->render();
     }
+
+    public static function generateValidations(GeneratorField $field)
+    {
+        $validations = explode('|', $field->validations);
+        $validationRules = [];
+
+        foreach ($validations as $validation) {
+
+            if ($validation === 'required') {
+                $validationRules[] = "'required'";
+                continue;
+            }
+
+            if (!Str::contains($validation, ['max:', 'min:'])) {
+                continue;
+            }
+
+            $validationText = substr($validation, 0, 3);
+            $sizeInNumber = substr($validation, 4);
+
+            $sizeText = ($validationText == 'min') ? 'minlength' : 'maxlength';
+            if ($field->htmlType == 'number') {
+                $sizeText = $validationText;
+            }
+
+            $size = "'$sizeText' => $sizeInNumber";
+            $validationRules[] = $size;
+        }
+
+        return $validationRules;
+    }
 }