Skip to content

Commit f27bae7

Browse files
distantnativedistantnative
committed
refact!: Models fields use models picker dialogs
1 parent 97bc75f commit f27bae7

33 files changed

+347
-962
lines changed

‎config/fields/files.php‎

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?php
22

3+
use Kirby\Cms\File;
34
use Kirby\Cms\ModelWithContent;
5+
use Kirby\Panel\Controller\Dialog\FilesPickerDialogController;
46

57
return [
68
'mixins' => [
7-
'filepicker',
89
'layout',
910
'min',
1011
'picker',
@@ -21,7 +22,8 @@
2122
'placeholder' => null,
2223

2324
/**
24-
* Sets the file(s), which are selected by default when a new page is created
25+
* Sets the file(s), which are selected by default
26+
* when a new page is created
2527
*/
2628
'default' => function ($default = null) {
2729
return $default;
@@ -48,9 +50,6 @@
4850
'parent' => function () {
4951
return $this->parentModel->apiUrl(true);
5052
},
51-
'query' => function () {
52-
return $this->query ?? $this->parentModel::CLASS_ALIAS . '.files';
53-
},
5453
'default' => function () {
5554
return $this->toFormValues($this->default);
5655
},
@@ -59,52 +58,55 @@
5958
},
6059
],
6160
'methods' => [
61+
'toId' => function (File $file) {
62+
return match ($file->parent() !== $this->model()) {
63+
true => $file->id(),
64+
false => $file->filename()
65+
};
66+
},
6267
'toModel' => function (string $id) {
63-
return $this->kirby()->file($id, $this->model());
68+
return $this->kirby()->file($id, $this->model);
6469
}
6570
],
6671
'api' => function () {
6772
return [
6873
[
69-
'pattern' => '/',
70-
'action' => function () {
71-
$field = $this->field();
72-
73-
return $field->filepicker([
74-
'image' => $field->image(),
75-
'info' => $field->info(),
76-
'layout' => $field->layout(),
77-
'limit' => $field->limit(),
78-
'page' => $this->requestQuery('page'),
79-
'query' => $field->query(),
80-
'search' => $this->requestQuery('search'),
81-
'text' => $field->text()
82-
]);
83-
}
74+
'pattern' => 'items',
75+
'method' => 'GET',
76+
'action' => fn () => $this->field()->itemsFromRequest()
8477
],
8578
[
8679
'pattern' => 'upload',
8780
'method' => 'POST',
8881
'action' => function () {
89-
$field = $this->field();
90-
$uploads = $field->uploads();
82+
$field = $this->field();
9183

9284
// move_uploaded_file() not working with unit test
9385
// @codeCoverageIgnoreStart
94-
return $field->upload($this, $uploads, function ($file, $parent) use ($field) {
95-
return $file->panel()->pickerData([
96-
'image' => $field->image(),
97-
'info' => $field->info(),
98-
'layout' => $field->layout(),
99-
'model' => $field->model(),
100-
'text' => $field->text(),
101-
]);
102-
});
86+
return $field->upload(
87+
$this,
88+
$field->uploads(),
89+
fn ($file, $parent) => $field->toItem($file)
90+
);
10391
// @codeCoverageIgnoreEnd
10492
}
10593
]
10694
];
10795
},
96+
'dialogs' => fn () => [
97+
'picker' => fn () => new FilesPickerDialogController(...[
98+
'model' => $this->model(),
99+
'hasSearch' => $this->search,
100+
'image' => $this->image,
101+
'info' => $this->info ?? false,
102+
'limit' => $this->limit,
103+
'max' => $this->max,
104+
'multiple' => $this->multiple,
105+
'query' => $this->query,
106+
'text' => $this->text,
107+
...$this->picker
108+
])
109+
],
108110
'save' => function ($value = null) {
109111
return $this->toStoredValues($value);
110112
},

‎config/fields/mixins/filepicker.php‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎config/fields/mixins/pagepicker.php‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎config/fields/mixins/picker.php‎

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,15 @@
5959
return $multiple;
6060
},
6161

