fix: #853 Support to add Custom modal name in select Dropdown (#859)

Author: ajayinfyom

src/Generators/Scaffold/ViewGenerator.php

@@ -274,11 +274,17 @@ private function generateFields()
                 }
                 $columns = substr_replace($columns, '', -1); // remove last ,
 
-                $selectTable = $field->htmlValues[0];
+                $htmlValues = explode(',', $field->htmlValues[0]);
+                $selectTable = $htmlValues[0];
+                $modalName = null;
+                if (count($htmlValues) == 2) {
+                    $modalName = $htmlValues[1];
+                }
+
                 $tableName = $this->commandData->config->tableName;
                 $variableName = Str::singular($selectTable).'Items'; // e.g $userItems
 
-                $fieldTemplate = $this->generateViewComposer($tableName, $variableName, $columns, $selectTable);
+                $fieldTemplate = $this->generateViewComposer($tableName, $variableName, $columns, $selectTable, $modalName);
             }
 
             if (!empty($fieldTemplate)) {
@@ -301,13 +307,13 @@ private function generateFields()
         $this->commandData->commandInfo('field.blade.php created');
     }
 
-    private function generateViewComposer($tableName, $variableName, $columns, $selectTable)
+    private function generateViewComposer($tableName, $variableName, $columns, $selectTable, $modelName = null)
     {
         $fieldTemplate = get_template('scaffold.fields.select', $this->templateType);
 
         $viewServiceProvider = new ViewServiceProviderGenerator($this->commandData);
         $viewServiceProvider->generate();
-        $viewServiceProvider->addViewVariables($tableName.'.fields', $variableName, $columns, $selectTable);
+        $viewServiceProvider->addViewVariables($tableName.'.fields', $variableName, $columns, $selectTable, $modelName);
 
         $fieldTemplate = str_replace(
             '$INPUT_ARR$',

src/Generators/ViewServiceProviderGenerator.php

@@ -43,14 +43,19 @@ public function generate()
     }
 
     /**
-     * @param string $views
-     * @param string $variableName
-     * @param string $columns
-     * @param string $tableName
+     * @param string      $views
+     * @param string      $variableName
+     * @param string      $columns
+     * @param string      $tableName
+     * @param string|null $modelName
      */
-    public function addViewVariables($views, $variableName, $columns, $tableName)
+    public function addViewVariables($views, $variableName, $columns, $tableName, $modelName = null)
     {
-        $model = model_name_from_table_name($tableName);
+        if (!empty($modelName)) {
+            $model = $modelName;
+        } else {
+            $model = model_name_from_table_name($tableName);
+        }
 
         $this->commandData->addDynamicVariable('$COMPOSER_VIEWS$', $views);
         $this->commandData->addDynamicVariable('$COMPOSER_VIEW_VARIABLE$', $variableName);