From 56bcc143142e2654ed46462c3251f586cc857571 Mon Sep 17 00:00:00 2001 From: Maurits van der Schee Date: Thu, 2 Jul 2020 14:47:53 +0200 Subject: [PATCH 01/17] bugfix --- .../PhpCrudUi/Controller/MultiResponder.php | 5 + .../PhpCrudUi/Controller/RecordController.php | 13 + .../PhpCrudUi/Document/RedirectDocument.php | 25 ++ src/Tqdev/PhpCrudUi/Record/RecordService.php | 10 +- templates/record/list.html | 2 +- ui.php | 260 ++++++++++++------ 6 files changed, 228 insertions(+), 87 deletions(-) create mode 100644 src/Tqdev/PhpCrudUi/Document/RedirectDocument.php diff --git a/src/Tqdev/PhpCrudUi/Controller/MultiResponder.php b/src/Tqdev/PhpCrudUi/Controller/MultiResponder.php index 274353f..71ea810 100644 --- a/src/Tqdev/PhpCrudUi/Controller/MultiResponder.php +++ b/src/Tqdev/PhpCrudUi/Controller/MultiResponder.php @@ -8,6 +8,7 @@ use Tqdev\PhpCrudApi\Record\ErrorCode; use Tqdev\PhpCrudApi\ResponseFactory; use Tqdev\PhpCrudUi\Document\CsvDocument; +use Tqdev\PhpCrudUi\Document\RedirectDocument; use Tqdev\PhpCrudUi\Document\TemplateDocument; class MultiResponder implements Responder @@ -45,6 +46,10 @@ public function success($result): ResponseInterface $result->addVariables($this->variables); $result->setTemplatePath($this->templatePath); return ResponseFactory::fromHtml(ResponseFactory::OK, (string) $result); + } elseif ($result instanceof RedirectDocument) { + $result->addVariables($this->variables); + $response = ResponseFactory::fromStatus(ResponseFactory::FOUND); + return $response->withHeader('Location', (string) $result); } else { throw new \Exception('Document type not supported: ' . get_class($result)); } diff --git a/src/Tqdev/PhpCrudUi/Controller/RecordController.php b/src/Tqdev/PhpCrudUi/Controller/RecordController.php index fc8c770..111133a 100644 --- a/src/Tqdev/PhpCrudUi/Controller/RecordController.php +++ b/src/Tqdev/PhpCrudUi/Controller/RecordController.php @@ -26,6 +26,7 @@ public function __construct(Router $router, Responder $responder, RecordService $router->register('GET', '/*/delete/*', array($this, 'deleteForm')); $router->register('POST', '/*/delete/*', array($this, 'delete')); $router->register('GET', '/*/list', array($this, '_list')); + $router->register('POST', '/*/list', array($this, 'search')); $router->register('GET', '/*/export', array($this, 'export')); $this->service = $service; $this->responder = $responder; @@ -140,6 +141,18 @@ public function _list(ServerRequestInterface $request): ResponseInterface return $this->responder->success($result); } + public function search(ServerRequestInterface $request): ResponseInterface + { + $table = RequestUtils::getPathSegment($request, 1); + $action = RequestUtils::getPathSegment($request, 2); + $params = RequestUtils::getParams($request); + if (!$this->service->hasTable($table, $action)) { + return $this->responder->error(ErrorCode::TABLE_NOT_FOUND, $table); + } + $result = $this->service->search($table, $action, $params); + return $this->responder->success($result); + } + public function export(ServerRequestInterface $request): ResponseInterface { $table = RequestUtils::getPathSegment($request, 1); diff --git a/src/Tqdev/PhpCrudUi/Document/RedirectDocument.php b/src/Tqdev/PhpCrudUi/Document/RedirectDocument.php new file mode 100644 index 0000000..6c0b990 --- /dev/null +++ b/src/Tqdev/PhpCrudUi/Document/RedirectDocument.php @@ -0,0 +1,25 @@ +path = $path; + $this->variables = $variables; + } + + public function addVariables(array $variables) /*: void*/ + { + $this->variables = array_merge($variables, $this->variables); + } + + public function __toString(): string + { + return $this->variables['base'] . $this->path; + } +} diff --git a/src/Tqdev/PhpCrudUi/Record/RecordService.php b/src/Tqdev/PhpCrudUi/Record/RecordService.php index d6f3ac3..8f22c12 100644 --- a/src/Tqdev/PhpCrudUi/Record/RecordService.php +++ b/src/Tqdev/PhpCrudUi/Record/RecordService.php @@ -5,6 +5,7 @@ use Tqdev\PhpCrudUi\Client\CrudApi; use Tqdev\PhpCrudUi\Column\SpecificationService; use Tqdev\PhpCrudUi\Document\CsvDocument; +use Tqdev\PhpCrudUi\Document\RedirectDocument; use Tqdev\PhpCrudUi\Document\TemplateDocument; class RecordService @@ -216,7 +217,6 @@ public function _list(string $table, string $action, array $params): TemplateDoc { $types = $this->definition->getTypes($table, $action); $references = $this->definition->getReferences($table, $action); - $referenced = $this->definition->getReferenced($table, $action); $primaryKey = $this->definition->getPrimaryKey($table, $action); $columns = $this->definition->getColumns($table, $action); @@ -281,6 +281,14 @@ public function _list(string $table, string $action, array $params): TemplateDoc return new TemplateDocument('layouts/default', 'record/list', $variables); } + public function search(string $table, string $action, array $params) + { + //die(var_dump($params)); + $params = ['search' => 'asdas']; + $query = http_build_query($params); + return new RedirectDocument('/' . $table . '/list?' . $query, []); + } + public function export(string $table, string $action): CsvDocument { $references = $this->definition->getReferences($table, $action); diff --git a/templates/record/list.html b/templates/record/list.html index b624902..a0264ce 100644 --- a/templates/record/list.html +++ b/templates/record/list.html @@ -45,7 +45,7 @@

{{table|humanize}}

-
+  
diff --git a/ui.php b/ui.php index 5eebd49..7ae513a 100644 --- a/ui.php +++ b/ui.php @@ -109,30 +109,49 @@ $_HTML['record/create'] = <<<'END_OF_HTML' -

create {{table}}

+

New item

- {{for:column:columns}} -
- - {{if:column.values}} - - {{else}} - - {{endif}} -
+ {{for:value:key:record}} + {{if:key|neq(primaryKey)}} +
+ + {{if:value.values}} + + {{else}} + {{if:value.type.format|eq("int32")}} + + {{elseif:value.type.format|eq("int64")}} + + {{elseif:value.type.format|eq("decimal")}} + + {{elseif:value.type.format|eq("date-time")}} + + {{elseif:value.type.format|eq("date")}} + + {{elseif:value.type.format|eq("time")}} + + {{elseif:value.type.format|eq("large-string")}} + + {{elseif:value.type.format|eq("boolean")}} + + {{else}} + + {{endif}} + {{endif}} +
+ {{endif}} {{endfor}}
- END_OF_HTML; } @@ -157,17 +176,22 @@ $_HTML['record/delete'] = <<<'END_OF_HTML' -

delete {{table}}

+

{{name|or("Delete item")}}

+{{if:name}} +

Are you sure you want to delete '{{name}}'?

+{{else}} +

Are you sure you want to delete item #{{id}}?

+{{endif}}

The action cannot be undone.

