Fix: pick laravel old

composer.json

@@ -20,8 +20,8 @@
         "illuminate/contracts": "^10.0",
         "notfoundnl/siteboss-layout": "^1.3.0",
         "mcamara/laravel-localization": "^1.8",
-        "firebase/php-jwt": "^6.3",
         "xenolope/quahog": "^3.0",
+        "firebase/php-jwt": "^6.3",
         "intervention/image": "^2.7",
         "php": "^8.1"
     },

database/migrations/2023_05_18_133000_check_cms_form_tables.php

@@ -0,0 +1,57 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $this->fix('cms_form');
+        $this->fix('cms_form_categories');
+        $this->fix('cms_form_fields');
+        $this->fix('cms_form_properties');
+        $this->fix('cms_form_data');
+
+        Schema::table('cms_form', function (Blueprint $table) {
+            $table->string('locales')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('cms_form', function (Blueprint $table) {
+            $table->dropColumn('locales');
+        });
+    }
+
+    private function fix($tableName)
+    {
+        if (! Schema::hasColumn($tableName, 'created_at')) {
+            Schema::table($tableName, function (Blueprint $table) {
+                $table->timestamp('created_at')->nullable();
+            });
+        }
+        if (! Schema::hasColumn($tableName, 'updated_at')) {
+            Schema::table($tableName, function (Blueprint $table) {
+                $table->timestamp('updated_at')->nullable();
+            });
+        }
+        if (! Schema::hasColumn($tableName, 'deleted_at')) {
+            Schema::table($tableName, function (Blueprint $table) {
+                $table->softDeletes();
+            });
+        }
+    }
+};

resources/views/siteboss/forms/fields/checkbox.blade.php

@@ -10,7 +10,7 @@
                 type="checkbox"
                 name="{{ $id }}[]"
                 id="radio{{ $id }}{{ $optionString }}"
-                value="{{ $option->id }}"
+                value="{{ $option->index }}"
                 {{$required}}
             >
             <label class="form-check-label" for="radio{{ $id }}{{ $optionString }}">

resources/views/siteboss/forms/fields/dropdown.blade.php

@@ -8,7 +8,7 @@
 
     @foreach ($optionList as $option)
         @php($optionString = $getByLanguage($option))
-        <option value="{{ $option->id }}">{{ $optionString }}</option>
+        <option value="{{ $option->index }}">{{ $optionString }}</option>
     @endforeach
   </select>
   <label for="{{ $id }}" generated="true" class="error invalid-feedback" style="display: none;"></label>

resources/views/siteboss/forms/fields/radio.blade.php

@@ -16,7 +16,7 @@ class="error invalid-feedback"
                     type="radio"
                     name="{{ $id }}[]"
                     id="radio{{ $id }}$optionString"
-                    value="{{ $option->id }}"
+                    value="{{ $option->index }}"
                     {{$required}}
                 >
                 <label class="form-check-label" for="radio{{ $id }}{{$optionString}}">

src/Http/Controllers/Assets/TableEditorController.php

@@ -2,6 +2,7 @@
 
 namespace NotFound\Framework\Http\Controllers\Assets;
 
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Log;
 use NotFound\Framework\Events\AfterSaveEvent;