62+
/**
63+
* Additional picker dialog props
64+
* @since 6.0.0
65+
* @values { image, layout, size }
66+
*/
67+
'picker' => function (array $picker = []) {
68+
return $picker;
69+
},
70+
6271
/**
6372
* Query for the items to be included in the picker
6473
*/
@@ -98,20 +107,30 @@
98107
'getIdFromArray' => function (array $array) {
99108
return $array['uuid'] ?? $array['id'] ?? null;
100109
},
110+
'itemsFromRequest' => function () {
111+
$ids = $this->kirby()->request()->get('items', '');
112+
$ids = Str::split($ids);
113+
$models = $this->toModels($ids);
114+
return $this->toItems($models);
115+
},
116+
101117
'toFormValues' => function ($value = null) {
102-
$items = [];
118+
$ids = [];
103119

104120
foreach (Data::decode($value, 'yaml') as $id) {
105121
if (is_array($id) === true) {
106122
$id = $this->getIdFromArray($id);
107123
}
108124

109125
if ($id !== null && ($model = $this->toModel($id))) {
110-
$items[] = $this->toItem($model);
126+
$ids[] = $this->toId($model);
111127
}
112128
}
113129

114-
return $items;
130+
return $ids;
131+
},
132+
'toId' => function (ModelWithContent $model) {
133+
return $model->id();
115134
},
116135
'toItem' => function (ModelWithContent $model) {
117136
return $model->panel()->pickerData([
@@ -122,7 +141,7 @@
122141
'text' => $this->text,
123142
]);
124143
},
125-
'toItems' => function (array $models) {
144+
'toItems' => function (array $models = []) {
126145
return A::map(
127146
$models,
128147
fn ($model) => $this->toItem($model)
@@ -131,10 +150,16 @@
131150
'toModel' => function (string $id) {
132151
throw new Exception(message: 'toModel() is not implemented on ' . $this->type() . ' field');
133152
},
153+
'toModels' => function (array $ids = []) {
154+
return A::map(
155+
$ids,
156+
fn ($id) => $this->toModel($id)
157+
);
158+
},
134159
'toStoredValues' => function ($value = null) {
135160
return A::map(
136161
$value ?? [],
137-
fn (array $item) => $item[$this->store]
162+
fn (string $id) => (string)$this->toModel($id)?->{$this->store}()
138163
);
139164
},
140165
]

‎config/fields/mixins/userpicker.php‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎config/fields/pages.php‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
<?php
22

3-
use Kirby\Toolkit\A;
3+
use Kirby\Panel\Controller\Dialog\PagesPickerDialogController;
44

55
return [
66
'mixins' => [
77
'layout',
88
'min',
9-
'pagepicker',
109
'picker',
1110
],
1211
'props' => [
@@ -58,26 +57,27 @@
5857
'api' => function () {
5958
return [
6059
[
61-
'pattern' => '/',
62-
'action' => function () {
63-
$field = $this->field();
64-
65-
return $field->pagepicker([
66-
'image' => $field->image(),
67-
'info' => $field->info(),
68-
'layout' => $field->layout(),
69-
'limit' => $field->limit(),
70-
'page' => $this->requestQuery('page'),
71-
'parent' => $this->requestQuery('parent'),
72-
'query' => $field->query(),
73-
'search' => $this->requestQuery('search'),
74-
'subpages' => $field->subpages(),
75-
'text' => $field->text()
76-
]);
77-
}
60+
'pattern' => 'items',
61+
'method' => 'GET',
62+
'action' => fn () => $this->field()->itemsFromRequest()
7863
]
7964
];
8065
},
66+
'dialogs' => fn () => [
67+
'picker' => fn () => new PagesPickerDialogController(...[
68+
'model' => $this->model(),
69+
'hasSearch' => $this->search,
70+
'image' => $this->image,
71+
'info' => $this->info ?? false,
72+
'limit' => $this->limit,
73+
'max' => $this->max,
74+
'multiple' => $this->multiple,
75+
'query' => $this->query,
76+
'subpages' => $this->subpages,
77+
'text' => $this->text,
78+
...$this->picker
79+
])
80+
],
8181
'save' => function ($value = null) {
8282
return $this->toStoredValues($value);
8383
},

‎config/fields/textarea.php‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<?php
22

3+
use Kirby\Panel\Controller\Dialog\FilesPickerDialogController;
4+
35
return [
4-
'mixins' => ['filepicker', 'upload'],
6+
'mixins' => ['upload'],
57
'props' => [
68
/**
79
* Unset inherited props
@@ -86,33 +88,34 @@
8688
],
8789
'api' => function () {
8890
return [
89-
[
90-
'pattern' => 'files',
91-
'action' => function () {
92-
return $this->field()->filepicker([
93-
...$this->field()->files(),
94-
'page' => $this->requestQuery('page'),
95-
'search' => $this->requestQuery('search')
96-
]);
97-
}
98-
],
9991
[
10092
'pattern' => 'upload',
10193
'method' => 'POST',
10294
'action' => function () {
103-
$field = $this->field();
104-
$uploads = $field->uploads();
95+
$field = $this->field();
10596

106-
return $this->field()->upload($this, $uploads, fn ($file, $parent) => [
107-
'filename' => $file->filename(),
108-
'dragText' => $file->panel()->dragText(
109-
absolute: $field->model()->is($parent) === false
110-
),
111-
]);
97+
return $field->upload(
98+
$this,
99+
$field->uploads(),
100+
fn ($file, $parent) => [
101+
'filename' => $file->filename(),
102+
'dragText' => $file->panel()->dragText(
103+
absolute: $field->model()->is($parent) === false
104+
),
105+
]
106+
);
112107
}
113108
]
114109
];
115110
},
111+
'dialogs' => fn () => [
112+
'files' => fn () => new FilesPickerDialogController(...[
113+
'multiple' => false,
114+
...$this->files(),
115+
'model' => $this->model(),
116+
'uploads' => $this->uploads,
117+
])
118+
],
116119
'validations' => [
117120
'minlength',
118121
'maxlength'

0 commit comments

Comments
 (0)