- + - Cancel + Cancel
END_OF_HTML; } @@ -216,7 +240,6 @@
  • {{table|humanize}}
    • -{{if:primaryKey}}

    {{table|humanize}}

    @@ -224,10 +247,11 @@ filter Search + {{if:primaryKey}} New item + {{endif}}
    -{{endif}} @@ -258,7 +282,7 @@ class="icon search">Search
    -
    +  
    @@ -271,8 +295,8 @@ class="icon search">Search Action {{endif}} {{for:column:columns}} - {{if:column|neq(primaryKey)}} - {{column|humanize}} + {{if:column.text|neq(primaryKey)}} + {{column.text|humanize}} {{endif}} {{endfor}} @@ -281,13 +305,9 @@ class="icon search">Search {{for:record:records}} {{for:field:name:record}} - {{if:primaryKey}} {{if:name|eq(primaryKey)}} view {{endif}} - {{endif}} - {{endfor}} - {{for:field:name:record}} {{if:name|neq(primaryKey)}} {{if:field.table}} {{field.text}} @@ -332,32 +352,34 @@ class="icon search">Search
  • {{table|humanize}}
    • -

    view {{table|humanize}}

    +

    {{name|or("View item")}}

    - - + + {{for:field:name:record}} + {{if:name|neq(primaryKey)}} + {{endif}} {{endfor}}
    keyvalueKeyValue
    {{name|humanize}} {{if:field.table}} - {{field.text}} + {{field.text}} {{else}} - {{if:field.type.format|eq("large-string")}} -
    {{field.text}}
    - {{else}} - {{if:field.text}}{{field.text}}{{else}}-{{endif}} - {{endif}} + {{if:field.type.format|eq("large-string")}} +
    {{field.text}}
    + {{else}} + {{if:field.text}}{{field.text}}{{else}}-{{endif}} + {{endif}} {{endif}}
    @@ -375,7 +397,8 @@ class="icon search">Search
  • {{relation.0|humanize}}
    • {{endfor}} -{{endif}} + {{endif}} + END_OF_HTML; } @@ -387,45 +410,46 @@ class="icon search">Search
  • {{table|humanize}}
    • -

    update {{table}}

    +

    {{name|or("Edit item")}}

    {{for:value:key:record}} -
    - - {{if:value.values}} - - {{else}} - {{if:value.type.format|eq("int32")}} - - {{elseif:value.type.format|eq("int64")}} - - {{elseif:value.type.format|eq("decimal")}} - - {{elseif:value.type.format|eq("date-time")}} - - {{elseif:value.type.format|eq("date")}} - - {{elseif:value.type.format|eq("time")}} - - {{elseif:value.type.format|eq("large-string")}} - - {{elseif:value.type.format|eq("boolean")}} - - {{else}} - - {{endif}} - {{endif}} -
    + {{if:key|neq(primaryKey)}} +
    + + {{if:value.values}} + + {{else}} + {{if:value.type.format|eq("int32")}} + + {{elseif:value.type.format|eq("int64")}} + + {{elseif:value.type.format|eq("decimal")}} + + {{elseif:value.type.format|eq("date-time")}} + + {{elseif:value.type.format|eq("date")}} + + {{elseif:value.type.format|eq("time")}} + + {{elseif:value.type.format|eq("large-string")}} + + {{elseif:value.type.format|eq("boolean")}} + + {{else}} + + {{endif}} + {{endif}} +
    + {{endif}} {{endfor}}
    - END_OF_HTML; } @@ -11688,6 +11712,8 @@ public static function getTableNames(ServerRequestInterface $request, Reflection class ResponseFactory { const OK = 200; + const MOVED_PERMANENTLY = 301; + const FOUND = 302; const UNAUTHORIZED = 401; const FORBIDDEN = 403; const NOT_FOUND = 404; @@ -12146,6 +12172,7 @@ public function referenceId(string $table, /* object */ $record) use Tqdev\PhpCrudApi\Record\ErrorCode; use Tqdev\PhpCrudApi\ResponseFactory; use Tqdev\PhpCrudUi\Document\CsvDocument; + use Tqdev\PhpCrudUi\Document\RedirectDocument; use Tqdev\PhpCrudUi\Document\TemplateDocument; class MultiResponder implements Responder @@ -12183,6 +12210,10 @@ public function success($result): ResponseInterface $result->addVariables($this->variables); $result->setTemplatePath($this->templatePath); return ResponseFactory::fromHtml(ResponseFactory::OK, (string) $result); + } elseif ($result instanceof RedirectDocument) { + $result->addVariables($this->variables); + $response = ResponseFactory::fromStatus(ResponseFactory::FOUND); + return $response->withHeader('Location', (string) $result); } else { throw new \Exception('Document type not supported: ' . get_class($result)); } @@ -12217,6 +12248,7 @@ public function __construct(Router $router, Responder $responder, RecordService $router->register('GET', '/*/delete/*', array($this, 'deleteForm')); $router->register('POST', '/*/delete/*', array($this, 'delete')); $router->register('GET', '/*/list', array($this, '_list')); + $router->register('POST', '/*/list', array($this, 'search')); $router->register('GET', '/*/export', array($this, 'export')); $this->service = $service; $this->responder = $responder; @@ -12331,6 +12363,18 @@ public function _list(ServerRequestInterface $request): ResponseInterface return $this->responder->success($result); } + public function search(ServerRequestInterface $request): ResponseInterface + { + $table = RequestUtils::getPathSegment($request, 1); + $action = RequestUtils::getPathSegment($request, 2); + $params = RequestUtils::getParams($request); + if (!$this->service->hasTable($table, $action)) { + return $this->responder->error(ErrorCode::TABLE_NOT_FOUND, $table); + } + $result = $this->service->search($table, $action, $params); + return $this->responder->success($result); + } + public function export(ServerRequestInterface $request): ResponseInterface { $table = RequestUtils::getPathSegment($request, 1); @@ -12370,6 +12414,32 @@ public function __toString(): string } } +// file: src/Tqdev/PhpCrudUi/Document/RedirectDocument.php +namespace Tqdev\PhpCrudUi\Document { + + class RedirectDocument + { + private $path; + private $variables; + + public function __construct(string $path, array $variables) + { + $this->path = $path; + $this->variables = $variables; + } + + public function addVariables(array $variables) /*: void*/ + { + $this->variables = array_merge($variables, $this->variables); + } + + public function __toString(): string + { + return $this->variables['base'] . $this->path; + } + } +} + // file: src/Tqdev/PhpCrudUi/Document/TemplateDocument.php namespace Tqdev\PhpCrudUi\Document { @@ -12541,6 +12611,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface use Tqdev\PhpCrudUi\Client\CrudApi; use Tqdev\PhpCrudUi\Column\SpecificationService; use Tqdev\PhpCrudUi\Document\CsvDocument; + use Tqdev\PhpCrudUi\Document\RedirectDocument; use Tqdev\PhpCrudUi\Document\TemplateDocument; class RecordService @@ -12584,20 +12655,24 @@ public function home(): TemplateDocument public function createForm(string $table, string $action): TemplateDocument { + $types = $this->definition->getTypes($table, $action); $references = $this->definition->getReferences($table, $action); $primaryKey = $this->definition->getPrimaryKey($table, $action); $columns = $this->definition->getColumns($table, $action); - - foreach ($columns as $i => $column) { + $record = array(); + foreach ($columns as $column) { $values = $this->getDropDownValues($references[$column]); - $columns[$i] = array('name' => $column, 'values' => $values); + $type = $types[$column]; + //TODO: sensible default + $default = ''; + $record[$column] = array('value' => $default, 'values' => $values, 'type' => $type); } $variables = array( 'table' => $table, 'action' => $action, - 'columns' => $columns, + 'record' => $record, 'primaryKey' => $primaryKey, ); @@ -12625,6 +12700,7 @@ public function read(string $table, string $action, string $id, array $params): $types = $this->definition->getTypes($table, $action); $references = $this->definition->getReferences($table, $action); $referenced = $this->definition->getReferenced($table, $action); + $primaryKey = $this->definition->getPrimaryKey($table, $action); $args = array(); $args['join'] = array_values(array_filter($references)); @@ -12640,7 +12716,7 @@ public function read(string $table, string $action, string $id, array $params): $relatedTable = false; $relatedValue = false; $text = $value; - $type = isset($types[$key]) ? $types[$key] : null; + $type = $types[$key]; if (isset($references[$key]) && $references[$key]) { $relatedTable = $references[$key]; $relatedValue = $this->definition->referenceId($relatedTable, $value); @@ -12654,7 +12730,7 @@ public function read(string $table, string $action, string $id, array $params): 'action' => $action, 'id' => $id, 'name' => $name, - 'references' => $references, + 'primaryKey' => $primaryKey, 'referenced' => $referenced, 'record' => $record, ); @@ -12669,16 +12745,19 @@ public function updateForm(string $table, string $action, string $id): TemplateD $primaryKey = $this->definition->getPrimaryKey($table, $action); $record = $this->api->readRecord($table, $id, []); + $name = $this->definition->referenceText($table, $record); foreach ($record as $key => $value) { $values = $this->getDropDownValues($references[$key]); - $record[$key] = array('type' => $types[$key], 'value' => $value, 'values' => $values); + $type = $types[$key]; + $record[$key] = array('value' => $value, 'values' => $values, 'type' => $type); } $variables = array( 'table' => $table, 'action' => $action, 'id' => $id, + 'name' => $name, 'primaryKey' => $primaryKey, 'record' => $record, ); @@ -12715,6 +12794,7 @@ public function deleteForm(string $table, string $action, string $id): TemplateD 'table' => $table, 'action' => $action, 'id' => $id, + 'name' => $name, 'primaryKey' => $primaryKey, 'name' => $name, ); @@ -12741,11 +12821,14 @@ public function delete(string $table, string $action, string $id): TemplateDocum public function _list(string $table, string $action, array $params): TemplateDocument { + $types = $this->definition->getTypes($table, $action); $references = $this->definition->getReferences($table, $action); - $referenced = $this->definition->getReferenced($table, $action); $primaryKey = $this->definition->getPrimaryKey($table, $action); $columns = $this->definition->getColumns($table, $action); + foreach ($columns as $i => $key) { + $columns[$i] = array('text' => $key, 'type' => $types[$key]); + } $pageParams = isset($params['page']) ? $params['page'][0] : '1,50'; list($pageNumber, $pageSize) = explode(',', $pageParams, 2); @@ -12773,12 +12856,13 @@ public function _list(string $table, string $action, array $params): TemplateDoc $relatedTable = false; $relatedValue = $value; $text = $value; + $type = $types[$key]; if ($references[$key]) { $relatedTable = $references[$key]; $relatedValue = $this->definition->referenceId($relatedTable, $value); $text = $this->definition->referenceText($relatedTable, $value); } - $data['records'][$i][$key] = array('text' => $text, 'table' => $relatedTable, 'value' => $relatedValue); + $data['records'][$i][$key] = array('text' => $text, 'table' => $relatedTable, 'value' => $relatedValue, 'type' => $type); } } @@ -12792,8 +12876,6 @@ public function _list(string $table, string $action, array $params): TemplateDoc 'table' => $table, 'action' => $action, 'filters' => $filters, - 'references' => $references, - 'referenced' => $referenced, 'primaryKey' => $primaryKey, 'columns' => $columns, 'records' => $data['records'], @@ -12805,6 +12887,14 @@ public function _list(string $table, string $action, array $params): TemplateDoc return new TemplateDocument('layouts/default', 'record/list', $variables); } + public function search(string $table, string $action, array $params) + { + die(var_dump($params)); + $params = []; + $query = http_build_query($params); + return new RedirectDocument('/' . $table . '/list?' . $query, []); + } + public function export(string $table, string $action): CsvDocument { $references = $this->definition->getReferences($table, $action); @@ -13467,7 +13557,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface // file: webroot/css/style.css namespace { $_STATIC['/css/style.css'] = <<<'END_OF_STATIC_FILE' -Cioge21hcmdpbjogMDsgcGFkZGluZzogMDsgYm94LXNpemluZzogYm9yZGVyLWJveDt9Cmh0bWwge2ZvbnQtc2l6ZTogMTZweDt9CmJvZHkge2ZvbnQtc2l6ZTogMXJlbTsgbGluZS1oZWlnaHQ6IDEuNDt9CgouY29udGVudCB7bWluLWhlaWdodDogMTAwdmg7fQoubmF2aWdhdGlvbiB7CiAgICBiYWNrZ3JvdW5kLWNvbG9yOiB3aGl0ZTsgCiAgICBkaXNwbGF5OiBmbGV4OyAKICAgIHBvc2l0aW9uOiBmaXhlZDsgCiAgICB3aWR0aDogMTAwJTsgCiAgICBqdXN0aWZ5LWNvbnRlbnQ6IHNwYWNlLWJldHdlZW47CiAgICBib3gtc2hhZG93OiAwcHggMHB4IDEwcHggcmdiYSgwLDAsMCwwLjI1KTsKICAgIHotaW5kZXg6IDk7Cn0KLnRpdGxlIHtwYWRkaW5nOiAwLjVyZW0gMnJlbTsgY29sb3I6IGJsYWNrOyB0ZXh0LWRlY29yYXRpb246IG5vbmU7fQoudGl0bGUgc3BhbiB7Zm9udC13ZWlnaHQ6IGJvbGQ7IGRpc3BsYXk6IGJsb2NrO30KLmJvZHkge3BhZGRpbmc6IDZyZW0gMnJlbTsgZmxleC1ncm93OiAxOyBwYWRkaW5nLWJvdHRvbTogMTByZW07fQouaGFtYnVyZ2VyIHtwYWRkaW5nOiAwIDFyZW0gMC41cmVtOyBtYXJnaW46IDAuM3JlbSAxcmVtOyBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7IHRleHQtZGVjb3JhdGlvbjogbm9uZTsgY29sb3I6IGJsYWNrOyBmb250LXNpemU6IDIuMjVyZW07IGxpbmUtaGVpZ2h0OiAxLjI7IHRyYW5zZm9ybTogc2NhbGVYKDEuNSk7fQoKdGguc2VsZWN0ZWQ6OmFmdGVyIHtjb250ZW50OiAiIOKWviI7fQoKdGQsIHRoLCBkbCA+ICoge3BhZGRpbmc6IDAuMnJlbSAxLjVyZW0gMC4ycmVtIDAuNXJlbTsgdGV4dC1hbGlnbjogbGVmdDt9CnRkLCB0aCB7bWF4LXdpZHRoOiA0MHJlbTt9CnRhYmxlLmxpc3QgdGQsIHRhYmxlLmxpc3QgdGgge3RleHQtb3ZlcmZsb3c6IGVsbGlwc2lzOyB3aGl0ZS1zcGFjZTogbm93cmFwOyBvdmVyZmxvdzogaGlkZGVuOyBtYXgtd2lkdGg6IDI1cmVtO30KdGFibGUucmVhZCB0aGVhZCB7ZGlzcGxheTogbm9uZTt9CmxhYmVsIHtwYWRkaW5nOiBjYWxjKDAuMnJlbSArIDFweCkgMS41cmVtIGNhbGMoMC4ycmVtICsgMXB4KSAwOyB0ZXh0LW92ZXJmbG93OiBlbGxpcHNpczsgd2hpdGUtc3BhY2U6IG5vd3JhcDsgb3ZlcmZsb3c6IGhpZGRlbjt9CnRkOmxhc3QtY2hpbGQgYSB7ZGlzcGxheTogaW5saW5lLWJsb2NrOyBtYXJnaW4tcmlnaHQ6IDAuNXJlbTt9Ci5sb2dvIGltZyB7aGVpZ2h0OiAycmVtOyB2ZXJ0aWNhbC1hbGlnbjogbWlkZGxlO30KYSB7Y29sb3I6IGJsYWNrO30KbGFiZWwge3dpZHRoOiAxNXJlbTsgbWluLXdpZHRoOiAxNXJlbTsgcGFkZGluZy1yaWdodDogMnJlbTt9CmgxIHtmb250LXNpemU6IDIuMnJlbTsgbWFyZ2luLWJvdHRvbTogMC41cmVtOyBtYXJnaW4tcmlnaHQ6IDFyZW07IGxpbmUtaGVpZ2h0OiAxO30KaDIge2ZvbnQtc2l6ZTogMS41cmVtOyBtYXJnaW4tYm90dG9tOiAwLjVyZW07fQp0YWJsZSB7Ym9yZGVyLWNvbGxhcHNlOiBjb2xsYXBzZTsgbWFyZ2luLXRvcDogMS41cmVtO30KdGFibGUgdHI6bnRoLWNoaWxkKGV2ZW4pIHtiYWNrZ3JvdW5kOiByZ2JhKDAsMCwwLDAuMDUpO30KdGFibGUucmVhZCB0cjpudGgtY2hpbGQoZXZlbikge2JhY2tncm91bmQ6IG5vbmU7fQp0YWJsZS5yZWFkIHRyOm50aC1jaGlsZChvZGQpIHtiYWNrZ3JvdW5kOiByZ2JhKDAsMCwwLDAuMDUpO30KdGFibGUgdHIgdGgge3BhZGRpbmctdG9wOiAwLjNyZW07IHBhZGRpbmctYm90dG9tOiAwLjNyZW07IGZvbnQtd2VpZ2h0OiBib2xkOyBib3JkZXItYm90dG9tOiAxcHggc29saWQgYmxhY2s7fQpwLCB0YWJsZSB7bWFyZ2luLWJvdHRvbTogMS40cmVtO30KCi50aXRsZWJhciB7ZGlzcGxheTogZmxleDsgYWxpZ24taXRlbXM6IGNlbnRlcjsgbWFyZ2luLWJvdHRvbTogMC41cmVtOyBmbGV4LXdyYXA6IHdyYXA7fQoudGl0bGViYXIgPiBkaXYge21hcmdpbi1ib3R0b206IDAuNXJlbTt9CgouY29scyB7Y29sdW1uLXdpZHRoOiA3MDBweDsgbWFyZ2luLXRvcDogLTJlbTt9Ci5jb2wgewogICAgLXdlYmtpdC1jb2x1bW4tYnJlYWstaW5zaWRlOiBhdm9pZDsgLyogQ2hyb21lLCBTYWZhcmkgKi8KICAgIHBhZ2UtYnJlYWstaW5zaWRlOiBhdm9pZDsgICAgICAgICAgIC8qIFRoZW9yZXRpY2FsbHkgRkYgMjArICovCiAgICBicmVhay1pbnNpZGU6IGF2b2lkLWNvbHVtbjsgICAgICAgICAvKiBJRSAxMSAqLwogICAgZGlzcGxheTp0YWJsZTsgICAgICAgICAgICAgICAgICAgICAgLyogQWN0dWFsbHkgRkYgMjArICovCn0KCmlucHV0LCB0ZXh0YXJlYSwgc2VsZWN0ewogICAgaGVpZ2h0OiBjYWxjKDJyZW0gKyAycHgpOyAKICAgIGxpbmUtaGVpZ2h0OiAxLjRyZW07IAogICAgdGV4dC1kZWNvcmF0aW9uOiBub25lOyAKICAgIGJvcmRlcjogMXB4IHNvbGlkIGJsYWNrOyAKICAgIHBhZGRpbmc6IDAgMC41cmVtOyAKICAgIGJhY2tncm91bmQ6IHRyYW5zcGFyZW50OwogICAgY29sb3I6IGJsYWNrOwogICAgZm9udC1mYW1pbHk6IGluaGVyaXQ7CiAgICBmb250LXNpemU6IGluaGVyaXQ7CiAgICBmbGV4LWdyb3c6IDE7CiAgICBiYWNrZ3JvdW5kOiB3aGl0ZTsKfQpidXR0b24sIGlucHV0W3R5cGU9InN1Ym1pdCJdLCAuYnRuIHsKICAgIGhlaWdodDogY2FsYygycmVtICsgMnB4KTsgCiAgICBsaW5lLWhlaWdodDogMnJlbTsgCiAgICBib3JkZXI6IDFweCBzb2xpZCB0cmFuc3BhcmVudDsgCiAgICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7IAogICAgdGV4dC1kZWNvcmF0aW9uOiBub25lOyAKICAgIHBhZGRpbmc6IDAgMXJlbTsgCiAgICBiYWNrZ3JvdW5kOiB0cmFuc3BhcmVudDsKICAgIGNvbG9yOiBibGFjazsKICAgIGZvbnQtZmFtaWx5OiBpbmhlcml0OwogICAgZm9udC1zaXplOiBpbmhlcml0OwogICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDIyMiwgMjIyLCAyMjIpOwogICAgY3Vyc29yOiBwb2ludGVyOwogICAgYm9yZGVyLXJhZGl1czogMC4xNXJlbTsKfQpidXR0b246Zm9jdXMsIGlucHV0W3R5cGU9InN1Ym1pdCJdOmZvY3VzLCAuYnRuOmZvY3VzLCAuaWNvbjpmb2N1cyB7Ym9yZGVyLWNvbG9yOiBibGFjazt9CnNlbGVjdDo6LW1zLWV4cGFuZCB7ZGlzcGxheTogbm9uZTt9CnNlbGVjdCB7CiAgICAtd2Via2l0LWFwcGVhcmFuY2U6IG5vbmU7CiAgICAtbW96LWFwcGVhcmFuY2U6IG5vbmU7CiAgICBhcHBlYXJhbmNlOiBub25lOwogICAgYmFja2dyb3VuZDogd2hpdGUgdXJsKCcuLi9pbWcvZG93bi5zdmcnKSBjYWxjKDEwMCUgLSAwLjZyZW0pIDUwJSBuby1yZXBlYXQ7CiAgICBiYWNrZ3JvdW5kLXNpemU6IGF1dG8gMC41cmVtOwogICAgcGFkZGluZy1yaWdodDogMS43NXJlbTsKICAgIG1heC13aWR0aDogY2FsYygxMDAlIC0gMTVyZW0pOwp9CmlucHV0W3R5cGU9InJhZGlvIl0sIGlucHV0W3R5cGU9ImNoZWNrYm94Il0sIGlucHV0W3R5cGU9ImZpbGUiXSB7Ym9yZGVyOiAwOyBoZWlnaHQ6IGF1dG87IGxpbmUtaGVpZ2h0OiBhdXRvOyBtYXJnaW4tcmlnaHQ6IDAuNHJlbTsgdmVydGljYWwtYWxpZ246IG1pZGRsZTsgcG9zaXRpb246IHJlbGF0aXZlOyBib3R0b206IDAuMXJlbTt9CmlucHV0W3R5cGU9ImZpbGUiXSB7cGFkZGluZzogMDsgbWFyZ2luOiAwOyBib3R0b206IDA7fQppbnB1dFt0eXBlPSdudW1iZXInXSB7LW1vei1hcHBlYXJhbmNlOiB0ZXh0ZmllbGQ7fQppbnB1dDo6LXdlYmtpdC1vdXRlci1zcGluLWJ1dHRvbiwgaW5wdXQ6Oi13ZWJraXQtaW5uZXItc3Bpbi1idXR0b24gey13ZWJraXQtYXBwZWFyYW5jZTogbm9uZTt9CmlucHV0W3R5cGU9Im51bWJlciJdIHstbW96LWFwcGVhcmFuY2U6IHRleHRmaWVsZDt9CmlucHV0Ojotd2Via2l0LW91dGVyLXNwaW4tYnV0dG9uLCAKaW5wdXQ6Oi13ZWJraXQtaW5uZXItc3Bpbi1idXR0b24gey13ZWJraXQtYXBwZWFyYW5jZTogbm9uZTt9CnRleHRhcmVhIHttaW4taGVpZ2h0OiAxMHJlbTsgcGFkZGluZzogMC4zNXJlbSAwLjVyZW07IH0KCi5pY29uIHsKICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsgCiAgICB0ZXh0LWRlY29yYXRpb246IG5vbmU7IAogICAgd2lkdGg6IDA7IAogICAgaGVpZ2h0OiAwOyAKICAgIG92ZXJmbG93OiBoaWRkZW47IAogICAgcGFkZGluZy10b3A6IDJyZW07IAogICAgcGFkZGluZy1sZWZ0OiAycmVtOyAKICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigyMjIsIDIyMiwgMjIyKTsKICAgIGN1cnNvcjogcG9pbnRlcjsKICAgIGJvcmRlci1yYWRpdXM6IDAuMTVyZW07CiAgICBib3JkZXI6IDFweCBzb2xpZCB0cmFuc3BhcmVudDsKICAgIHZlcnRpY2FsLWFsaWduOiBib3R0b207Cn0KLmljb246OmJlZm9yZSB7Y29udGVudDogJyc7IHBvc2l0aW9uOiBhYnNvbHV0ZTsgd2lkdGg6IDJyZW07IGhlaWdodDogMnJlbTsgbGVmdDogMDsgdG9wOiAwO30KLmljb24uZmlsdGVyOjpiZWZvcmUgewogICAgYmFja2dyb3VuZDogdXJsKCcuLi9pbWcvZmlsdGVyLnN2ZycpIGNlbnRlciBjZW50ZXIgLyBhdXRvIDQ1JSBuby1yZXBlYXQ7fQouaWNvbi5zZWFyY2g6OmJlZm9yZSB7CiAgICBiYWNrZ3JvdW5kOiB1cmwoJy4uL2ltZy9zZWFyY2guc3ZnJykgY2VudGVyIGNlbnRlciAvIGF1dG8gNTclIG5vLXJlcGVhdDt9Ci5pY29uLnByZXY6OmJlZm9yZSB7CiAgICBiYWNrZ3JvdW5kOiB1cmwoJy4uL2ltZy9wcmV2LnN2ZycpIGNlbnRlciA0OCUgLyBhdXRvIDQwJSBuby1yZXBlYXQ7fQouaWNvbi5uZXh0OjpiZWZvcmUgewogICAgYmFja2dyb3VuZDogdXJsKCcuLi9pbWcvbmV4dC5zdmcnKSBjZW50ZXIgNDglIC8gYXV0byA0MCUgbm8tcmVwZWF0O30KZm9ybSB7bWFyZ2luLXRvcDogMS41cmVtO30KZm9ybSwgZGwge3dpZHRoOiAxMDAlOyBtYXgtd2lkdGg6IDQwcmVtO30KZm9ybSA+IGRpdiB7ZGlzcGxheTogZmxleDsgbWFyZ2luLWJvdHRvbTogMC4yNXJlbTt9CmZvcm0gPiBkaXYgPiAqOm50aC1jaGlsZCgyKSB7ZmxleC1ncm93OiAxO30KZm9ybSA+IGRpdiA+ICo6bnRoLWNoaWxkKDMpIHttYXJnaW4tbGVmdDogMC4yNXJlbTt9CmZvcm0gPiBidXR0b24ge21hcmdpbi10b3A6IDEuNXJlbTt9CgpkbCB7ZGlzcGxheTogZmxleDsgbWFyZ2luLWJvdHRvbTogMS40cmVtO30KZHQge3dpZHRoOiAxMXJlbTsgbWluLXdpZHRoOiAxMXJlbTsgcGFkZGluZy1yaWdodDogMnJlbTt9CmRkIHtmbGV4LWdyb3c6IDE7fQpkbCArIGRsIHttYXJnaW4tdG9wOiAtMS40cmVtO30KZGwgKyBkbCBkdCB7Ym9yZGVyLXRvcDogMXB4IHNvbGlkIHRyYW5zcGFyZW50O30KZGwgKyBkbCBkZCB7Ym9yZGVyLXRvcDogMXB4IHNvbGlkIHNpbHZlcjt9Cgp1bC5icmVhZGNydW1iIHttYXJnaW4tYm90dG9tOiAwLjNyZW07IGZvbnQtc2l6ZTogMC45cmVtOyBvcGFjaXR5OiAwLjQ1O30KdWwuYnJlYWRjcnVtYiBsaSB7ZGlzcGxheTogaW5saW5lOyBsaXN0LXN0eWxlOiBub25lO30KdWwuYnJlYWRjcnVtYiBsaSArIGxpOjpiZWZvcmUge2NvbnRlbnQ6ICIvICI7fQp1bC5icmVhZGNydW1iIGxpIGEge3RleHQtZGVjb3JhdGlvbjogbm9uZTt9Cgp1bC5yZWxhdGVkIGxpLCB1bC5ob21lIGxpIHtsaXN0LXN0eWxlOiBub25lO30KCgouZmlsdGVyYmFyIHtwYWRkaW5nOiAwLjVyZW0gMC43cmVtOyBiYWNrZ3JvdW5kOiByZ2JhKDAsMCwwLDAuMDUpOyBkaXNwbGF5OiBmbGV4OyBqdXN0aWZ5LWNvbnRlbnQ6IHNwYWNlLWJldHdlZW47IGFsaWduLWl0ZW1zOiBjZW50ZXI7IG1hcmdpbi1ib3R0b206IDAuNXJlbTt9CgouY2xvc2U6OmJlZm9yZXtjb250ZW50OiAiKyI7IHRleHQtZGVjb3JhdGlvbjogbm9uZTsgdHJhbnNmb3JtOiByb3RhdGUoNDVkZWcpOyBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7fQoKLmFkZEZpbHRlciB7bWFyZ2luLWJvdHRvbTogMC41cmVtOyBkaXNwbGF5OiBub25lO30KLmFkZEZpbHRlci52aXNpYmxlIHtkaXNwbGF5OiBibG9jazt9Ci5hZGRTZWFyY2gge21hcmdpbi1ib3R0b206IDAuNXJlbTsgZGlzcGxheTogbm9uZTt9Ci5hZGRTZWFyY2gudmlzaWJsZSB7ZGlzcGxheTogYmxvY2s7fQouZm9vdGVyYWN0aW9ucyB7bWFyZ2luLXRvcDogMS41cmVtO30KCi5wYWdpbmF0aW9uIHtkaXNwbGF5OiBmbGV4OyBhbGlnbi1pdGVtczogY2VudGVyOyBmb250LXNpemU6IDAuOXJlbTt9Ci5wYWdpbmF0aW9uIC5pY29uIHttYXJnaW4tcmlnaHQ6IDAuMjVyZW07fQouZGlzYWJsZWQge29wYWNpdHk6IDAuNDsgY3Vyc29yOiBkZWZhdWx0O30KLnBhZ2luYXRpb24gLmljb246bGFzdC1jaGlsZCB7bWFyZ2luLXJpZ2h0OiAwOyBtYXJnaW4tbGVmdDogMC4yNXJlbTt9Ci5oaWRkZW4ge2Rpc3BsYXk6IG5vbmU7fQoKQG1lZGlhIG9ubHkgc2NyZWVuIGFuZCAobWluLXdpZHRoOiAxNTAwcHgpIHsKICAgIC5jb250ZW50IHtkaXNwbGF5OiBibG9jazt9CiAgICAudGl0bGUge3Bvc2l0aW9uOiBhYnNvbHV0ZTsgYm90dG9tOiAxLjVyZW07fQogICAgLm5hdmlnYXRpb24ge2Rpc3BsYXk6IGJsb2NrOyB3aWR0aDogMTVyZW07IGhlaWdodDogMTAwdmg7fQogICAgLmJvZHkge3BhZGRpbmctdG9wOiAzcmVtOyBtYXJnaW4tbGVmdDogMTVyZW07IHBhZGRpbmctbGVmdDogNXJlbTt9CiAgICAuaGFtYnVyZ2VyIHtmb250LXNpemU6IDIuNXJlbTsgbGluZS1oZWlnaHQ6IDEuMjsgbWFyZ2luLWxlZnQ6IDEuM3JlbTsgbWFyZ2luLXRvcDogMXJlbTt9Cn0KCi5tb2JpbGUtb25seSB7ZGlzcGxheTogbm9uZTt9CkBtZWRpYSBvbmx5IHNjcmVlbiBhbmQgKG1heC13aWR0aDogNjAwcHgpIHsKCiAgICB1bC5yZWxhdGVkIGxpIGEsIHVsLmhvbWUgbGkgYSAge2Rpc3BsYXk6IGlubGluZS1ibG9jazsgcGFkZGluZzogMC4ycmVtIDA7fQoKICAgIHRhYmxlLnJlYWQgdHIge2Rpc3BsYXk6IGJsb2NrOyBwYWRkaW5nOiAwLjdyZW0gMC41cmVtO30KICAgIHRhYmxlLnJlYWQgdHIgdGQge2Rpc3BsYXk6IGJsb2NrOyBwYWRkaW5nOiAwO30KICAgIHRhYmxlLnJlYWQgdGQ6bnRoLWNoaWxkKG9kZCkge2ZvbnQtd2VpZ2h0OiBib2xkO30KICAgIAogICAgLm1vYmlsZS1vbmx5IHtkaXNwbGF5OiBpbml0aWFsO30KICAgIAogICAgZm9ybSA+IGRpdiB7ZmxleC1kaXJlY3Rpb246IGNvbHVtbjt9CiAgICBzZWxlY3Qge21heC13aWR0aDogMTAwJTt9Cgp9Cg== +Cioge21hcmdpbjogMDsgcGFkZGluZzogMDsgYm94LXNpemluZzogYm9yZGVyLWJveDt9Cmh0bWwge2ZvbnQtc2l6ZTogMTZweDt9CmJvZHkge2ZvbnQtc2l6ZTogMXJlbTsgbGluZS1oZWlnaHQ6IDEuNDt9CgouY29udGVudCB7bWluLWhlaWdodDogMTAwdmg7fQoubmF2aWdhdGlvbiB7CiAgICBiYWNrZ3JvdW5kLWNvbG9yOiB3aGl0ZTsgCiAgICBkaXNwbGF5OiBmbGV4OyAKICAgIHBvc2l0aW9uOiBmaXhlZDsgCiAgICB3aWR0aDogMTAwJTsgCiAgICBqdXN0aWZ5LWNvbnRlbnQ6IHNwYWNlLWJldHdlZW47CiAgICBib3gtc2hhZG93OiAwcHggMHB4IDEwcHggcmdiYSgwLDAsMCwwLjI1KTsKICAgIHotaW5kZXg6IDk7Cn0KLnRpdGxlIHtwYWRkaW5nOiAwLjVyZW0gMnJlbTsgY29sb3I6IGJsYWNrOyB0ZXh0LWRlY29yYXRpb246IG5vbmU7fQoudGl0bGUgc3BhbiB7Zm9udC13ZWlnaHQ6IGJvbGQ7IGRpc3BsYXk6IGJsb2NrO30KLmJvZHkge3BhZGRpbmc6IDZyZW0gMnJlbTsgZmxleC1ncm93OiAxOyBwYWRkaW5nLWJvdHRvbTogMTByZW07fQouaGFtYnVyZ2VyIHtwYWRkaW5nOiAwIDFyZW0gMC41cmVtOyBtYXJnaW46IDAuM3JlbSAxcmVtOyBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7IHRleHQtZGVjb3JhdGlvbjogbm9uZTsgY29sb3I6IGJsYWNrOyBmb250LXNpemU6IDIuMjVyZW07IGxpbmUtaGVpZ2h0OiAxLjI7IHRyYW5zZm9ybTogc2NhbGVYKDEuNSk7fQoKdGguc2VsZWN0ZWQ6OmFmdGVyIHtjb250ZW50OiAiIOKWviI7fQoKdGQsIHRoLCBkbCA+ICoge3BhZGRpbmc6IDAuMnJlbSAxLjVyZW0gMC4ycmVtIDAuNXJlbTsgdGV4dC1hbGlnbjogbGVmdDt9CnRkLCB0aCB7bWF4LXdpZHRoOiA0MHJlbTt9CnRhYmxlLmxpc3QgdGQsIHRhYmxlLmxpc3QgdGgge3RleHQtb3ZlcmZsb3c6IGVsbGlwc2lzOyB3aGl0ZS1zcGFjZTogbm93cmFwOyBvdmVyZmxvdzogaGlkZGVuOyBtYXgtd2lkdGg6IDI1cmVtO30KbGFiZWwge3BhZGRpbmc6IGNhbGMoMC4ycmVtICsgMXB4KSAxLjVyZW0gY2FsYygwLjJyZW0gKyAxcHgpIDA7IHRleHQtb3ZlcmZsb3c6IGVsbGlwc2lzOyB3aGl0ZS1zcGFjZTogbm93cmFwOyBvdmVyZmxvdzogaGlkZGVuO30KdGQ6bGFzdC1jaGlsZCBhIHtkaXNwbGF5OiBpbmxpbmUtYmxvY2s7IG1hcmdpbi1yaWdodDogMC41cmVtO30KLmxvZ28gaW1nIHtoZWlnaHQ6IDJyZW07IHZlcnRpY2FsLWFsaWduOiBtaWRkbGU7fQphIHtjb2xvcjogYmxhY2s7fQpsYWJlbCB7d2lkdGg6IDE1cmVtOyBtaW4td2lkdGg6IDE1cmVtOyBwYWRkaW5nLXJpZ2h0OiAycmVtO30KaDEge2ZvbnQtc2l6ZTogMi4ycmVtOyBtYXJnaW4tYm90dG9tOiAwLjVyZW07IG1hcmdpbi1yaWdodDogMXJlbTsgbGluZS1oZWlnaHQ6IDE7fQpoMiB7Zm9udC1zaXplOiAxLjVyZW07IG1hcmdpbi1ib3R0b206IDAuNXJlbTt9CnRhYmxlIHtib3JkZXItY29sbGFwc2U6IGNvbGxhcHNlOyBtYXJnaW4tdG9wOiAxLjVyZW07fQp0YWJsZSB0cjpudGgtY2hpbGQoZXZlbikge2JhY2tncm91bmQ6IHJnYmEoMCwwLDAsMC4wNSk7fQp0YWJsZSB0ciB0aCB7cGFkZGluZy10b3A6IDAuM3JlbTsgcGFkZGluZy1ib3R0b206IDAuM3JlbTsgZm9udC13ZWlnaHQ6IGJvbGQ7IGJvcmRlci1ib3R0b206IDFweCBzb2xpZCBibGFjazt9CnAsIHRhYmxlIHttYXJnaW4tYm90dG9tOiAxLjRyZW07fQoKLnRpdGxlYmFyIHtkaXNwbGF5OiBmbGV4OyBhbGlnbi1pdGVtczogY2VudGVyOyBtYXJnaW4tYm90dG9tOiAwLjVyZW07IGZsZXgtd3JhcDogd3JhcDt9Ci50aXRsZWJhciA+IGRpdiB7bWFyZ2luLWJvdHRvbTogMC41cmVtO30KCi5jb2xzIHtjb2x1bW4td2lkdGg6IDcwMHB4OyBtYXJnaW4tdG9wOiAtMmVtO30KLmNvbCB7CiAgICAtd2Via2l0LWNvbHVtbi1icmVhay1pbnNpZGU6IGF2b2lkOyAvKiBDaHJvbWUsIFNhZmFyaSAqLwogICAgcGFnZS1icmVhay1pbnNpZGU6IGF2b2lkOyAgICAgICAgICAgLyogVGhlb3JldGljYWxseSBGRiAyMCsgKi8KICAgIGJyZWFrLWluc2lkZTogYXZvaWQtY29sdW1uOyAgICAgICAgIC8qIElFIDExICovCiAgICBkaXNwbGF5OnRhYmxlOyAgICAgICAgICAgICAgICAgICAgICAvKiBBY3R1YWxseSBGRiAyMCsgKi8KfQoKaW5wdXQsIHRleHRhcmVhLCBzZWxlY3R7CiAgICBoZWlnaHQ6IGNhbGMoMnJlbSArIDJweCk7IAogICAgbGluZS1oZWlnaHQ6IDEuNHJlbTsgCiAgICB0ZXh0LWRlY29yYXRpb246IG5vbmU7IAogICAgYm9yZGVyOiAxcHggc29saWQgYmxhY2s7IAogICAgcGFkZGluZzogMCAwLjVyZW07IAogICAgYmFja2dyb3VuZDogdHJhbnNwYXJlbnQ7CiAgICBjb2xvcjogYmxhY2s7CiAgICBmb250LWZhbWlseTogaW5oZXJpdDsKICAgIGZvbnQtc2l6ZTogaW5oZXJpdDsKICAgIGZsZXgtZ3JvdzogMTsKICAgIGJhY2tncm91bmQ6IHdoaXRlOwp9CmJ1dHRvbiwgaW5wdXRbdHlwZT0ic3VibWl0Il0sIC5idG4gewogICAgaGVpZ2h0OiBjYWxjKDJyZW0gKyAycHgpOyAKICAgIGxpbmUtaGVpZ2h0OiAycmVtOyAKICAgIGJvcmRlcjogMXB4IHNvbGlkIHRyYW5zcGFyZW50OyAKICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsgCiAgICB0ZXh0LWRlY29yYXRpb246IG5vbmU7IAogICAgcGFkZGluZzogMCAxcmVtOyAKICAgIGJhY2tncm91bmQ6IHRyYW5zcGFyZW50OwogICAgY29sb3I6IGJsYWNrOwogICAgZm9udC1mYW1pbHk6IGluaGVyaXQ7CiAgICBmb250LXNpemU6IGluaGVyaXQ7CiAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjIyLCAyMjIsIDIyMik7CiAgICBjdXJzb3I6IHBvaW50ZXI7CiAgICBib3JkZXItcmFkaXVzOiAwLjE1cmVtOwp9CmJ1dHRvbjpmb2N1cywgaW5wdXRbdHlwZT0ic3VibWl0Il06Zm9jdXMsIC5idG46Zm9jdXMsIC5pY29uOmZvY3VzIHtib3JkZXItY29sb3I6IGJsYWNrO30Kc2VsZWN0OjotbXMtZXhwYW5kIHtkaXNwbGF5OiBub25lO30Kc2VsZWN0IHsKICAgIC13ZWJraXQtYXBwZWFyYW5jZTogbm9uZTsKICAgIC1tb3otYXBwZWFyYW5jZTogbm9uZTsKICAgIGFwcGVhcmFuY2U6IG5vbmU7CiAgICBiYWNrZ3JvdW5kOiB3aGl0ZSB1cmwoJy4uL2ltZy9kb3duLnN2ZycpIGNhbGMoMTAwJSAtIDAuNnJlbSkgNTAlIG5vLXJlcGVhdDsKICAgIGJhY2tncm91bmQtc2l6ZTogYXV0byAwLjVyZW07CiAgICBwYWRkaW5nLXJpZ2h0OiAxLjc1cmVtOwogICAgbWF4LXdpZHRoOiBjYWxjKDEwMCUgLSAxNXJlbSk7Cn0KaW5wdXRbdHlwZT0icmFkaW8iXSwgaW5wdXRbdHlwZT0iY2hlY2tib3giXSwgaW5wdXRbdHlwZT0iZmlsZSJdIHtib3JkZXI6IDA7IGhlaWdodDogYXV0bzsgbGluZS1oZWlnaHQ6IGF1dG87IG1hcmdpbi1yaWdodDogMC40cmVtOyB2ZXJ0aWNhbC1hbGlnbjogbWlkZGxlOyBwb3NpdGlvbjogcmVsYXRpdmU7IGJvdHRvbTogMC4xcmVtO30KaW5wdXRbdHlwZT0iZmlsZSJdIHtwYWRkaW5nOiAwOyBtYXJnaW46IDA7IGJvdHRvbTogMDt9CmlucHV0W3R5cGU9J251bWJlciddIHstbW96LWFwcGVhcmFuY2U6IHRleHRmaWVsZDt9CmlucHV0Ojotd2Via2l0LW91dGVyLXNwaW4tYnV0dG9uLCBpbnB1dDo6LXdlYmtpdC1pbm5lci1zcGluLWJ1dHRvbiB7LXdlYmtpdC1hcHBlYXJhbmNlOiBub25lO30KaW5wdXRbdHlwZT0ibnVtYmVyIl0gey1tb3otYXBwZWFyYW5jZTogdGV4dGZpZWxkO30KaW5wdXQ6Oi13ZWJraXQtb3V0ZXItc3Bpbi1idXR0b24sIAppbnB1dDo6LXdlYmtpdC1pbm5lci1zcGluLWJ1dHRvbiB7LXdlYmtpdC1hcHBlYXJhbmNlOiBub25lO30KdGV4dGFyZWEge21pbi1oZWlnaHQ6IDEwcmVtOyBwYWRkaW5nOiAwLjM1cmVtIDAuNXJlbTsgfQoKLmljb24gewogICAgZGlzcGxheTogaW5saW5lLWJsb2NrOyAKICAgIHRleHQtZGVjb3JhdGlvbjogbm9uZTsgCiAgICB3aWR0aDogMDsgCiAgICBoZWlnaHQ6IDA7IAogICAgb3ZlcmZsb3c6IGhpZGRlbjsgCiAgICBwYWRkaW5nLXRvcDogMnJlbTsgCiAgICBwYWRkaW5nLWxlZnQ6IDJyZW07IAogICAgcG9zaXRpb246IHJlbGF0aXZlOwogICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDIyMiwgMjIyLCAyMjIpOwogICAgY3Vyc29yOiBwb2ludGVyOwogICAgYm9yZGVyLXJhZGl1czogMC4xNXJlbTsKICAgIGJvcmRlcjogMXB4IHNvbGlkIHRyYW5zcGFyZW50OwogICAgdmVydGljYWwtYWxpZ246IGJvdHRvbTsKfQouaWNvbjo6YmVmb3JlIHtjb250ZW50OiAnJzsgcG9zaXRpb246IGFic29sdXRlOyB3aWR0aDogMnJlbTsgaGVpZ2h0OiAycmVtOyBsZWZ0OiAwOyB0b3A6IDA7fQouaWNvbi5maWx0ZXI6OmJlZm9yZSB7CiAgICBiYWNrZ3JvdW5kOiB1cmwoJy4uL2ltZy9maWx0ZXIuc3ZnJykgY2VudGVyIGNlbnRlciAvIGF1dG8gNDUlIG5vLXJlcGVhdDt9Ci5pY29uLnNlYXJjaDo6YmVmb3JlIHsKICAgIGJhY2tncm91bmQ6IHVybCgnLi4vaW1nL3NlYXJjaC5zdmcnKSBjZW50ZXIgY2VudGVyIC8gYXV0byA1NyUgbm8tcmVwZWF0O30KLmljb24ucHJldjo6YmVmb3JlIHsKICAgIGJhY2tncm91bmQ6IHVybCgnLi4vaW1nL3ByZXYuc3ZnJykgY2VudGVyIDQ4JSAvIGF1dG8gNDAlIG5vLXJlcGVhdDt9Ci5pY29uLm5leHQ6OmJlZm9yZSB7CiAgICBiYWNrZ3JvdW5kOiB1cmwoJy4uL2ltZy9uZXh0LnN2ZycpIGNlbnRlciA0OCUgLyBhdXRvIDQwJSBuby1yZXBlYXQ7fQpmb3JtIHttYXJnaW4tdG9wOiAxLjVyZW07fQpmb3JtLCBkbCB7d2lkdGg6IDEwMCU7IG1heC13aWR0aDogNDByZW07fQpmb3JtID4gZGl2IHtkaXNwbGF5OiBmbGV4OyBtYXJnaW4tYm90dG9tOiAwLjI1cmVtO30KZm9ybSA+IGRpdiA+ICo6bnRoLWNoaWxkKDIpIHtmbGV4LWdyb3c6IDE7fQpmb3JtID4gZGl2ID4gKjpudGgtY2hpbGQoMykge21hcmdpbi1sZWZ0OiAwLjI1cmVtO30KZm9ybSA+IGJ1dHRvbiB7bWFyZ2luLXRvcDogMS41cmVtO30KCmRsIHtkaXNwbGF5OiBmbGV4OyBtYXJnaW4tYm90dG9tOiAxLjRyZW07fQpkdCB7d2lkdGg6IDExcmVtOyBtaW4td2lkdGg6IDExcmVtOyBwYWRkaW5nLXJpZ2h0OiAycmVtO30KZGQge2ZsZXgtZ3JvdzogMTt9CmRsICsgZGwge21hcmdpbi10b3A6IC0xLjRyZW07fQpkbCArIGRsIGR0IHtib3JkZXItdG9wOiAxcHggc29saWQgdHJhbnNwYXJlbnQ7fQpkbCArIGRsIGRkIHtib3JkZXItdG9wOiAxcHggc29saWQgc2lsdmVyO30KCnVsLmJyZWFkY3J1bWIge21hcmdpbi1ib3R0b206IDAuM3JlbTsgZm9udC1zaXplOiAwLjlyZW07IG9wYWNpdHk6IDAuNDU7fQp1bC5icmVhZGNydW1iIGxpIHtkaXNwbGF5OiBpbmxpbmU7IGxpc3Qtc3R5bGU6IG5vbmU7fQp1bC5icmVhZGNydW1iIGxpICsgbGk6OmJlZm9yZSB7Y29udGVudDogIi8gIjt9CnVsLmJyZWFkY3J1bWIgbGkgYSB7dGV4dC1kZWNvcmF0aW9uOiBub25lO30KCnVsLnJlbGF0ZWQgbGksIHVsLmhvbWUgbGkge2xpc3Qtc3R5bGU6IG5vbmU7fQoKCi5maWx0ZXJiYXIge3BhZGRpbmc6IDAuNXJlbSAwLjdyZW07IGJhY2tncm91bmQ6IHJnYmEoMCwwLDAsMC4wNSk7IGRpc3BsYXk6IGZsZXg7IGp1c3RpZnktY29udGVudDogc3BhY2UtYmV0d2VlbjsgYWxpZ24taXRlbXM6IGNlbnRlcjsgbWFyZ2luLWJvdHRvbTogMC41cmVtO30KCi5jbG9zZTo6YmVmb3Jle2NvbnRlbnQ6ICIrIjsgdGV4dC1kZWNvcmF0aW9uOiBub25lOyB0cmFuc2Zvcm06IHJvdGF0ZSg0NWRlZyk7IGRpc3BsYXk6IGlubGluZS1ibG9jazt9CgouYWRkRmlsdGVyIHttYXJnaW4tYm90dG9tOiAwLjVyZW07IGRpc3BsYXk6IG5vbmU7fQouYWRkRmlsdGVyLnZpc2libGUge2Rpc3BsYXk6IGJsb2NrO30KLmFkZFNlYXJjaCB7bWFyZ2luLWJvdHRvbTogMC41cmVtOyBkaXNwbGF5OiBub25lO30KLmFkZFNlYXJjaC52aXNpYmxlIHtkaXNwbGF5OiBibG9jazt9Ci5mb290ZXJhY3Rpb25zIHttYXJnaW4tdG9wOiAxLjVyZW07fQoKLnBhZ2luYXRpb24ge2Rpc3BsYXk6IGZsZXg7IGFsaWduLWl0ZW1zOiBjZW50ZXI7IGZvbnQtc2l6ZTogMC45cmVtO30KLnBhZ2luYXRpb24gLmljb24ge21hcmdpbi1yaWdodDogMC4yNXJlbTt9Ci5kaXNhYmxlZCB7b3BhY2l0eTogMC40OyBjdXJzb3I6IGRlZmF1bHQ7fQoucGFnaW5hdGlvbiAuaWNvbjpsYXN0LWNoaWxkIHttYXJnaW4tcmlnaHQ6IDA7IG1hcmdpbi1sZWZ0OiAwLjI1cmVtO30KLmhpZGRlbiB7ZGlzcGxheTogbm9uZTt9CgpAbWVkaWEgb25seSBzY3JlZW4gYW5kIChtaW4td2lkdGg6IDE1MDBweCkgewogICAgLmNvbnRlbnQge2Rpc3BsYXk6IGJsb2NrO30KICAgIC50aXRsZSB7cG9zaXRpb246IGFic29sdXRlOyBib3R0b206IDEuNXJlbTt9CiAgICAubmF2aWdhdGlvbiB7ZGlzcGxheTogYmxvY2s7IHdpZHRoOiAxNXJlbTsgaGVpZ2h0OiAxMDB2aDt9CiAgICAuYm9keSB7cGFkZGluZy10b3A6IDNyZW07IG1hcmdpbi1sZWZ0OiAxNXJlbTsgcGFkZGluZy1sZWZ0OiA1cmVtO30KICAgIC5oYW1idXJnZXIge2ZvbnQtc2l6ZTogMi41cmVtOyBsaW5lLWhlaWdodDogMS4yOyBtYXJnaW4tbGVmdDogMS4zcmVtOyBtYXJnaW4tdG9wOiAxcmVtO30KfQoKLm1vYmlsZS1vbmx5IHtkaXNwbGF5OiBub25lO30KQG1lZGlhIG9ubHkgc2NyZWVuIGFuZCAobWF4LXdpZHRoOiA2MDBweCkgewoKICAgIHVsLnJlbGF0ZWQgbGkgYSwgdWwuaG9tZSBsaSBhICB7ZGlzcGxheTogaW5saW5lLWJsb2NrOyBwYWRkaW5nOiAwLjJyZW0gMDt9CgogICAgdGFibGUucmVhZCB0aGVhZCB7ZGlzcGxheTogbm9uZTt9CiAgICB0YWJsZS5yZWFkIHRyIHtkaXNwbGF5OiBibG9jazsgcGFkZGluZzogMC43cmVtIDAuNXJlbTt9CiAgICB0YWJsZS5yZWFkIHRyIHRkIHtkaXNwbGF5OiBibG9jazsgcGFkZGluZzogMDt9CiAgICB0YWJsZS5yZWFkIHRkOm50aC1jaGlsZChvZGQpIHtmb250LXdlaWdodDogYm9sZDt9CiAgICAKICAgIC5tb2JpbGUtb25seSB7ZGlzcGxheTogaW5pdGlhbDt9CiAgICAKICAgIGZvcm0gPiBkaXYge2ZsZXgtZGlyZWN0aW9uOiBjb2x1bW47fQogICAgc2VsZWN0IHttYXgtd2lkdGg6IDEwMCU7fQoKfQo= END_OF_STATIC_FILE; } From a67d8f2caec521c48d9f35dba63b8933b072231f Mon Sep 17 00:00:00 2001 From: Maurits van der Schee Date: Thu, 2 Jul 2020 14:51:32 +0200 Subject: [PATCH 02/17] bugfix --- templates/record/list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/record/list.html b/templates/record/list.html index a0264ce..1adb7f4 100644 --- a/templates/record/list.html +++ b/templates/record/list.html @@ -31,7 +31,7 @@

    {{table|humanize}}

      {{for:column:columns}} - + {{endfor}}   -    
    @@ -58,8 +58,8 @@

    {{table|humanize}}

    Action {{endif}} {{for:column:columns}} - {{if:column.text|neq(primaryKey)}} - {{column.text|humanize}} + {{if:column|neq(primaryKey)}} + {{column|humanize}} {{endif}} {{endfor}} diff --git a/templates/record/read.html b/templates/record/read.html index 432379f..d3341c1 100644 --- a/templates/record/read.html +++ b/templates/record/read.html @@ -19,13 +19,8 @@

    {{name|or("View item")}}

    {{name|humanize}} -<<<<<<< HEAD {{if:field.table|and(field.text)}} - {{field.text}} -======= - {{if:field.table}} {{field.text}} ->>>>>>> e05e30d176d5c9d9c8ad0e5a3129907a68235423 {{else}} {{if:field.type.format|eq("large-string")}}
    {{field.text}}
    @@ -50,7 +45,10 @@

    {{name|or("View item")}}

    Related

      {{for:relation:referenced}} -
    • {{relation.0|humanize}} +
    • + + {{relation.0|humanize}} +
      • {{endfor}} {{endif}} From 75109fa534e7ce6b0f83f6cdb0251754f0c29ddd Mon Sep 17 00:00:00 2001 From: Maurits van der Schee Date: Mon, 6 Jul 2020 12:36:11 +0200 Subject: [PATCH 04/17] remove pk --- templates/record/list.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/record/list.html b/templates/record/list.html index 3e41be4..015394c 100644 --- a/templates/record/list.html +++ b/templates/record/list.html @@ -36,7 +36,9 @@

      {{table|humanize}}

          From a5e2be09b0cef6af9d3377c8457baae2a16d227b Mon Sep 17 00:00:00 2001 From: Maurits van der Schee Date: Mon, 6 Jul 2020 12:49:54 +0200 Subject: [PATCH 05/17] remove pk --- src/Tqdev/PhpCrudUi/Record/RecordService.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/Tqdev/PhpCrudUi/Record/RecordService.php b/src/Tqdev/PhpCrudUi/Record/RecordService.php index 0d00c97..878fd79 100644 --- a/src/Tqdev/PhpCrudUi/Record/RecordService.php +++ b/src/Tqdev/PhpCrudUi/Record/RecordService.php @@ -213,7 +213,7 @@ public function delete(string $table, string $action, string $id): TemplateDocum return new TemplateDocument('layouts/default', 'record/deleted', $variables); } - private function getArguments(array $types, array $filters): array + private function getArguments(string $primaryKey, array $types, array $filters): array { $args = array(); $i = 0; @@ -221,11 +221,9 @@ private function getArguments(array $types, array $filters): array if ($filter['type'] == 'search') { $j = 0; foreach ($types as $column => $type) { - switch ($type['type']) { - case 'string': - $args["filter${j}[0]"] = implode(',', array($column, $filter['operator'], $filter['value'])); - $j++; - break; + if ($column != $primaryKey) { + $args["filter${j}[0]"] = implode(',', array($column, $filter['operator'], $filter['value'])); + $j++; } } } elseif ($filter['type'] == 'value') { @@ -289,7 +287,7 @@ public function _list(string $table, string $action, array $params): TemplateDoc list($pageNumber, $pageSize) = explode(',', $pageParams, 2); $filters = $this->getFilters($references, $params); - $args = $this->getArguments($types, $filters); + $args = $this->getArguments($primaryKey, $types, $filters); $args['join'] = array_values(array_filter($references)); $args['page'] = "$pageNumber,$pageSize"; @@ -356,7 +354,7 @@ public function search(string $table, array $body, array $params) $otherTable = $references[$body['field']]; $otherKey = $this->definition->getPrimaryKey($otherTable, $action); $otherTypes = $this->definition->getTypes($otherTable, $action); - $args = $this->getArguments($otherTypes, [['type' => 'search', 'field' => '*any*', 'operator' => 'cs', 'value' => $body['value']]]); + $args = $this->getArguments($otherKey, $otherTypes, [['type' => 'search', 'field' => '*any*', 'operator' => 'cs', 'value' => $body['value']]]); $args['include'] = $otherKey; $records = $this->api->listRecords($otherTable, $args); $values = array_map(function ($a) use ($otherKey) {return $a[$otherKey];}, $records['records']); From a55f641ed848aa8f74f29ba4cefd40d146c6afe1 Mon Sep 17 00:00:00 2001 From: Maurits van der Schee Date: Mon, 6 Jul 2020 16:05:51 +0200 Subject: [PATCH 06/17] remove pk --- src/Tqdev/PhpCrudUi/Record/RecordService.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Tqdev/PhpCrudUi/Record/RecordService.php b/src/Tqdev/PhpCrudUi/Record/RecordService.php index 878fd79..7b3f6b7 100644 --- a/src/Tqdev/PhpCrudUi/Record/RecordService.php +++ b/src/Tqdev/PhpCrudUi/Record/RecordService.php @@ -213,15 +213,15 @@ public function delete(string $table, string $action, string $id): TemplateDocum return new TemplateDocument('layouts/default', 'record/deleted', $variables); } - private function getArguments(string $primaryKey, array $types, array $filters): array + private function getArguments(string $primaryKey, array $references, array $filters): array { $args = array(); $i = 0; foreach ($filters as $filter) { if ($filter['type'] == 'search') { $j = 0; - foreach ($types as $column => $type) { - if ($column != $primaryKey) { + foreach ($references as $column => $reference) { + if (!$reference && $column != $primaryKey) { $args["filter${j}[0]"] = implode(',', array($column, $filter['operator'], $filter['value'])); $j++; } @@ -287,7 +287,7 @@ public function _list(string $table, string $action, array $params): TemplateDoc list($pageNumber, $pageSize) = explode(',', $pageParams, 2); $filters = $this->getFilters($references, $params); - $args = $this->getArguments($primaryKey, $types, $filters); + $args = $this->getArguments($primaryKey, $references, $filters); $args['join'] = array_values(array_filter($references)); $args['page'] = "$pageNumber,$pageSize"; @@ -353,8 +353,8 @@ public function search(string $table, array $body, array $params) if (isset($references[$body['field']]) && $references[$body['field']]) { $otherTable = $references[$body['field']]; $otherKey = $this->definition->getPrimaryKey($otherTable, $action); - $otherTypes = $this->definition->getTypes($otherTable, $action); - $args = $this->getArguments($otherKey, $otherTypes, [['type' => 'search', 'field' => '*any*', 'operator' => 'cs', 'value' => $body['value']]]); + $otherReferences = $this->definition->getReferences($otherTable, $action); + $args = $this->getArguments($otherKey, $otherReferences, [['type' => 'search', 'field' => '*any*', 'operator' => 'cs', 'value' => $body['value']]]); $args['include'] = $otherKey; $records = $this->api->listRecords($otherTable, $args); $values = array_map(function ($a) use ($otherKey) {return $a[$otherKey];}, $records['records']); From 5e7858066c5a9f75e153e32b662a7a84c7418d4e Mon Sep 17 00:00:00 2001 From: Maurits van der Schee Date: Wed, 8 Jul 2020 04:52:21 +0200 Subject: [PATCH 07/17] remove pk --- .../PhpCrudUi/Controller/MultiResponder.php | 3 + .../PhpCrudUi/Controller/RecordController.php | 13 +++ src/Tqdev/PhpCrudUi/Record/RecordService.php | 65 +++++++++++--- templates/record/list.html | 60 ++++++++++--- webroot/js/list.js | 88 ++++++++++++++++++- 5 files changed, 205 insertions(+), 24 deletions(-) diff --git a/src/Tqdev/PhpCrudUi/Controller/MultiResponder.php b/src/Tqdev/PhpCrudUi/Controller/MultiResponder.php index 71ea810..5ed398e 100644 --- a/src/Tqdev/PhpCrudUi/Controller/MultiResponder.php +++ b/src/Tqdev/PhpCrudUi/Controller/MultiResponder.php @@ -8,6 +8,7 @@ use Tqdev\PhpCrudApi\Record\ErrorCode; use Tqdev\PhpCrudApi\ResponseFactory; use Tqdev\PhpCrudUi\Document\CsvDocument; +use Tqdev\PhpCrudUi\Document\JsonDocument; use Tqdev\PhpCrudUi\Document\RedirectDocument; use Tqdev\PhpCrudUi\Document\TemplateDocument; @@ -42,6 +43,8 @@ public function success($result): ResponseInterface { if ($result instanceof CsvDocument) { return ResponseFactory::fromCsv(ResponseFactory::OK, (string) $result); + } elseif ($result instanceof JsonDocument) { + return ResponseFactory::fromObject(ResponseFactory::OK, json_decode((string) $result)); } elseif ($result instanceof TemplateDocument) { $result->addVariables($this->variables); $result->setTemplatePath($this->templatePath); diff --git a/src/Tqdev/PhpCrudUi/Controller/RecordController.php b/src/Tqdev/PhpCrudUi/Controller/RecordController.php index 8371785..17c6f93 100644 --- a/src/Tqdev/PhpCrudUi/Controller/RecordController.php +++ b/src/Tqdev/PhpCrudUi/Controller/RecordController.php @@ -26,6 +26,7 @@ public function __construct(Router $router, Responder $responder, RecordService $router->register('GET', '/*/delete/*', array($this, 'deleteForm')); $router->register('POST', '/*/delete/*', array($this, 'delete')); $router->register('GET', '/*/list', array($this, '_list')); + $router->register('GET', '/*/values/*', array($this, 'values')); $router->register('POST', '/*/list', array($this, 'search')); $router->register('GET', '/*/export', array($this, 'export')); $this->service = $service; @@ -141,6 +142,18 @@ public function _list(ServerRequestInterface $request): ResponseInterface return $this->responder->success($result); } + public function values(ServerRequestInterface $request): ResponseInterface + { + $table = RequestUtils::getPathSegment($request, 1); + $column = RequestUtils::getPathSegment($request, 3); + $params = RequestUtils::getParams($request); + if (!$this->service->hasTable($table, 'list')) { + return $this->responder->error(ErrorCode::TABLE_NOT_FOUND, $table); + } + $result = $this->service->values($table, 'list', $column, $params); + return $this->responder->success($result); + } + public function search(ServerRequestInterface $request): ResponseInterface { $table = RequestUtils::getPathSegment($request, 1); diff --git a/src/Tqdev/PhpCrudUi/Record/RecordService.php b/src/Tqdev/PhpCrudUi/Record/RecordService.php index 7b3f6b7..04e51fb 100644 --- a/src/Tqdev/PhpCrudUi/Record/RecordService.php +++ b/src/Tqdev/PhpCrudUi/Record/RecordService.php @@ -5,6 +5,7 @@ use Tqdev\PhpCrudUi\Client\CrudApi; use Tqdev\PhpCrudUi\Column\SpecificationService; use Tqdev\PhpCrudUi\Document\CsvDocument; +use Tqdev\PhpCrudUi\Document\JsonDocument; use Tqdev\PhpCrudUi\Document\RedirectDocument; use Tqdev\PhpCrudUi\Document\TemplateDocument; @@ -230,7 +231,7 @@ private function getArguments(string $primaryKey, array $references, array $filt $args["filter[$i]"] = implode(',', array($filter['field'], $filter['operator'], $filter['value'])); $i++; } elseif ($filter['type'] == 'reference') { - $args["filter[$i]"] = implode(',', array($filter['field'], $filter['operator'], implode('|', explode(',', $filter['value'])))); + $args["filter[$i]"] = implode(',', array($filter['field'], $filter['operator'], $filter['value'])); $i++; } } @@ -275,6 +276,37 @@ private function getParams(array $references, array $filters): array return $params; } + public function values(string $table, string $action, string $column, array $params): JsonDocument + { + $references = $this->definition->getReferences($table, $action); + $primaryKey = $this->definition->getPrimaryKey($table, $action); + + $pageParams = isset($params['page']) ? $params['page'][0] : '1,50'; + list($pageNumber, $pageSize) = explode(',', $pageParams, 2); + + $filters = $this->getFilters($references, $params); + $args = $this->getArguments($primaryKey, $references, $filters); + + $args['join'] = array_values(array_filter($references)); + $args['page'] = "$pageNumber,$pageSize"; + + $result = []; + + if ($references[$column]) { + $otherTable = $references[$column]; + $data = $this->api->listRecords($otherTable, $args); + foreach ($data['records'] as $record) { + $id = $this->definition->referenceId($otherTable, $record); + $text = $this->definition->referenceText($otherTable, $record); + $result[$id] = $text; + } + } + + asort($result); + + return new JsonDocument(['records' => $result]); + } + public function _list(string $table, string $action, array $params): TemplateDocument { $types = $this->definition->getTypes($table, $action); @@ -322,6 +354,8 @@ public function _list(string $table, string $action, array $params): TemplateDoc 'table' => $table, 'action' => $action, 'filters' => $filters, + 'types' => $types, + 'references' => $references, 'primaryKey' => $primaryKey, 'columns' => $columns, 'records' => $data['records'], @@ -348,19 +382,30 @@ public function search(string $table, array $body, array $params) } $filters = array_values($filters); $filters[] = ['type' => 'search', 'field' => '*any*', 'operator' => 'cs', 'value' => $body['search']]; + + // loop over columns and search in referenced fields in text + + /*if (isset($body['value'])) { + if (isset($references[$body['field']]) && $references[$body['field']]) { + $otherTable = $references[$body['field']]; + $otherKey = $this->definition->getPrimaryKey($otherTable, $action); + $otherReferences = $this->definition->getReferences($otherTable, $action); + $args = $this->getArguments($otherKey, $otherReferences, [['type' => 'search', 'field' => '*any*', 'operator' => 'cs', 'value' => $body['value']]]); + $args['include'] = $otherKey; + $records = $this->api->listRecords($otherTable, $args); + $values = array_map(function ($a) use ($otherKey) {return $a[$otherKey];}, $records['records']); + $filters[] = ['type' => 'reference', 'field' => $body['field'], 'operator' => 'in', 'value' => implode(',', $values), 'text' => $body['value']]; + } else { + $filters[] = ['type' => 'value', 'field' => $body['field'], 'operator' => 'cs', 'value' => $body['value']]; + } + }*/ } + if (isset($body['value'])) { if (isset($references[$body['field']]) && $references[$body['field']]) { - $otherTable = $references[$body['field']]; - $otherKey = $this->definition->getPrimaryKey($otherTable, $action); - $otherReferences = $this->definition->getReferences($otherTable, $action); - $args = $this->getArguments($otherKey, $otherReferences, [['type' => 'search', 'field' => '*any*', 'operator' => 'cs', 'value' => $body['value']]]); - $args['include'] = $otherKey; - $records = $this->api->listRecords($otherTable, $args); - $values = array_map(function ($a) use ($otherKey) {return $a[$otherKey];}, $records['records']); - $filters[] = ['type' => 'reference', 'field' => $body['field'], 'operator' => 'in', 'value' => implode(',', $values), 'text' => $body['value']]; + $filters[] = ['type' => 'reference', 'field' => $body['field'], 'operator' => 'in', 'value' => $body['value'], 'text' => $body['text']]; } else { - $filters[] = ['type' => 'value', 'field' => $body['field'], 'operator' => 'cs', 'value' => $body['value']]; + $filters[] = ['type' => 'value', 'field' => $body['field'], 'operator' => $body['operator'], 'value' => $body['value']]; } } $params = $this->getParams($references, $filters); diff --git a/templates/record/list.html b/templates/record/list.html index 015394c..e3203eb 100644 --- a/templates/record/list.html +++ b/templates/record/list.html @@ -19,36 +19,72 @@

      {{table|humanize}}

      {{for:filter:i:filters}} +{{if:filter.type|eq("search")}} +
      + + +
      +{{elseif:filter.type|eq("value")}} +
      + + +
      +{{elseif:filter.type|eq("reference")}}
      - {{if:filter.type|eq("search")}} -
      Search '{{filter.value}}'
      - {{elseif:filter.operator|eq("eq")}} -
      {{filter.field|humanize}} = '{{filter.text}}'
      - {{else}} -
      {{filter.field|humanize}} ~ '{{filter.text}}'
      - {{endif}} +
      +{{endif}} {{endfor}}
      - {{for:column:columns}} {{if:column|neq(primaryKey)}} - + {{endif}} {{endfor}} -   -   + + + + +
      -   +
      diff --git a/webroot/js/list.js b/webroot/js/list.js index 9f0bb85..f2db160 100644 --- a/webroot/js/list.js +++ b/webroot/js/list.js @@ -1,3 +1,62 @@ +function ajaxGet(url, callback) { + var xmlhttp = new XMLHttpRequest(); + xmlhttp.onreadystatechange = function () { + if (xmlhttp.readyState == 4 && xmlhttp.status == 200) { + console.log('responseText:' + xmlhttp.responseText); + try { + var data = JSON.parse(xmlhttp.responseText); + } catch (err) { + console.log(err.message + " in " + xmlhttp.responseText); + return; + } + callback(data); + } + }; + + xmlhttp.open("GET", url, true); + xmlhttp.send(); +} +function updateAddFilter() { + const field = document.querySelector('.addFilter [name="field"]'); + const operator = document.querySelector('.addFilter [name="operator"]'); + const value = document.querySelector('.addFilter [name="value"]'); + const values = document.querySelector('.addFilter [name="values"]'); + if (field.options[field.selectedIndex].dataset.references) { + operator.style.display = 'none'; + value.type = 'hidden'; + values.style.display = 'inline'; + ajaxGet('values/' + field.value, function (data) { + values.innerHTML = ''; + Object.keys(data).forEach(function (item) { + var option = document.createElement('option'); + option.value = item; + option.innerHTML = data[item]; + values.appendChild(option); + }); + }); + } else { + operator.style.display = 'inline'; + value.type = 'text'; + values.style.display = 'none'; + } +} +function updateTextAndValue() { + const text = document.querySelector('.addFilter [name="text"]'); + const value = document.querySelector('.addFilter [name="value"]'); + const values = document.querySelector('.addFilter [name="values"]'); + textArray = []; + valueArray = []; + for (var i = 0; i < values.options.length; i++) { + const item = values.options[i]; + if (item.selected) { + textArray.push(item.text); + valueArray.push(item.value); + } + } + text.value = textArray.join(', '); + value.value = valueArray.join(','); +} + function closeFilter(index) { const elements = document.querySelectorAll('.filterbar'); for (var i = 0; i < elements.length; i++) { @@ -7,6 +66,31 @@ function closeFilter(index) { } return reloadQuery(); } +function editFilter(index) { + const elements = document.querySelectorAll('.filterbar'); + var type = ''; + for (var i = 0; i < elements.length; i++) { + if (elements[i].dataset.index == index) { + var filter = elements[i].dataset.filter; + type = filter.substr(0, filter.indexOf(",")); + elements[i].parentNode.removeChild(elements[i]); + } + } + if (type == "search") { + // hide all + // show search + // fill form + } else if (type == "value") { + // hide all + // show filter + // fill form + } else if (type == "reference") { + // hide all + // show filter + // fill form + } + return false; +} function navigatePage(page) { const element = document.querySelector('.pagination'); if (element) { @@ -58,5 +142,5 @@ function reloadQuery() { document.location.href = '?' + params.join('&'); return false; } -window.addEventListener('load', function () { hideColumns(); }) -window.addEventListener('resize', function () { resizeWindow(); }) +window.addEventListener('load', function () { hideColumns(); updateAddFilter(); }); +window.addEventListener('resize', function () { resizeWindow(); }); From 0a1983e375a198fca9d1d224a2ec12c7be252d18 Mon Sep 17 00:00:00 2001 From: Maurits van der Schee Date: Wed, 8 Jul 2020 04:52:40 +0200 Subject: [PATCH 08/17] remove pk --- src/Tqdev/PhpCrudUi/Document/JsonDocument.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/Tqdev/PhpCrudUi/Document/JsonDocument.php diff --git a/src/Tqdev/PhpCrudUi/Document/JsonDocument.php b/src/Tqdev/PhpCrudUi/Document/JsonDocument.php new file mode 100644 index 0000000..2dbaa11 --- /dev/null +++ b/src/Tqdev/PhpCrudUi/Document/JsonDocument.php @@ -0,0 +1,18 @@ +variables = $variables; + } + + public function __toString(): string + { + return json_encode($this->variables['records']); + } +} From caf02a908d5e8282847afa73db95dd2a4cebed57 Mon Sep 17 00:00:00 2001 From: Maurits van der Schee Date: Wed, 8 Jul 2020 13:49:56 +0200 Subject: [PATCH 09/17] sort --- webroot/js/list.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/webroot/js/list.js b/webroot/js/list.js index f2db160..71356ec 100644 --- a/webroot/js/list.js +++ b/webroot/js/list.js @@ -16,6 +16,18 @@ function ajaxGet(url, callback) { xmlhttp.open("GET", url, true); xmlhttp.send(); } +function sortSelectOptions(lb) { + arr = new Array(); + for(i = 0; i < lb.length; i++) { + arr[i] = lb.options[i]; + } + arr.sort(function(a,b) { + return (a.text > b.text)? 1 : ((a.text < b.text)? -1 : 0); + }); + for(i = 0; i < lb.length; i++) { + lb.options[i] = arr[i]; + } +} function updateAddFilter() { const field = document.querySelector('.addFilter [name="field"]'); const operator = document.querySelector('.addFilter [name="operator"]'); @@ -33,6 +45,7 @@ function updateAddFilter() { option.innerHTML = data[item]; values.appendChild(option); }); + sortSelectOptions(values); }); } else { operator.style.display = 'inline'; From 0fb9bbcd5f5d959df1fddfe83ef8ba80d56c83a6 Mon Sep 17 00:00:00 2001 From: Maurits van der Schee Date: Wed, 8 Jul 2020 13:53:09 +0200 Subject: [PATCH 10/17] sort --- templates/record/read.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/record/read.html b/templates/record/read.html index d3341c1..7ff85c1 100644 --- a/templates/record/read.html +++ b/templates/record/read.html @@ -46,7 +46,7 @@

      Related

        {{for:relation:referenced}}
      • - + {{relation.0|humanize}}
        • From 7e077ec155daa0183c79e81842d085d8c0c67fa2 Mon Sep 17 00:00:00 2001 From: Maurits van der Schee Date: Wed, 8 Jul 2020 14:55:51 +0200 Subject: [PATCH 11/17] sort --- src/Tqdev/PhpCrudUi/Record/RecordService.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Tqdev/PhpCrudUi/Record/RecordService.php b/src/Tqdev/PhpCrudUi/Record/RecordService.php index 04e51fb..d81d8a8 100644 --- a/src/Tqdev/PhpCrudUi/Record/RecordService.php +++ b/src/Tqdev/PhpCrudUi/Record/RecordService.php @@ -302,8 +302,6 @@ public function values(string $table, string $action, string $column, array $par } } - asort($result); - return new JsonDocument(['records' => $result]); } From 472a8853af572ebaaecea16514ba6956baf6ea22 Mon Sep 17 00:00:00 2001 From: Maurits van der Schee Date: Wed, 8 Jul 2020 15:17:52 +0200 Subject: [PATCH 12/17] horizontal scroll --- webroot/js/list.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/webroot/js/list.js b/webroot/js/list.js index 71356ec..614fab9 100644 --- a/webroot/js/list.js +++ b/webroot/js/list.js @@ -16,15 +16,15 @@ function ajaxGet(url, callback) { xmlhttp.open("GET", url, true); xmlhttp.send(); } -function sortSelectOptions(lb) { - arr = new Array(); - for(i = 0; i < lb.length; i++) { - arr[i] = lb.options[i]; - } - arr.sort(function(a,b) { - return (a.text > b.text)? 1 : ((a.text < b.text)? -1 : 0); +function sortSelectOptions(lb) { + arr = new Array(); + for (i = 0; i < lb.length; i++) { + arr[i] = lb.options[i]; + } + arr.sort(function (a, b) { + return (a.text > b.text) ? 1 : ((a.text < b.text) ? -1 : 0); }); - for(i = 0; i < lb.length; i++) { + for (i = 0; i < lb.length; i++) { lb.options[i] = arr[i]; } } @@ -125,6 +125,9 @@ function hideColumns() { for (var i = 0; i < all.length; i++) { all[i].classList.remove('hidden'); } + if (window.innerWidth >= 1500) { + return; + } const elements = document.querySelectorAll('th'); var max = elements.length; for (var i = 0; i < elements.length; i++) { From 0ec8365502e416115ea92464187cfe3864d95183 Mon Sep 17 00:00:00 2001 From: Maurits van der Schee Date: Wed, 8 Jul 2020 17:04:23 +0200 Subject: [PATCH 13/17] update deps --- composer.lock | 10 +- ui.php | 291 ++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 252 insertions(+), 49 deletions(-) diff --git a/composer.lock b/composer.lock index dc18b04..b06bf1a 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "mevdschee/php-crud-api", - "version": "v2.9.11", + "version": "v2.9.14", "source": { "type": "git", "url": "https://github.com/mevdschee/php-crud-api.git", - "reference": "81a20f134ebe2507bd0cf0e5c936b4802ee20578" + "reference": "ca23131784ef3fd39c9ae96576d19d34074d8520" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mevdschee/php-crud-api/zipball/81a20f134ebe2507bd0cf0e5c936b4802ee20578", - "reference": "81a20f134ebe2507bd0cf0e5c936b4802ee20578", + "url": "https://api.github.com/repos/mevdschee/php-crud-api/zipball/ca23131784ef3fd39c9ae96576d19d34074d8520", + "reference": "ca23131784ef3fd39c9ae96576d19d34074d8520", "shasum": "" }, "require": { @@ -76,7 +76,7 @@ "swagger", "ubuntu-linux" ], - "time": "2020-07-02T02:36:40+00:00" + "time": "2020-07-08T13:57:15+00:00" }, { "name": "nyholm/psr7", diff --git a/ui.php b/ui.php index 7ae513a..122e106 100644 --- a/ui.php +++ b/ui.php @@ -256,34 +256,72 @@ class="icon search">Search {{for:filter:i:filters}} +{{if:filter.type|eq("search")}} +
        + + +
        +{{elseif:filter.type|eq("value")}}
        -
        {{filter.field|humanize}} = '{{filter.name}}'
        - + data-filter="{{filter.type}},{{filter.field}},{{filter.operator}},{{filter.value}}"> +
        +{{elseif:filter.type|eq("reference")}} +
        + + +
        +{{endif}} {{endfor}}
        -
        - {{for:column:columns}} - + {{if:column|neq(primaryKey)}} + + {{endif}} {{endfor}} -   +   -   + + + + + + + +
        -   +
        @@ -295,8 +333,8 @@ class="icon search">Search Action {{endif}} {{for:column:columns}} - {{if:column.text|neq(primaryKey)}} - {{column.text|humanize}} + {{if:column|neq(primaryKey)}} + {{column|humanize}} {{endif}} {{endfor}} @@ -368,7 +406,7 @@ class="icon search">Search {{name|humanize}} - {{if:field.table}} + {{if:field.table|and(field.text)}} {{field.text}} {{else}} {{if:field.type.format|eq("large-string")}} @@ -394,7 +432,10 @@ class="icon search">Search

        Related

          {{for:relation:referenced}} -
        • {{relation.0|humanize}} +
        • + + {{relation.0|humanize}} +
          • {{endfor}} {{endif}} @@ -5130,9 +5171,6 @@ public function read(ServerRequestInterface $request): ResponseInterface if (!$this->service->hasTable($table)) { return $this->responder->error(ErrorCode::TABLE_NOT_FOUND, $table); } - if ($this->service->getType($table) != 'table') { - return $this->responder->error(ErrorCode::OPERATION_NOT_SUPPORTED, __FUNCTION__); - } $id = RequestUtils::getPathSegment($request, 3); $params = RequestUtils::getParams($request); if (strpos($id, ',') !== false) { @@ -9587,9 +9625,9 @@ public function jsonSerialize() namespace Tqdev\PhpCrudApi\OpenApi { use Tqdev\PhpCrudApi\Column\ReflectionService; + use Tqdev\PhpCrudApi\Column\Reflection\ReflectedColumn; use Tqdev\PhpCrudApi\Middleware\Communication\VariableStore; use Tqdev\PhpCrudApi\OpenApi\OpenApiDefinition; - use Tqdev\PhpCrudApi\Column\Reflection\ReflectedColumn; class OpenApiRecordsBuilder { @@ -9607,16 +9645,16 @@ class OpenApiRecordsBuilder 'integer' => ['type' => 'integer', 'format' => 'int32'], 'bigint' => ['type' => 'integer', 'format' => 'int64'], 'varchar' => ['type' => 'string'], - 'clob' => ['type' => 'string', 'format' => 'large-string'], //custom format + 'clob' => ['type' => 'string', 'format' => 'large-string'], //custom format 'varbinary' => ['type' => 'string', 'format' => 'byte'], - 'blob' => ['type' => 'string', 'format' => 'large-byte'], //custom format - 'decimal' => ['type' => 'string', 'format' => 'decimal'], //custom format + 'blob' => ['type' => 'string', 'format' => 'large-byte'], //custom format + 'decimal' => ['type' => 'string', 'format' => 'decimal'], //custom format 'float' => ['type' => 'number', 'format' => 'float'], 'double' => ['type' => 'number', 'format' => 'double'], 'date' => ['type' => 'string', 'format' => 'date'], - 'time' => ['type' => 'string', 'format' => 'time'], //custom format + 'time' => ['type' => 'string', 'format' => 'time'], //custom format 'timestamp' => ['type' => 'string', 'format' => 'date-time'], - 'geometry' => ['type' => 'string', 'format' => 'geometry'], //custom format + 'geometry' => ['type' => 'string', 'format' => 'geometry'], //custom format 'boolean' => ['type' => 'boolean'], ]; @@ -9806,7 +9844,10 @@ private function setComponentSchema(string $tableName, array $references) /*: vo if (!$pkName && $operation != 'list') { continue; } - if ($type != 'table' && $operation != 'list') { + if ($type == 'view' && !in_array($operation, array('read', 'list'))) { + continue; + } + if ($type == 'view' && !$pkName && $operation == 'read') { continue; } if ($operation == 'delete') { @@ -11751,6 +11792,7 @@ public static function from(int $status, string $contentType, string $content): $stream->rewind(); $response = $response->withBody($stream); $response = $response->withHeader('Content-Type', $contentType . '; charset=utf-8'); + $response = $response->withHeader('Content-Length', strlen($content)); return $response; } @@ -12172,6 +12214,7 @@ public function referenceId(string $table, /* object */ $record) use Tqdev\PhpCrudApi\Record\ErrorCode; use Tqdev\PhpCrudApi\ResponseFactory; use Tqdev\PhpCrudUi\Document\CsvDocument; + use Tqdev\PhpCrudUi\Document\JsonDocument; use Tqdev\PhpCrudUi\Document\RedirectDocument; use Tqdev\PhpCrudUi\Document\TemplateDocument; @@ -12206,6 +12249,8 @@ public function success($result): ResponseInterface { if ($result instanceof CsvDocument) { return ResponseFactory::fromCsv(ResponseFactory::OK, (string) $result); + } elseif ($result instanceof JsonDocument) { + return ResponseFactory::fromObject(ResponseFactory::OK, json_decode((string) $result)); } elseif ($result instanceof TemplateDocument) { $result->addVariables($this->variables); $result->setTemplatePath($this->templatePath); @@ -12248,6 +12293,7 @@ public function __construct(Router $router, Responder $responder, RecordService $router->register('GET', '/*/delete/*', array($this, 'deleteForm')); $router->register('POST', '/*/delete/*', array($this, 'delete')); $router->register('GET', '/*/list', array($this, '_list')); + $router->register('GET', '/*/values/*', array($this, 'values')); $router->register('POST', '/*/list', array($this, 'search')); $router->register('GET', '/*/export', array($this, 'export')); $this->service = $service; @@ -12363,15 +12409,28 @@ public function _list(ServerRequestInterface $request): ResponseInterface return $this->responder->success($result); } + public function values(ServerRequestInterface $request): ResponseInterface + { + $table = RequestUtils::getPathSegment($request, 1); + $column = RequestUtils::getPathSegment($request, 3); + $params = RequestUtils::getParams($request); + if (!$this->service->hasTable($table, 'list')) { + return $this->responder->error(ErrorCode::TABLE_NOT_FOUND, $table); + } + $result = $this->service->values($table, 'list', $column, $params); + return $this->responder->success($result); + } + public function search(ServerRequestInterface $request): ResponseInterface { $table = RequestUtils::getPathSegment($request, 1); $action = RequestUtils::getPathSegment($request, 2); $params = RequestUtils::getParams($request); + $body = $request->getParsedBody(); if (!$this->service->hasTable($table, $action)) { return $this->responder->error(ErrorCode::TABLE_NOT_FOUND, $table); } - $result = $this->service->search($table, $action, $params); + $result = $this->service->search($table, $body, $params); return $this->responder->success($result); } @@ -12414,6 +12473,25 @@ public function __toString(): string } } +// file: src/Tqdev/PhpCrudUi/Document/JsonDocument.php +namespace Tqdev\PhpCrudUi\Document { + + class JsonDocument + { + private $variables; + + public function __construct(array $variables) + { + $this->variables = $variables; + } + + public function __toString(): string + { + return json_encode($this->variables['records']); + } + } +} + // file: src/Tqdev/PhpCrudUi/Document/RedirectDocument.php namespace Tqdev\PhpCrudUi\Document { @@ -12498,6 +12576,9 @@ private function getFunctions(): array 'bool' => function ($a, $b, $c) { return $a ? $b : $c; }, + 'and' => function ($a, $b) { + return $a && $b; + }, 'or' => function ($a, $b) { return $a ?: $b; }, @@ -12611,6 +12692,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface use Tqdev\PhpCrudUi\Client\CrudApi; use Tqdev\PhpCrudUi\Column\SpecificationService; use Tqdev\PhpCrudUi\Document\CsvDocument; + use Tqdev\PhpCrudUi\Document\JsonDocument; use Tqdev\PhpCrudUi\Document\RedirectDocument; use Tqdev\PhpCrudUi\Document\TemplateDocument; @@ -12819,6 +12901,97 @@ public function delete(string $table, string $action, string $id): TemplateDocum return new TemplateDocument('layouts/default', 'record/deleted', $variables); } + private function getArguments(string $primaryKey, array $references, array $filters): array + { + $args = array(); + $i = 0; + foreach ($filters as $filter) { + if ($filter['type'] == 'search') { + $j = 0; + foreach ($references as $column => $reference) { + if (!$reference && $column != $primaryKey) { + $args["filter${j}[0]"] = implode(',', array($column, $filter['operator'], $filter['value'])); + $j++; + } + } + } elseif ($filter['type'] == 'value') { + $args["filter[$i]"] = implode(',', array($filter['field'], $filter['operator'], $filter['value'])); + $i++; + } elseif ($filter['type'] == 'reference') { + $args["filter[$i]"] = implode(',', array($filter['field'], $filter['operator'], $filter['value'])); + $i++; + } + } + return $args; + } + + private function getFilters(array $references, array $params): array + { + $filters = array(); + if (isset($params['filter'])) { + foreach ($params['filter'] as $filter) { + $type = substr($filter, 0, strpos($filter, ',')); + if ($type == 'search') { + $filter = array_combine(array('type', 'operator', 'value'), explode(',', $filter, 3)); + $filter['field'] = '*any*'; + } elseif ($type == 'value') { + $filter = array_combine(array('type', 'field', 'operator', 'value'), explode(',', $filter, 4)); + $filter['text'] = $filter['value']; + } elseif ($type == 'reference') { + $filter = array_combine(array('type', 'field', 'operator', 'value', 'text'), explode(',', $filter, 5)); + $filter['value'] = implode(',', explode('|', $filter['value'])); + } + $filters[] = $filter; + } + } + return $filters; + } + + private function getParams(array $references, array $filters): array + { + $params = ['filter' => []]; + foreach ($filters as $filter) { + if ($filter['type'] == 'search') { + $param = $filter['type'] . ',' . $filter['operator'] . ',' . $filter['value']; + } elseif ($filter['type'] == 'value') { + $param = $filter['type'] . ',' . $filter['field'] . ',' . $filter['operator'] . ',' . $filter['value']; + } elseif ($filter['type'] == 'reference') { + $param = $filter['type'] . ',' . $filter['field'] . ',' . $filter['operator'] . ',' . implode('|', explode(',', $filter['value'])) . ',' . $filter['text']; + } + $params['filter'][] = $param; + } + return $params; + } + + public function values(string $table, string $action, string $column, array $params): JsonDocument + { + $references = $this->definition->getReferences($table, $action); + $primaryKey = $this->definition->getPrimaryKey($table, $action); + + $pageParams = isset($params['page']) ? $params['page'][0] : '1,50'; + list($pageNumber, $pageSize) = explode(',', $pageParams, 2); + + $filters = $this->getFilters($references, $params); + $args = $this->getArguments($primaryKey, $references, $filters); + + $args['join'] = array_values(array_filter($references)); + $args['page'] = "$pageNumber,$pageSize"; + + $result = []; + + if ($references[$column]) { + $otherTable = $references[$column]; + $data = $this->api->listRecords($otherTable, $args); + foreach ($data['records'] as $record) { + $id = $this->definition->referenceId($otherTable, $record); + $text = $this->definition->referenceText($otherTable, $record); + $result[$id] = $text; + } + } + + return new JsonDocument(['records' => $result]); + } + public function _list(string $table, string $action, array $params): TemplateDocument { $types = $this->definition->getTypes($table, $action); @@ -12826,22 +12999,12 @@ public function _list(string $table, string $action, array $params): TemplateDoc $primaryKey = $this->definition->getPrimaryKey($table, $action); $columns = $this->definition->getColumns($table, $action); - foreach ($columns as $i => $key) { - $columns[$i] = array('text' => $key, 'type' => $types[$key]); - } $pageParams = isset($params['page']) ? $params['page'][0] : '1,50'; list($pageNumber, $pageSize) = explode(',', $pageParams, 2); - $filters = array(); - $args = array(); - if (isset($params['filter'])) { - foreach ($params['filter'] as $i => $filter) { - $filter = array_combine(array('field', 'operator', 'value', 'name'), explode(',', $filter, 4)); - $args["filter[$i]"] = implode(',', array($filter['field'], $filter['operator'], $filter['value'])); - $filters[] = $filter; - } - } + $filters = $this->getFilters($references, $params); + $args = $this->getArguments($primaryKey, $references, $filters); $args['join'] = array_values(array_filter($references)); $args['page'] = "$pageNumber,$pageSize"; @@ -12876,6 +13039,8 @@ public function _list(string $table, string $action, array $params): TemplateDoc 'table' => $table, 'action' => $action, 'filters' => $filters, + 'types' => $types, + 'references' => $references, 'primaryKey' => $primaryKey, 'columns' => $columns, 'records' => $data['records'], @@ -12887,10 +13052,48 @@ public function _list(string $table, string $action, array $params): TemplateDoc return new TemplateDocument('layouts/default', 'record/list', $variables); } - public function search(string $table, string $action, array $params) + public function search(string $table, array $body, array $params) { - die(var_dump($params)); - $params = []; + $action = 'list'; + $references = $this->definition->getReferences($table, $action); + + $filters = $this->getFilters($references, $params); + + if (isset($body['search'])) { + foreach ($filters as $i => $filter) { + if ($filter['type'] == 'search') { + unset($filters[$i]); + } + } + $filters = array_values($filters); + $filters[] = ['type' => 'search', 'field' => '*any*', 'operator' => 'cs', 'value' => $body['search']]; + + // loop over columns and search in referenced fields in text + + /*if (isset($body['value'])) { + if (isset($references[$body['field']]) && $references[$body['field']]) { + $otherTable = $references[$body['field']]; + $otherKey = $this->definition->getPrimaryKey($otherTable, $action); + $otherReferences = $this->definition->getReferences($otherTable, $action); + $args = $this->getArguments($otherKey, $otherReferences, [['type' => 'search', 'field' => '*any*', 'operator' => 'cs', 'value' => $body['value']]]); + $args['include'] = $otherKey; + $records = $this->api->listRecords($otherTable, $args); + $values = array_map(function ($a) use ($otherKey) {return $a[$otherKey];}, $records['records']); + $filters[] = ['type' => 'reference', 'field' => $body['field'], 'operator' => 'in', 'value' => implode(',', $values), 'text' => $body['value']]; + } else { + $filters[] = ['type' => 'value', 'field' => $body['field'], 'operator' => 'cs', 'value' => $body['value']]; + } + }*/ + } + + if (isset($body['value'])) { + if (isset($references[$body['field']]) && $references[$body['field']]) { + $filters[] = ['type' => 'reference', 'field' => $body['field'], 'operator' => 'in', 'value' => $body['value'], 'text' => $body['text']]; + } else { + $filters[] = ['type' => 'value', 'field' => $body['field'], 'operator' => $body['operator'], 'value' => $body['value']]; + } + } + $params = $this->getParams($references, $filters); $query = http_build_query($params); return new RedirectDocument('/' . $table . '/list?' . $query, []); } @@ -13599,7 +13802,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface // file: webroot/js/list.js namespace { $_STATIC['/js/list.js'] = <<<'END_OF_STATIC_FILE' -ZnVuY3Rpb24gY2xvc2VGaWx0ZXIoaW5kZXgpIHsKICAgIGNvbnN0IGVsZW1lbnRzID0gZG9jdW1lbnQucXVlcnlTZWxlY3RvckFsbCgnLmZpbHRlcmJhcicpOwogICAgZm9yICh2YXIgaSA9IDA7IGkgPCBlbGVtZW50cy5sZW5ndGg7IGkrKykgewogICAgICAgIGlmIChlbGVtZW50c1tpXS5kYXRhc2V0LmluZGV4ID09IGluZGV4KSB7CiAgICAgICAgICAgIGVsZW1lbnRzW2ldLnBhcmVudE5vZGUucmVtb3ZlQ2hpbGQoZWxlbWVudHNbaV0pOwogICAgICAgIH0KICAgIH0KICAgIHJldHVybiByZWxvYWRRdWVyeSgpOwp9CmZ1bmN0aW9uIG5hdmlnYXRlUGFnZShwYWdlKSB7CiAgICBjb25zdCBlbGVtZW50ID0gZG9jdW1lbnQucXVlcnlTZWxlY3RvcignLnBhZ2luYXRpb24nKTsKICAgIGlmIChlbGVtZW50KSB7CiAgICAgICAgZWxlbWVudC5kYXRhc2V0LnBhZ2UgPSBwYWdlOwogICAgfQogICAgcmV0dXJuIHJlbG9hZFF1ZXJ5KCk7Cn0KZnVuY3Rpb24gaXNQYXJ0aWFsbHlPZmZzY3JlZW4oZWxlbWVudCkgewogICAgdmFyIHJlY3QgPSBlbGVtZW50LmdldEJvdW5kaW5nQ2xpZW50UmVjdCgpOwogICAgcmV0dXJuIHJlY3QueCA8IDAgfHwgKHJlY3QueCArIHJlY3Qud2lkdGgpID4gKHdpbmRvdy5pbm5lcldpZHRoIC0gMjApOwp9CnZhciB0aW1lT3V0ID0gbnVsbDsKZnVuY3Rpb24gcmVzaXplV2luZG93KCkgewogICAgaWYgKHRpbWVPdXQgIT0gbnVsbCkgY2xlYXJUaW1lb3V0KHRpbWVPdXQpOwogICAgdGltZU91dCA9IHNldFRpbWVvdXQoaGlkZUNvbHVtbnMsIDEwMCk7Cn0KZnVuY3Rpb24gaGlkZUNvbHVtbnMoKSB7CiAgICBjb25zdCBhbGwgPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yQWxsKCd0aCwgdGQnKTsKICAgIGZvciAodmFyIGkgPSAwOyBpIDwgYWxsLmxlbmd0aDsgaSsrKSB7CiAgICAgICAgYWxsW2ldLmNsYXNzTGlzdC5yZW1vdmUoJ2hpZGRlbicpOwogICAgfQogICAgY29uc3QgZWxlbWVudHMgPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yQWxsKCd0aCcpOwogICAgdmFyIG1heCA9IGVsZW1lbnRzLmxlbmd0aDsKICAgIGZvciAodmFyIGkgPSAwOyBpIDwgZWxlbWVudHMubGVuZ3RoOyBpKyspIHsKICAgICAgICBpZiAoaXNQYXJ0aWFsbHlPZmZzY3JlZW4oZWxlbWVudHNbaV0pKSB7CiAgICAgICAgICAgIG1heCA9IGk7CiAgICAgICAgICAgIGJyZWFrOwogICAgICAgIH0KICAgIH0KICAgIGNvbnN0IGhlYWRlcnMgPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yQWxsKCd0aDpudGgtY2hpbGQobisnICsgKG1heCArIDEpICsgJyknKTsKICAgIGZvciAodmFyIGkgPSAwOyBpIDwgaGVhZGVycy5sZW5ndGg7IGkrKykgewogICAgICAgIGhlYWRlcnNbaV0uY2xhc3NMaXN0LmFkZCgnaGlkZGVuJyk7CiAgICB9CiAgICBjb25zdCBjZWxscyA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3JBbGwoJ3RkOm50aC1jaGlsZChuKycgKyAobWF4ICsgMSkgKyAnKScpOwogICAgZm9yICh2YXIgaSA9IDA7IGkgPCBjZWxscy5sZW5ndGg7IGkrKykgewogICAgICAgIGNlbGxzW2ldLmNsYXNzTGlzdC5hZGQoJ2hpZGRlbicpOwogICAgfQp9CmZ1bmN0aW9uIHJlbG9hZFF1ZXJ5KCkgewogICAgY29uc3QgZWxlbWVudHMgPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yQWxsKCcuZmlsdGVyYmFyJyk7CiAgICB2YXIgcGFyYW1zID0gW107CiAgICBmb3IgKHZhciBpID0gMDsgaSA8IGVsZW1lbnRzLmxlbmd0aDsgaSsrKSB7CiAgICAgICAgcGFyYW1zLnB1c2goJ2ZpbHRlcj0nICsgZW5jb2RlVVJJQ29tcG9uZW50KGVsZW1lbnRzW2ldLmRhdGFzZXQuZmlsdGVyKSk7CiAgICB9CiAgICBjb25zdCBlbGVtZW50ID0gZG9jdW1lbnQucXVlcnlTZWxlY3RvcignLnBhZ2luYXRpb24nKTsKICAgIGlmIChlbGVtZW50KSB7CiAgICAgICAgcGFyYW1zLnB1c2goJ3BhZ2U9JyArIGVuY29kZVVSSUNvbXBvbmVudChlbGVtZW50LmRhdGFzZXQucGFnZSkpOwogICAgfQogICAgZG9jdW1lbnQubG9jYXRpb24uaHJlZiA9ICc/JyArIHBhcmFtcy5qb2luKCcmJyk7CiAgICByZXR1cm4gZmFsc2U7Cn0Kd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoJ2xvYWQnLCBmdW5jdGlvbiAoKSB7IGhpZGVDb2x1bW5zKCk7IH0pCndpbmRvdy5hZGRFdmVudExpc3RlbmVyKCdyZXNpemUnLCBmdW5jdGlvbiAoKSB7IHJlc2l6ZVdpbmRvdygpOyB9KQo= +ZnVuY3Rpb24gYWpheEdldCh1cmwsIGNhbGxiYWNrKSB7CiAgICB2YXIgeG1saHR0cCA9IG5ldyBYTUxIdHRwUmVxdWVzdCgpOwogICAgeG1saHR0cC5vbnJlYWR5c3RhdGVjaGFuZ2UgPSBmdW5jdGlvbiAoKSB7CiAgICAgICAgaWYgKHhtbGh0dHAucmVhZHlTdGF0ZSA9PSA0ICYmIHhtbGh0dHAuc3RhdHVzID09IDIwMCkgewogICAgICAgICAgICBjb25zb2xlLmxvZygncmVzcG9uc2VUZXh0OicgKyB4bWxodHRwLnJlc3BvbnNlVGV4dCk7CiAgICAgICAgICAgIHRyeSB7CiAgICAgICAgICAgICAgICB2YXIgZGF0YSA9IEpTT04ucGFyc2UoeG1saHR0cC5yZXNwb25zZVRleHQpOwogICAgICAgICAgICB9IGNhdGNoIChlcnIpIHsKICAgICAgICAgICAgICAgIGNvbnNvbGUubG9nKGVyci5tZXNzYWdlICsgIiBpbiAiICsgeG1saHR0cC5yZXNwb25zZVRleHQpOwogICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICB9CiAgICAgICAgICAgIGNhbGxiYWNrKGRhdGEpOwogICAgICAgIH0KICAgIH07CgogICAgeG1saHR0cC5vcGVuKCJHRVQiLCB1cmwsIHRydWUpOwogICAgeG1saHR0cC5zZW5kKCk7Cn0KZnVuY3Rpb24gc29ydFNlbGVjdE9wdGlvbnMobGIpIHsKICAgIGFyciA9IG5ldyBBcnJheSgpOwogICAgZm9yIChpID0gMDsgaSA8IGxiLmxlbmd0aDsgaSsrKSB7CiAgICAgICAgYXJyW2ldID0gbGIub3B0aW9uc1tpXTsKICAgIH0KICAgIGFyci5zb3J0KGZ1bmN0aW9uIChhLCBiKSB7CiAgICAgICAgcmV0dXJuIChhLnRleHQgPiBiLnRleHQpID8gMSA6ICgoYS50ZXh0IDwgYi50ZXh0KSA/IC0xIDogMCk7CiAgICB9KTsKICAgIGZvciAoaSA9IDA7IGkgPCBsYi5sZW5ndGg7IGkrKykgewogICAgICAgIGxiLm9wdGlvbnNbaV0gPSBhcnJbaV07CiAgICB9Cn0KZnVuY3Rpb24gdXBkYXRlQWRkRmlsdGVyKCkgewogICAgY29uc3QgZmllbGQgPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCcuYWRkRmlsdGVyIFtuYW1lPSJmaWVsZCJdJyk7CiAgICBjb25zdCBvcGVyYXRvciA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoJy5hZGRGaWx0ZXIgW25hbWU9Im9wZXJhdG9yIl0nKTsKICAgIGNvbnN0IHZhbHVlID0gZG9jdW1lbnQucXVlcnlTZWxlY3RvcignLmFkZEZpbHRlciBbbmFtZT0idmFsdWUiXScpOwogICAgY29uc3QgdmFsdWVzID0gZG9jdW1lbnQucXVlcnlTZWxlY3RvcignLmFkZEZpbHRlciBbbmFtZT0idmFsdWVzIl0nKTsKICAgIGlmIChmaWVsZC5vcHRpb25zW2ZpZWxkLnNlbGVjdGVkSW5kZXhdLmRhdGFzZXQucmVmZXJlbmNlcykgewogICAgICAgIG9wZXJhdG9yLnN0eWxlLmRpc3BsYXkgPSAnbm9uZSc7CiAgICAgICAgdmFsdWUudHlwZSA9ICdoaWRkZW4nOwogICAgICAgIHZhbHVlcy5zdHlsZS5kaXNwbGF5ID0gJ2lubGluZSc7CiAgICAgICAgYWpheEdldCgndmFsdWVzLycgKyBmaWVsZC52YWx1ZSwgZnVuY3Rpb24gKGRhdGEpIHsKICAgICAgICAgICAgdmFsdWVzLmlubmVySFRNTCA9ICcnOwogICAgICAgICAgICBPYmplY3Qua2V5cyhkYXRhKS5mb3JFYWNoKGZ1bmN0aW9uIChpdGVtKSB7CiAgICAgICAgICAgICAgICB2YXIgb3B0aW9uID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnb3B0aW9uJyk7CiAgICAgICAgICAgICAgICBvcHRpb24udmFsdWUgPSBpdGVtOwogICAgICAgICAgICAgICAgb3B0aW9uLmlubmVySFRNTCA9IGRhdGFbaXRlbV07CiAgICAgICAgICAgICAgICB2YWx1ZXMuYXBwZW5kQ2hpbGQob3B0aW9uKTsKICAgICAgICAgICAgfSk7CiAgICAgICAgICAgIHNvcnRTZWxlY3RPcHRpb25zKHZhbHVlcyk7CiAgICAgICAgfSk7CiAgICB9IGVsc2UgewogICAgICAgIG9wZXJhdG9yLnN0eWxlLmRpc3BsYXkgPSAnaW5saW5lJzsKICAgICAgICB2YWx1ZS50eXBlID0gJ3RleHQnOwogICAgICAgIHZhbHVlcy5zdHlsZS5kaXNwbGF5ID0gJ25vbmUnOwogICAgfQp9CmZ1bmN0aW9uIHVwZGF0ZVRleHRBbmRWYWx1ZSgpIHsKICAgIGNvbnN0IHRleHQgPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCcuYWRkRmlsdGVyIFtuYW1lPSJ0ZXh0Il0nKTsKICAgIGNvbnN0IHZhbHVlID0gZG9jdW1lbnQucXVlcnlTZWxlY3RvcignLmFkZEZpbHRlciBbbmFtZT0idmFsdWUiXScpOwogICAgY29uc3QgdmFsdWVzID0gZG9jdW1lbnQucXVlcnlTZWxlY3RvcignLmFkZEZpbHRlciBbbmFtZT0idmFsdWVzIl0nKTsKICAgIHRleHRBcnJheSA9IFtdOwogICAgdmFsdWVBcnJheSA9IFtdOwogICAgZm9yICh2YXIgaSA9IDA7IGkgPCB2YWx1ZXMub3B0aW9ucy5sZW5ndGg7IGkrKykgewogICAgICAgIGNvbnN0IGl0ZW0gPSB2YWx1ZXMub3B0aW9uc1tpXTsKICAgICAgICBpZiAoaXRlbS5zZWxlY3RlZCkgewogICAgICAgICAgICB0ZXh0QXJyYXkucHVzaChpdGVtLnRleHQpOwogICAgICAgICAgICB2YWx1ZUFycmF5LnB1c2goaXRlbS52YWx1ZSk7CiAgICAgICAgfQogICAgfQogICAgdGV4dC52YWx1ZSA9IHRleHRBcnJheS5qb2luKCcsICcpOwogICAgdmFsdWUudmFsdWUgPSB2YWx1ZUFycmF5LmpvaW4oJywnKTsKfQoKZnVuY3Rpb24gY2xvc2VGaWx0ZXIoaW5kZXgpIHsKICAgIGNvbnN0IGVsZW1lbnRzID0gZG9jdW1lbnQucXVlcnlTZWxlY3RvckFsbCgnLmZpbHRlcmJhcicpOwogICAgZm9yICh2YXIgaSA9IDA7IGkgPCBlbGVtZW50cy5sZW5ndGg7IGkrKykgewogICAgICAgIGlmIChlbGVtZW50c1tpXS5kYXRhc2V0LmluZGV4ID09IGluZGV4KSB7CiAgICAgICAgICAgIGVsZW1lbnRzW2ldLnBhcmVudE5vZGUucmVtb3ZlQ2hpbGQoZWxlbWVudHNbaV0pOwogICAgICAgIH0KICAgIH0KICAgIHJldHVybiByZWxvYWRRdWVyeSgpOwp9CmZ1bmN0aW9uIGVkaXRGaWx0ZXIoaW5kZXgpIHsKICAgIGNvbnN0IGVsZW1lbnRzID0gZG9jdW1lbnQucXVlcnlTZWxlY3RvckFsbCgnLmZpbHRlcmJhcicpOwogICAgdmFyIHR5cGUgPSAnJzsKICAgIGZvciAodmFyIGkgPSAwOyBpIDwgZWxlbWVudHMubGVuZ3RoOyBpKyspIHsKICAgICAgICBpZiAoZWxlbWVudHNbaV0uZGF0YXNldC5pbmRleCA9PSBpbmRleCkgewogICAgICAgICAgICB2YXIgZmlsdGVyID0gZWxlbWVudHNbaV0uZGF0YXNldC5maWx0ZXI7CiAgICAgICAgICAgIHR5cGUgPSBmaWx0ZXIuc3Vic3RyKDAsIGZpbHRlci5pbmRleE9mKCIsIikpOwogICAgICAgICAgICBlbGVtZW50c1tpXS5wYXJlbnROb2RlLnJlbW92ZUNoaWxkKGVsZW1lbnRzW2ldKTsKICAgICAgICB9CiAgICB9CiAgICBpZiAodHlwZSA9PSAic2VhcmNoIikgewogICAgICAgIC8vIGhpZGUgYWxsCiAgICAgICAgLy8gc2hvdyBzZWFyY2gKICAgICAgICAvLyBmaWxsIGZvcm0KICAgIH0gZWxzZSBpZiAodHlwZSA9PSAidmFsdWUiKSB7CiAgICAgICAgLy8gaGlkZSBhbGwKICAgICAgICAvLyBzaG93IGZpbHRlcgogICAgICAgIC8vIGZpbGwgZm9ybQogICAgfSBlbHNlIGlmICh0eXBlID09ICJyZWZlcmVuY2UiKSB7CiAgICAgICAgLy8gaGlkZSBhbGwKICAgICAgICAvLyBzaG93IGZpbHRlcgogICAgICAgIC8vIGZpbGwgZm9ybQogICAgfQogICAgcmV0dXJuIGZhbHNlOwp9CmZ1bmN0aW9uIG5hdmlnYXRlUGFnZShwYWdlKSB7CiAgICBjb25zdCBlbGVtZW50ID0gZG9jdW1lbnQucXVlcnlTZWxlY3RvcignLnBhZ2luYXRpb24nKTsKICAgIGlmIChlbGVtZW50KSB7CiAgICAgICAgZWxlbWVudC5kYXRhc2V0LnBhZ2UgPSBwYWdlOwogICAgfQogICAgcmV0dXJuIHJlbG9hZFF1ZXJ5KCk7Cn0KZnVuY3Rpb24gaXNQYXJ0aWFsbHlPZmZzY3JlZW4oZWxlbWVudCkgewogICAgdmFyIHJlY3QgPSBlbGVtZW50LmdldEJvdW5kaW5nQ2xpZW50UmVjdCgpOwogICAgcmV0dXJuIHJlY3QueCA8IDAgfHwgKHJlY3QueCArIHJlY3Qud2lkdGgpID4gKHdpbmRvdy5pbm5lcldpZHRoIC0gMjApOwp9CnZhciB0aW1lT3V0ID0gbnVsbDsKZnVuY3Rpb24gcmVzaXplV2luZG93KCkgewogICAgaWYgKHRpbWVPdXQgIT0gbnVsbCkgY2xlYXJUaW1lb3V0KHRpbWVPdXQpOwogICAgdGltZU91dCA9IHNldFRpbWVvdXQoaGlkZUNvbHVtbnMsIDEwMCk7Cn0KZnVuY3Rpb24gaGlkZUNvbHVtbnMoKSB7CiAgICBjb25zdCBhbGwgPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yQWxsKCd0aCwgdGQnKTsKICAgIGZvciAodmFyIGkgPSAwOyBpIDwgYWxsLmxlbmd0aDsgaSsrKSB7CiAgICAgICAgYWxsW2ldLmNsYXNzTGlzdC5yZW1vdmUoJ2hpZGRlbicpOwogICAgfQogICAgaWYgKHdpbmRvdy5pbm5lcldpZHRoID49IDE1MDApIHsKICAgICAgICByZXR1cm47CiAgICB9CiAgICBjb25zdCBlbGVtZW50cyA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3JBbGwoJ3RoJyk7CiAgICB2YXIgbWF4ID0gZWxlbWVudHMubGVuZ3RoOwogICAgZm9yICh2YXIgaSA9IDA7IGkgPCBlbGVtZW50cy5sZW5ndGg7IGkrKykgewogICAgICAgIGlmIChpc1BhcnRpYWxseU9mZnNjcmVlbihlbGVtZW50c1tpXSkpIHsKICAgICAgICAgICAgbWF4ID0gaTsKICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgfQogICAgfQogICAgY29uc3QgaGVhZGVycyA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3JBbGwoJ3RoOm50aC1jaGlsZChuKycgKyAobWF4ICsgMSkgKyAnKScpOwogICAgZm9yICh2YXIgaSA9IDA7IGkgPCBoZWFkZXJzLmxlbmd0aDsgaSsrKSB7CiAgICAgICAgaGVhZGVyc1tpXS5jbGFzc0xpc3QuYWRkKCdoaWRkZW4nKTsKICAgIH0KICAgIGNvbnN0IGNlbGxzID0gZG9jdW1lbnQucXVlcnlTZWxlY3RvckFsbCgndGQ6bnRoLWNoaWxkKG4rJyArIChtYXggKyAxKSArICcpJyk7CiAgICBmb3IgKHZhciBpID0gMDsgaSA8IGNlbGxzLmxlbmd0aDsgaSsrKSB7CiAgICAgICAgY2VsbHNbaV0uY2xhc3NMaXN0LmFkZCgnaGlkZGVuJyk7CiAgICB9Cn0KZnVuY3Rpb24gcmVsb2FkUXVlcnkoKSB7CiAgICBjb25zdCBlbGVtZW50cyA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3JBbGwoJy5maWx0ZXJiYXInKTsKICAgIHZhciBwYXJhbXMgPSBbXTsKICAgIGZvciAodmFyIGkgPSAwOyBpIDwgZWxlbWVudHMubGVuZ3RoOyBpKyspIHsKICAgICAgICBwYXJhbXMucHVzaCgnZmlsdGVyPScgKyBlbmNvZGVVUklDb21wb25lbnQoZWxlbWVudHNbaV0uZGF0YXNldC5maWx0ZXIpKTsKICAgIH0KICAgIGNvbnN0IGVsZW1lbnQgPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCcucGFnaW5hdGlvbicpOwogICAgaWYgKGVsZW1lbnQpIHsKICAgICAgICBwYXJhbXMucHVzaCgncGFnZT0nICsgZW5jb2RlVVJJQ29tcG9uZW50KGVsZW1lbnQuZGF0YXNldC5wYWdlKSk7CiAgICB9CiAgICBkb2N1bWVudC5sb2NhdGlvbi5ocmVmID0gJz8nICsgcGFyYW1zLmpvaW4oJyYnKTsKICAgIHJldHVybiBmYWxzZTsKfQp3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcignbG9hZCcsIGZ1bmN0aW9uICgpIHsgaGlkZUNvbHVtbnMoKTsgdXBkYXRlQWRkRmlsdGVyKCk7IH0pOwp3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcigncmVzaXplJywgZnVuY3Rpb24gKCkgeyByZXNpemVXaW5kb3coKTsgfSk7Cg== END_OF_STATIC_FILE; } From 1890eae32dec6b53c4b5363d8471e1bec2af0d06 Mon Sep 17 00:00:00 2001 From: Maurits van der Schee Date: Wed, 8 Jul 2020 17:05:03 +0200 Subject: [PATCH 14/17] update --- webroot/index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webroot/index.php b/webroot/index.php index 37f8a96..ecb0b99 100644 --- a/webroot/index.php +++ b/webroot/index.php @@ -11,9 +11,9 @@ $config = new Config([ 'api' => [ - 'username' => 'masterlist', - 'password' => 'masterlist', - 'database' => 'masterlist', + 'username' => 'php-crud-api', + 'password' => 'php-crud-api', + 'database' => 'php-crud-api', ], 'templatePath' => '../templates', ]); From 4c62593dcb123b50f88ac705f72a81357993fa4a Mon Sep 17 00:00:00 2001 From: Maurits van der Schee Date: Thu, 9 Jul 2020 17:20:22 +0200 Subject: [PATCH 15/17] Add info --- .../PhpCrudUi/Column/SpecificationService.php | 15 +++++++++++++++ src/Tqdev/PhpCrudUi/Ui.php | 9 +++++---- templates/layouts/default.html | 4 ++-- templates/record/home.html | 10 +++++----- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/Tqdev/PhpCrudUi/Column/SpecificationService.php b/src/Tqdev/PhpCrudUi/Column/SpecificationService.php index a8af39b..4138614 100644 --- a/src/Tqdev/PhpCrudUi/Column/SpecificationService.php +++ b/src/Tqdev/PhpCrudUi/Column/SpecificationService.php @@ -199,6 +199,21 @@ public function getColumns(string $table, string $action): array return array_keys($properties); } + public function getInfo() + { + $info = array(); + if (isset($this->definition['info'])) { + $info = $this->definition['info']; + if (!isset($info['title'])) { + $info['title'] = 'PHP-CRUD-UI'; + } + if (!isset($info['x-subtitle'])) { + $info['x-subtitle'] = 'by TQdev.com'; + } + } + return $info; + } + public function getMenu() { $items = array(); diff --git a/src/Tqdev/PhpCrudUi/Ui.php b/src/Tqdev/PhpCrudUi/Ui.php index 746af11..4793bc7 100644 --- a/src/Tqdev/PhpCrudUi/Ui.php +++ b/src/Tqdev/PhpCrudUi/Ui.php @@ -10,13 +10,13 @@ use Tqdev\PhpCrudApi\Record\ErrorCode; use Tqdev\PhpCrudApi\ResponseUtils; use Tqdev\PhpCrudUi\Client\CrudApi; +use Tqdev\PhpCrudUi\Client\CurlCaller; +use Tqdev\PhpCrudUi\Client\LocalCaller; use Tqdev\PhpCrudUi\Column\SpecificationService; -use Tqdev\PhpCrudUi\Controller\RecordController; use Tqdev\PhpCrudUi\Controller\MultiResponder; -use Tqdev\PhpCrudUi\Record\RecordService; -use Tqdev\PhpCrudUi\Client\LocalCaller; -use Tqdev\PhpCrudUi\Client\CurlCaller; +use Tqdev\PhpCrudUi\Controller\RecordController; use Tqdev\PhpCrudUi\Middleware\StaticFileMiddleware; +use Tqdev\PhpCrudUi\Record\RecordService; class Ui implements RequestHandlerInterface { @@ -43,6 +43,7 @@ public function __construct(Config $config) break; } } + $responder->setVariable('info', $definition->getInfo()); $responder->setVariable('base', $router->getBasePath()); $responder->setVariable('menu', $definition->getMenu()); $responder->setVariable('table', ''); diff --git a/templates/layouts/default.html b/templates/layouts/default.html index 1ea7769..d22a50a 100644 --- a/templates/layouts/default.html +++ b/templates/layouts/default.html @@ -2,7 +2,7 @@ - PHP-CRUD-UI + {{info.title}} @@ -11,7 +11,7 @@
          - ProjectnaamSubtitel + {{info.title}}{{info.x-subtitle}} ☰
          diff --git a/templates/record/home.html b/templates/record/home.html index f5080af..8b8aa3a 100644 --- a/templates/record/home.html +++ b/templates/record/home.html @@ -2,12 +2,12 @@
        • Home
        -

        Projectnaam

        +

        {{info.title}}


        +
      \ No newline at end of file From 02dba87d02dbf93003fbcf2f248c15eda8cb0fdb Mon Sep 17 00:00:00 2001 From: Maurits van der Schee Date: Tue, 18 Aug 2020 14:50:32 +0200 Subject: [PATCH 16/17] patch --- ui.php | 84 ++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 49 insertions(+), 35 deletions(-) diff --git a/ui.php b/ui.php index 122e106..7d87857 100644 --- a/ui.php +++ b/ui.php @@ -47,7 +47,7 @@ - PHP-CRUD-UI + {{info.title}} @@ -56,7 +56,7 @@
      - ProjectnaamSubtitel + {{info.title}}{{info.x-subtitle}} ☰
      @@ -219,16 +219,15 @@
    • Home
    -

    Projectnaam

    +

    {{info.title}}


    - END_OF_HTML; } @@ -2205,7 +2204,7 @@ public function withBody(StreamInterface $body): self return $new; } - private function setHeaders(array $headers): void + private function setHeaders(array $headers) /*:void*/ { foreach ($headers as $header => $value) { if (\is_int($header)) { @@ -2410,7 +2409,7 @@ public function withUri(UriInterface $uri, $preserveHost = false): self return $new; } - private function updateHostFromUri(): void + private function updateHostFromUri() /*:void*/ { if ('' === $host = $this->uri->getHost()) { return; @@ -2448,7 +2447,7 @@ final class Response implements ResponseInterface use MessageTrait; /** @var array Map of standard HTTP status code/reason phrases */ - private const PHRASES = [ + /*private*/ const PHRASES = [ 100 => 'Continue', 101 => 'Switching Protocols', 102 => 'Processing', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 207 => 'Multi-status', 208 => 'Already Reported', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => 'Switch Proxy', 307 => 'Temporary Redirect', @@ -2714,7 +2713,7 @@ final class Stream implements StreamInterface private $size; /** @var array Hash of readable and writable stream types */ - private const READ_WRITE_HASH = [ + /*private*/ const READ_WRITE_HASH = [ 'read' => [ 'r' => true, 'w+' => true, 'r+' => true, 'x+' => true, 'c+' => true, 'rb' => true, 'w+b' => true, 'r+b' => true, 'x+b' => true, @@ -2804,7 +2803,7 @@ public function __toString() } } - public function close(): void + public function close() /*:void*/ { if (isset($this->stream)) { if (\is_resource($this->stream)) { @@ -2828,7 +2827,7 @@ public function detach() return $result; } - public function getSize(): ?int + public function getSize() /*:?int*/ { if (null !== $this->size) { return $this->size; @@ -2872,7 +2871,7 @@ public function isSeekable(): bool return $this->seekable; } - public function seek($offset, $whence = \SEEK_SET): void + public function seek($offset, $whence = \SEEK_SET) /*:void*/ { if (!$this->seekable) { throw new \RuntimeException('Stream is not seekable'); @@ -2883,7 +2882,7 @@ public function seek($offset, $whence = \SEEK_SET): void } } - public function rewind(): void + public function rewind() /*:void*/ { $this->seek(0); } @@ -2966,7 +2965,7 @@ public function getMetadata($key = null) final class UploadedFile implements UploadedFileInterface { /** @var array */ - private const ERRORS = [ + /*private*/ const ERRORS = [ \UPLOAD_ERR_OK => 1, \UPLOAD_ERR_INI_SIZE => 1, \UPLOAD_ERR_FORM_SIZE => 1, @@ -3045,7 +3044,7 @@ public function __construct($streamOrFile, $size, $errorStatus, $clientFilename /** * @throws \RuntimeException if is moved or not ok */ - private function validateActive(): void + private function validateActive() /*:void*/ { if (\UPLOAD_ERR_OK !== $this->error) { throw new \RuntimeException('Cannot retrieve stream due to upload error'); @@ -3069,7 +3068,7 @@ public function getStream(): StreamInterface return Stream::create($resource); } - public function moveTo($targetPath): void + public function moveTo($targetPath) /*:void*/ { $this->validateActive(); @@ -3111,12 +3110,12 @@ public function getError(): int return $this->error; } - public function getClientFilename(): ?string + public function getClientFilename() /*:?string*/ { return $this->clientFilename; } - public function getClientMediaType(): ?string + public function getClientMediaType() /*:?string*/ { return $this->clientMediaType; } @@ -3141,11 +3140,11 @@ final class Uri implements UriInterface { use LowercaseTrait; - private const SCHEMES = ['http' => 80, 'https' => 443]; + /*private*/ const SCHEMES = ['http' => 80, 'https' => 443]; - private const CHAR_UNRESERVED = 'a-zA-Z0-9_\-\.~'; + /*private*/ const CHAR_UNRESERVED = 'a-zA-Z0-9_\-\.~'; - private const CHAR_SUB_DELIMS = '!\$&\'\(\)\*\+,;='; + /*private*/ const CHAR_SUB_DELIMS = '!\$&\'\(\)\*\+,;='; /** @var string Uri scheme. */ private $scheme = ''; @@ -3227,7 +3226,7 @@ public function getHost(): string return $this->host; } - public function getPort(): ?int + public function getPort() /*:?int*/ { return $this->port; } @@ -3395,7 +3394,7 @@ private static function isNonStandardPort(string $scheme, int $port): bool return !isset(self::SCHEMES[$scheme]) || $port !== self::SCHEMES[$scheme]; } - private function filterPort($port): ?int + private function filterPort($port) /*:?int*/ { if (null === $port) { return null; @@ -3507,7 +3506,7 @@ public function fromGlobals(): ServerRequestInterface /** * {@inheritdoc} */ - public function fromArrays(array $server, array $headers = [], array $cookie = [], array $get = [], ?array $post = null, array $files = [], $body = null): ServerRequestInterface + public function fromArrays(array $server, array $headers = [], array $cookie = [], array $get = [], /*?array*/ $post = null, array $files = [], $body = null): ServerRequestInterface { $method = $this->getMethodFromEnv($server); $uri = $this->getUriFromEnvWithHTTP($server); @@ -3772,8 +3771,7 @@ public function fromArrays( array $server, array $headers = [], array $cookie = [], - array $get = [], - ?array $post = null, + array $get = [], /*?array*/ $post = null, array $files = [], $body = null ): ServerRequestInterface; @@ -12174,6 +12172,21 @@ public function getColumns(string $table, string $action): array return array_keys($properties); } + public function getInfo() + { + $info = array(); + if (isset($this->definition['info'])) { + $info = $this->definition['info']; + if (!isset($info['title'])) { + $info['title'] = 'PHP-CRUD-UI'; + } + if (!isset($info['x-subtitle'])) { + $info['x-subtitle'] = 'by TQdev.com'; + } + } + return $info; + } + public function getMenu() { $items = array(); @@ -13669,13 +13682,13 @@ public function getPolygonColumnName(): string use Tqdev\PhpCrudApi\Record\ErrorCode; use Tqdev\PhpCrudApi\ResponseUtils; use Tqdev\PhpCrudUi\Client\CrudApi; + use Tqdev\PhpCrudUi\Client\CurlCaller; + use Tqdev\PhpCrudUi\Client\LocalCaller; use Tqdev\PhpCrudUi\Column\SpecificationService; - use Tqdev\PhpCrudUi\Controller\RecordController; use Tqdev\PhpCrudUi\Controller\MultiResponder; - use Tqdev\PhpCrudUi\Record\RecordService; - use Tqdev\PhpCrudUi\Client\LocalCaller; - use Tqdev\PhpCrudUi\Client\CurlCaller; + use Tqdev\PhpCrudUi\Controller\RecordController; use Tqdev\PhpCrudUi\Middleware\StaticFileMiddleware; + use Tqdev\PhpCrudUi\Record\RecordService; class Ui implements RequestHandlerInterface { @@ -13702,6 +13715,7 @@ public function __construct(Config $config) break; } } + $responder->setVariable('info', $definition->getInfo()); $responder->setVariable('base', $router->getBasePath()); $responder->setVariable('menu', $definition->getMenu()); $responder->setVariable('table', ''); @@ -13816,9 +13830,9 @@ public function handle(ServerRequestInterface $request): ResponseInterface $config = new Config([ 'api' => [ - 'username' => 'masterlist', - 'password' => 'masterlist', - 'database' => 'masterlist', + 'username' => 'php-crud-api', + 'password' => 'php-crud-api', + 'database' => 'php-crud-api', ], 'templatePath' => '../templates', ]); From 63d889bbdc8c05197bb23c0b006ba152eb6a62b9 Mon Sep 17 00:00:00 2001 From: Maurits van der Schee Date: Tue, 1 Sep 2020 11:40:04 +0200 Subject: [PATCH 17/17] hamburger --- .../PhpCrudUi/Controller/RecordController.php | 7 ++++++ src/Tqdev/PhpCrudUi/Record/RecordService.php | 5 ++++ templates/layouts/default.html | 4 ++-- templates/layouts/menu.html | 24 +++++++++++++++++++ templates/record/menu.html | 8 +++++++ webroot/css/style.css | 2 +- 6 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 templates/layouts/menu.html create mode 100644 templates/record/menu.html diff --git a/src/Tqdev/PhpCrudUi/Controller/RecordController.php b/src/Tqdev/PhpCrudUi/Controller/RecordController.php index 17c6f93..d69d0d4 100644 --- a/src/Tqdev/PhpCrudUi/Controller/RecordController.php +++ b/src/Tqdev/PhpCrudUi/Controller/RecordController.php @@ -18,6 +18,7 @@ class RecordController public function __construct(Router $router, Responder $responder, RecordService $service) { $router->register('GET', '/', array($this, 'home')); + $router->register('GET', '/menu', array($this, 'menu')); $router->register('GET', '/*/create', array($this, 'createForm')); $router->register('POST', '/*/create', array($this, 'create')); $router->register('GET', '/*/read/*', array($this, 'read')); @@ -39,6 +40,12 @@ public function home(ServerRequestInterface $request): ResponseInterface return $this->responder->success($result); } + public function menu(ServerRequestInterface $request): ResponseInterface + { + $result = $this->service->menu(); + return $this->responder->success($result); + } + public function createForm(ServerRequestInterface $request): ResponseInterface { $table = RequestUtils::getPathSegment($request, 1); diff --git a/src/Tqdev/PhpCrudUi/Record/RecordService.php b/src/Tqdev/PhpCrudUi/Record/RecordService.php index d81d8a8..d9142c9 100644 --- a/src/Tqdev/PhpCrudUi/Record/RecordService.php +++ b/src/Tqdev/PhpCrudUi/Record/RecordService.php @@ -48,6 +48,11 @@ public function home(): TemplateDocument return new TemplateDocument('layouts/default', 'record/home', array()); } + public function menu(): TemplateDocument + { + return new TemplateDocument('layouts/menu', 'record/menu', array()); + } + public function createForm(string $table, string $action): TemplateDocument { $types = $this->definition->getTypes($table, $action); diff --git a/templates/layouts/default.html b/templates/layouts/default.html index d22a50a..c9a7178 100644 --- a/templates/layouts/default.html +++ b/templates/layouts/default.html @@ -8,11 +8,11 @@ - +
    {{info.title}}{{info.x-subtitle}} - ☰ +
    {{content}} diff --git a/templates/layouts/menu.html b/templates/layouts/menu.html new file mode 100644 index 0000000..4f21af0 --- /dev/null +++ b/templates/layouts/menu.html @@ -0,0 +1,24 @@ + + + + + {{info.title}} + + + + + + +
    +
    + {{info.title}}{{info.x-subtitle}} + +
    +
    + {{content}} +
    +
    + + + \ No newline at end of file diff --git a/templates/record/menu.html b/templates/record/menu.html new file mode 100644 index 0000000..a9eec79 --- /dev/null +++ b/templates/record/menu.html @@ -0,0 +1,8 @@ +
    + \ No newline at end of file diff --git a/webroot/css/style.css b/webroot/css/style.css index cff20f7..ee649f4 100644 --- a/webroot/css/style.css +++ b/webroot/css/style.css @@ -16,7 +16,7 @@ body {font-size: 1rem; line-height: 1.4;} .title {padding: 0.5rem 2rem; color: black; text-decoration: none;} .title span {font-weight: bold; display: block;} .body {padding: 6rem 2rem; flex-grow: 1; padding-bottom: 10rem;} -.hamburger {padding: 0 1rem 0.5rem; margin: 0.3rem 1rem; display: inline-block; text-decoration: none; color: black; font-size: 2.25rem; line-height: 1.2; transform: scaleX(1.5);} +.hamburger {padding: 1rem; margin: 0.3rem 1rem; display: inline-block; text-decoration: none; color: black; font-size: 2.25rem; line-height: 1.2; transform: scaleX(1.5);} th.selected::after {content: " ▾";}