Merge pull request #125 from NotFoundNL/develop

Version 0.11.3

Author: 64knl

routes/cms/editor.php

@@ -28,6 +28,7 @@
         Route::prefix('{tableItem}')->group(function () {
             Route::get('', [CmsEditorTableItemController::class, 'readOne']);
             Route::post('', [CmsEditorTableItemController::class, 'update']);
+            Route::post('enabled', [CmsEditorTableItemController::class, 'enabled']);
         });
     });
 });
@@ -48,6 +49,7 @@
         Route::prefix('{tableItem}')->group(function () {
             Route::get('', [CmsEditorTemplateItemController::class, 'readOne']);
             Route::post('', [CmsEditorTemplateItemController::class, 'update']);
+            Route::post('enabled', [CmsEditorTemplateItemController::class, 'enabled']);
         });
     });
 });

src/Http/Controllers/Assets/TableEditorController.php

@@ -22,6 +22,7 @@
 use NotFound\Layout\Elements\LayoutWidget;
 use NotFound\Layout\LayoutResponse;
 use NotFound\Layout\Responses\Redirect;
+use NotFound\Layout\Responses\Reload;
 use NotFound\Layout\Responses\Toast;
 
 /**
@@ -138,7 +139,7 @@ public function update(FormDataRequest $request, Table $table, int $recordId, st
             if ($newTableRecord) {
                 $response->addAction(new Redirect('/table/'.$table->url.'/'.$id.'/'));
             } else {
-                // TODO: Refresh page
+                $response->addAction(new Reload());
             }
         } else {
             // Redirect

src/Http/Controllers/CmsEditor/CmsEditorTableController.php

@@ -177,7 +177,10 @@ public function readOne(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'));
+
+            $checkbox = new LayoutTableColumn($cmsTable->enabled, 'checkbox');
+            $checkbox->setToggleEndPoint('/app/editor/table/'.$table->id.'/'.$cmsTable->id.'/enabled');
+            $row->addColumn($checkbox);
             $UItable->addRow($row);
         }
         $widget2->addTable($UItable);

src/Http/Controllers/CmsEditor/CmsEditorTableItemController.php

@@ -96,4 +96,25 @@ public function update(FormDataRequest $request, Table $table, TableItem $tableI
 
         return $response->build();
     }
+
+    /**
+     * enabled
+     *
+     * @param  mixed  $table
+     * @param  mixed  $tableItem
+     * @return void
+     */
+    public function enabled(Table $table, TableItem $tableItem)
+    {
+        $tableItem->enabled = ! $tableItem->enabled;
+        try {
+            $tableItem->save();
+
+            $response = ['value' => $tableItem->enabled, 'message' => 'Item updated'];
+        } catch (\Exception $e) {
+            $response = ['error' => $e];
+        }
+
+        return $response;
+    }
 }

src/Http/Controllers/CmsEditor/CmsEditorTemplateController.php

@@ -159,7 +159,11 @@ public function readOne(Template $table)
             $row->addColumn(new LayoutTableColumn($cmsTable->name, 'text'));
             $row->addColumn(new LayoutTableColumn($cmsTable->type, 'text'));
             $row->addColumn(new LayoutTableColumn($cmsTable->internal, 'internal'));
-            //  $row->addColumn(new LayoutTableColumn($cmsTable->enabled, 'checkbox'));
+
+            $checkbox = new LayoutTableColumn($cmsTable->enabled, 'checkbox');
+            $checkbox->setToggleEndPoint('/app/editor/page/'.$table->id.'/'.$cmsTable->id.'/enabled');
+            $row->addColumn($checkbox);
+
             $UItable->addRow($row);
         }
         $widget2->addTable($UItable);

src/Http/Controllers/CmsEditor/CmsEditorTemplateItemController.php

@@ -104,4 +104,25 @@ public function update(FormDataRequest $request, Template $table, TemplateItem $
 
         return $response->build();
     }
+
+    /**
+     * enabled
+     *
+     * @param  mixed  $table
+     * @param  mixed  $tableItem
+     * @return void
+     */
+    public function enabled(Template $table, TemplateItem $tableItem)
+    {
+        $tableItem->enabled = ! $tableItem->enabled;
+        try {
+            $tableItem->save();
+
+            $response = ['value' => $tableItem->enabled, 'message' => 'Item updated'];
+        } catch (\Exception $e) {
+            $response = ['error' => $e];
+        }
+
+        return $response;
+    }
 }

src/Services/Assets/Components/ComponentDatePicker.php

@@ -69,6 +69,12 @@ public function getTableOverviewContent(): LayoutTableColumn
 
     public function setValueFromStorage(string $value): bool
     {
+        if (isset($this->properties()->datetimeFormat)) {
+            $this->currentValue = $value;
+
+            return true;
+        }
+
         $timeValue = intval($value);
         if ($timeValue == 0) {
             $this->currentValue = '';
@@ -85,6 +91,10 @@ public function setValueFromStorage(string $value): bool
      */
     public function getValueForStorage(): ?string
     {
+        if (isset($this->properties()->datetimeFormat)) {
+            return $this->newValue;
+        }
+
         if ($this->newValue == null) {
             return '0';
         }

src/Services/Editor/Fields/DatePicker.php

@@ -18,6 +18,7 @@ public function properties(): void
         $this->localize();
         $this->required();
         $this->addCheckbox('allowEmpty', 'Allow empty', true);
+        $this->addCheckbox('datetimeFormat', 'Use datetime format', true);
         $this->addText('placeholderText', 'Placeholder text');
     }
 
@@ -37,8 +38,12 @@ public function checkColumnType(?\Doctrine\DBAL\Types\Type $type): string
         if ($type === null) {
             return 'COLUMN MISSING';
         }
-        if (! in_array($type->getName(), ['int'])) {
-            return 'TYPE ERROR: '.$type->getName().' is not a valid type for a text field';
+        if ($type->getName() === 'int') {
+            return 'TYPE WARNING: '.$type->getName().' should be converted to datetime';
+        }
+
+        if ($type->getName() !== 'datetime') {
+            return 'TYPE ERROR: '.$type->getName().' is not a valid type for a date field';
         }
 
         return '';

src/Services/Editor/Fields/DateTimePicker.php

@@ -27,8 +27,8 @@ public function checkColumnType(?\Doctrine\DBAL\Types\Type $type): string
         if ($type === null) {
             return 'COLUMN MISSING';
         }
-        if (! in_array($type->getName(), ['int'])) {
-            return 'TYPE ERROR: '.$type->getName().' is not a valid type for a text field';
+        if (! in_array($type->getName(), ['datetime'])) {
+            return 'TYPE ERROR: '.$type->getName().' is not a valid type for a date field';
         }
 
         return '';

src/Services/Indexer/IndexBuilderService.php

@@ -212,6 +212,12 @@ private function updateSubitems($class, $lang)
     {
         app()->setLocale($lang->url);
         $subPages = $class->searchSubitems();
+
+        // We need to check if the subPages is an array of arrays
+        // If not we wrap it in an extra array
+        if (count($subPages) > 0 && ! is_array($subPages[0])) {
+            $subPages = [$subPages];
+        }
         foreach ($subPages as $subPage) {
 
             foreach ($subPage as $searchItem) {