@@ -28,14 +29,16 @@
  */
 class TableEditorController extends AssetEditorController
 {
-    public function index(Table $table, int $recordId, string $langUrl)
+    public function index(Request $request, Table $table, int $recordId, string $langUrl)
     {
         $this->authorize('view', $table);
         $lang = Lang::whereUrl($langUrl)->firstOrFail();
 
         $tableService = new TableService($table, $lang, $recordId === 0 ? null : $recordId);
 
-        $formUrl = sprintf('/table/%s/%s/%s/', $table->url, $recordId ?? 0, urlencode($langUrl));
+        $params = sprintf('?page=%d&sort=%s&asc=%s', $request->page ?? 1, $request->sort ?? '', $request->asc ?? '');
+
+        $formUrl = sprintf('/table/%s/%s/%s/%s', $table->url, $recordId ?? 0, urlencode($langUrl), $params);
 
         $form = new LayoutForm($formUrl);
 
@@ -52,7 +55,7 @@ public function index(Table $table, int $recordId, string $langUrl)
 
         $breadcrumb = new LayoutBreadcrumb();
         $breadcrumb->addHome();
-        $breadcrumb->addItem($table->name, '/table/'.$table->url.'/');
+        $breadcrumb->addItem($table->name, '/table/'.$table->url.'/?'.$params);
         $upsertingText = $recordId === 0 ? __('siteboss::ui.new') : __('siteboss::ui.edit');
         $breadcrumb->addItem($upsertingText); //TODO: Add better title
         $page->addBreadCrumb($breadcrumb);
@@ -139,7 +142,10 @@ public function update(FormDataRequest $request, Table $table, int $recordId, st
             }
         } else {
             // Redirect
-            $response->addAction(new Redirect('/table/'.$table->url.'/'));
+
+            $params = sprintf('?page=%d&sort=%s&asc=%s', $request->page ?? 1, $request->sort ?? '', $request->asc ?? '');
+
+            $response->addAction(new Redirect('/table/'.$table->url.'/?'.$params));
         }
 
         return $response->build();

src/Http/Controllers/Assets/TableOverviewController.php

@@ -45,7 +45,7 @@ public function index(Request $request, Table $table)
         $layoutTable->setTotalItems($siteTableRowsPaginator->total());
 
         foreach ($siteTableRowsPaginator as $row) {
-            $link = sprintf('/table/%s/%d/?page=%d', $table->url, $row->id, $request->page ?? 1);
+            $link = sprintf('/table/%s/%d/?page=%d&sort=%s&asc=%s', $table->url, $row->id, $request->page ?? 1, $request->sort ?? '', $request->asc ?? '');
             $layoutRow = new LayoutTableRow($row->id, link: $link);
 
             foreach ($components as $component) {

src/Http/Controllers/CmsEditor/CmsEditorTableController.php

@@ -3,6 +3,8 @@
 namespace NotFound\Framework\Http\Controllers\CmsEditor;
 
 use Illuminate\Http\Request as HttpRequest;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
 use NotFound\Framework\Http\Requests\FormDataRequest;
 use NotFound\Framework\Models\Table;
 use NotFound\Framework\Services\Editor\FieldsProperties;
@@ -22,6 +24,7 @@
 use NotFound\Layout\LayoutResponse;
 use NotFound\Layout\Responses\Redirect;
 use NotFound\Layout\Responses\Toast;
+use stdClass;
 
 class CmsEditorTableController extends \NotFound\Framework\Http\Controllers\Controller
 {
@@ -157,14 +160,22 @@ public function readOne(Table $table)
 
         $UItable->addHeader(new LayoutTableHeader('Element', 'table'));
         $UItable->addHeader(new LayoutTableHeader('Type', 'type'));
-        $UItable->addHeader(new LayoutTableHeader('Internal name', 'internal'));
+        $UItable->addHeader(new LayoutTableHeader('Error', 'error'));
         $UItable->addHeader(new LayoutTableHeader('Enabled', 'enabled'));
         $tables = $table->items()->orderBy('order', 'asc')->get();
 
         foreach ($tables as $cmsTable) {
             $row = new LayoutTableRow($cmsTable->id, '/app/editor/table/'.$table->id.'/'.$cmsTable->id);
             $row->addColumn(new LayoutTableColumn($cmsTable->name, 'text'));
             $row->addColumn(new LayoutTableColumn($cmsTable->type, 'text'));
+
+            if (isset($cmsTable->properties->localize) && $cmsTable->properties->localize == 1) {
+                $tableName = $table->table.'_tr';
+            } else {
+                $tableName = $table->table;
+            }
+            $row->addColumn(new LayoutTableColumn($cmsTable->enabled ? $this->checkColumn($tableName, $cmsTable) : '-', 'text'));
+
             $row->addColumn(new LayoutTableColumn($cmsTable->internal, 'text'));
             $row->addColumn(new LayoutTableColumn($cmsTable->enabled, 'checkbox'));
             $UItable->addRow($row);
@@ -265,4 +276,18 @@ public function updatePosition(HttpRequest $request, Table $table)
 
         return response()->json(['status' => 'ok']);
     }
+
+    private function checkColumn(string $table, object $field): string
+    {
+        $className = '\\NotFound\\Framework\\Services\\Editor\\Fields\\'.$field->type;
+
+        $fieldClass = new $className(new stdClass());
+
+        if (Schema::hasColumn($table, $field->internal)) {
+            return $fieldClass->checkColumnType(DB::getDoctrineColumn(set_database_prefix($table), $field->internal)->getType());
+
+        } else {
+            return $fieldClass->checkColumnType(null);
+        }
+    }
 }

src/Http/Controllers/Forms/FieldController.php

@@ -55,6 +55,7 @@ public function readOne($formId)
         $response->category_slug = $form->category?->slug;
         $response->name = $form->name;
         $response->category_properties = $form->category?->properties;
+        $response->locales = $form->locales;
 
         $propC = new Property();
         $response->available_fields = $propC->getWithCustomCombinations();

src/Http/Controllers/Forms/FormController.php

@@ -14,8 +14,7 @@ public function readAllCombinations(Form $form)
     {
         return $form
             ->whereTypeCombination()
-            ->where('archived', 0)
-            ->orWhere('archived', null)
+            ->where('archived', false)
             ->orderBy('name', 'ASC')
             ->get();
     }
@@ -28,12 +27,11 @@ public function readAllArchive(Form $form)
             ->get();
     }
 
-    public function readAllBasedOnCategory(Form $form, Category $category)
+    public function readAllBasedOnCategory(Category $category)
     {
         $this->authorize('view', $category);
 
-        //TODO: show number of applications
-        return $form->getByCategory($category->slug);
+        return $category->forms->where('archived', false)->where('type', 'form')->values();
     }
 
     public function updateText(Request $request, Form $form)
@@ -83,6 +81,7 @@ public function create(Request $request)
             $form->category_id = $category->id;
 
             $form->notification_address = $request->mail ?? '';
+            $form->locales = $request->locales ?? '';
         }
 
         try {
@@ -101,15 +100,18 @@ public function create(Request $request)
 
     public function update(Request $request, Form $form)
     {
-        $this->authorize('update', $form->category);
+        $this->authorize('view', $form->category);
 
         $request->validate([
             'name' => 'required',
+            'archived' => 'boolean',
+            'notification_address' => 'string',
         ]);
 
         $form->name = $request->name;
+        $form->locales = $request->locales ?? null;
         $form->notification_address = $request->mail ?? '';
-        $form->archived = $request->archived ?? $form->archived;
+        $form->archived = $request->archived;
 
         return $form->save();
     }

src/Models/Forms/Category.php

@@ -59,4 +59,9 @@ public function getCategoriesByRights()
 
         return $filteredCategories->values();
     }
+
+    public function forms()
+    {
+        return $this->hasMany(Form::class, 'category_id', 'id');
+    }
 }

src/Models/Forms/Form.php

@@ -58,6 +58,7 @@ class Form extends BaseModel
         'id',
         'name',
         'type',
+        'locales',
         'success_text',
         'notification_address',
         'confirmation_mail',
@@ -67,6 +68,7 @@ class Form extends BaseModel
     protected $casts = [
         'success_text' => 'object',
         'confirmation_mail' => 'object',
+        'archived' => 'boolean',
     ];
 
     public function category()
@@ -99,7 +101,7 @@ public function getByCategory($categorySlug)
             ->where('archived', 0)
             ->orWhere('archived', null)
             ->orderBy('name', 'ASC')
-            ->get(['id', 'name', 'type', 'notification_address', 'archived']);
+            ->get(['id', 'name', 'type', 'notification_address', 'locales', 'archived']);
     }
 
     public function getNotificationAddresses(): array

src/Models/Forms/Property.php

@@ -5,6 +5,12 @@
 use Illuminate\Database\Eloquent\SoftDeletes;
 use NotFound\Framework\Models\BaseModel;
 use NotFound\Framework\Services\Forms\Fields\FactoryType;
+use NotFound\Layout\Inputs\LayoutInputCheckbox;
+use NotFound\Layout\Inputs\LayoutInputDropdown;
+use NotFound\Layout\Inputs\LayoutInputRepeatable;
+use NotFound\Layout\Inputs\LayoutInputSlider;
+use NotFound\Layout\Inputs\LayoutInputText;
+use NotFound\Layout\Inputs\LayoutInputTextArea;
 
 /**
  * NotFound\Framework\Models\Forms\Property
@@ -61,7 +67,7 @@ public function getWithCustomCombinations()
         $properties = [];
         foreach ($this->get() as $property) {
             $type = $typeFactory->getByType($property->type, $property->options, 4);
-            $property->{'options'} = $type->getOptions($property->options);
+            $property->{'options'} = $this->makeAutoLayout($type->getOptions($property->options));
 
             $properties[] = $property;
         }
@@ -83,4 +89,63 @@ public function getWithCustomCombinations()
 
         return $properties;
     }
+
+    private function makeAutoLayout($options)
+    {
+        $autoLayoutOptions = [];
+        foreach ($options as $option) {
+            switch ($option->type) {
+                case 'checkbox':
+                    $checkbox = new LayoutInputCheckbox($option->internal, $option->label);
+                    $autoLayoutOptions[] = $checkbox->build();
+                    break;
+                case 'textarea':
+                    $textArea = new LayoutInputTextArea('textarea'.$option->internal, $option->label);
+                    $autoLayoutOptions[] = $textArea->build();
+                    break;
+                case 'number':
+                    $slider = new LayoutInputSlider($option->internal, $option->label);
+                    $slider->setMin(1);
+                    $slider->setMax(12);
+                    $autoLayoutOptions[] = $slider->build();
+                    break;
+                case 'list':
+                    $optionList = new LayoutInputRepeatable($option->internal, $option->label);
+                    $optionList->setRequired();
+                    $optionList->showDeleted();
+
+                    $form = new \NotFound\Layout\Elements\LayoutForm('form');
+                    //                    $form->addInput((new LayoutInputHidden('id')));
+                    $form->addInput((new LayoutInputText('option', 'Optie'))->setLocalize()->setRequired());
+
+                    $optionList->setForm($form);
+                    $autoLayoutOptions[] = $optionList->build();
+                    break;
+                case 'optionlist':
+                    $optionList = new LayoutInputDropdown($option->internal, $option->label);
+                    $optionList->setRequired();
+                    foreach ($option->options as $item) {
+                        $optionList->addOption($item->value, $item->label);
+                    }
+                    if (isset($option->required) && $option->required === true) {
+                        $optionList->setRequired();
+                    }
+                    $autoLayoutOptions[] = $optionList->build();
+                    break;
+                case 'input':
+                    $textInput = new LayoutInputText($option->internal, $option->label);
+                    if (isset($option->localize) && $option->localize === true) {
+                        $textInput->setLocalize();
+                    }
+                    if (isset($option->required) && $option->required === true) {
+                        $textInput->setRequired();
+                    }
+                    $textInput->setLocalize();
+                    $autoLayoutOptions[] = $textInput->build();
+                    break;
+            }
+        }
+
+        return $autoLayoutOptions;
+    }
 }