Skip to content

Commit 747c87d

Browse files
committed
fix: lint and rector
Signed-off-by: Enjeck C. <patrathewhiz@gmail.com>
1 parent 39f3bdb commit 747c87d

4 files changed

Lines changed: 17 additions & 21 deletions

File tree

lib/Controller/ViewController.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,7 @@ public function show(int $id): DataResponse {
5757
#[NoAdminRequired]
5858
#[RequirePermission(permission: Application::PERMISSION_MANAGE, type: Application::NODE_TYPE_TABLE, idParam: 'tableId')]
5959
public function create(int $tableId, string $title, ?string $emoji, ?string $layout = null): DataResponse {
60-
return $this->handleError(function () use ($tableId, $title, $emoji, $layout) {
61-
return $this->service->create($title, $emoji, $this->getTable($tableId, true), null, layout: $layout);
62-
});
60+
return $this->handleError(fn() => $this->service->create($title, $emoji, $this->getTable($tableId, true), null, layout: $layout));
6361
}
6462

6563
#[NoAdminRequired]

src/modules/modals/ViewSettings.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ export default {
268268
},
269269
set(value) {
270270
this.ensureMutableViewSettings()
271-
this.$set(this.mutableView.viewSettings, 'cardBackgroundSource', value ?? null)
271+
this.mutableView.viewSettings.cardBackgroundSource = value ?? null
272272
},
273273
},
274274
titleSourceValue: {
@@ -277,7 +277,7 @@ export default {
277277
},
278278
set(value) {
279279
this.ensureMutableViewSettings()
280-
this.$set(this.mutableView.viewSettings, 'cardTitleSource', value ?? null)
280+
this.mutableView.viewSettings.cardTitleSource = value ?? null
281281
},
282282
},
283283
saveText() {
@@ -495,8 +495,8 @@ export default {
495495
const secondColumnId = this.mutableView.columnSettings?.[1]?.columnId ?? firstColumnId
496496
const backgroundSource = this.mutableView.viewSettings.cardBackgroundSource ?? this.viewSetting?.viewSettings?.cardBackgroundSource ?? firstColumnId
497497
const titleSource = this.mutableView.viewSettings.cardTitleSource ?? this.viewSetting?.viewSettings?.cardTitleSource ?? secondColumnId
498-
this.$set(this.mutableView.viewSettings, 'cardBackgroundSource', backgroundSource)
499-
this.$set(this.mutableView.viewSettings, 'cardTitleSource', titleSource)
498+
this.mutableView.viewSettings.cardBackgroundSource = backgroundSource
499+
this.mutableView.viewSettings.cardTitleSource = titleSource
500500
this.errorTitle = false
501501
this.selectedColumns = this.mutableView.columnSettings ? this.mutableView.columnSettings.map(item => item.columnId) : null
502502
this.allColumns = []
@@ -505,10 +505,10 @@ export default {
505505
},
506506
ensureMutableViewSettings() {
507507
if (!this.mutableView.viewSettings) {
508-
this.$set(this.mutableView, 'viewSettings', {
508+
this.mutableView.viewSettings = {
509509
cardBackgroundSource: null,
510510
cardTitleSource: null,
511-
})
511+
}
512512
}
513513
},
514514
resolveCardSourceValue(stored, fallbackIndex) {
@@ -521,8 +521,8 @@ export default {
521521
},
522522
persistCardSourceFallbacks() {
523523
this.ensureMutableViewSettings()
524-
this.$set(this.mutableView.viewSettings, 'cardBackgroundSource', this.resolveCardSourceValue(this.mutableView.viewSettings.cardBackgroundSource, 0))
525-
this.$set(this.mutableView.viewSettings, 'cardTitleSource', this.resolveCardSourceValue(this.mutableView.viewSettings.cardTitleSource, 1))
524+
this.mutableView.viewSettings.cardBackgroundSource = this.resolveCardSourceValue(this.mutableView.viewSettings.cardBackgroundSource, 0)
525+
this.mutableView.viewSettings.cardTitleSource = this.resolveCardSourceValue(this.mutableView.viewSettings.cardTitleSource, 1)
526526
},
527527
loadEmoji() {
528528
const emojis = ['😀', '😃', '😄', '😁', '😆', '😅', '🤣', '😂', '🙂', '🙃', '🫠', '😉', '😊', '😇']

src/pages/Context.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
<div class="resources">
2323
<div v-for="resource in contextResources" :key="resource.key">
2424
<div v-if="!resource.isView" class="resource">
25-
<TableWrapper :table="resource" :columns="columns[resource.key]" :rows="rows[resource.key]"
26-
:view-setting.sync="resourceViewSettings[resource.key]" @create-column="createColumn(false, resource)"
25+
<TableWrapper v-model:view-setting="resourceViewSettings[resource.key]" :table="resource" :columns="columns[resource.key]"
26+
:rows="rows[resource.key]" @create-column="createColumn(false, resource)"
2727
@import-scheme="openImportSchemeModal(resource)"
2828
@import="openImportModal(resource, false)" @download-csv="downloadCSV(resource, false)"
2929
@download-filtered-csv="rows => downloadFilteredCSV(rows, resource, false)" />
3030
</div>
3131
<div v-else-if="resource.isView" class="resource">
32-
<CustomView :view="resource" :columns="columns[resource.key]" :rows="rows[resource.key]"
33-
:view-setting.sync="resourceViewSettings[resource.key]" @create-column="createColumn(true, resource)"
32+
<CustomView v-model:view-setting="resourceViewSettings[resource.key]" :view="resource" :columns="columns[resource.key]"
33+
:rows="rows[resource.key]" @create-column="createColumn(true, resource)"
3434
@import="openImportModal(resource, true)" @download-csv="downloadCSV(resource, true)"
3535
@download-filtered-csv="rows => downloadFilteredCSV(rows, resource, true)" />
3636
</div>
@@ -221,7 +221,7 @@ export default {
221221
})
222222
table.key = (table.id).toString()
223223
table.isView = false
224-
this.$set(this.resourceViewSettings, table.key, this.createViewSetting(false, table))
224+
this.resourceViewSettings[table.key] = this.createViewSetting(false, table)
225225
this.contextResources.push(table)
226226
}
227227
@@ -238,7 +238,7 @@ export default {
238238
})
239239
view.key = 'view-' + (view.id).toString()
240240
view.isView = true
241-
this.$set(this.resourceViewSettings, view.key, this.createViewSetting(true, view))
241+
this.resourceViewSettings[view.key] = this.createViewSetting(true, view)
242242
this.contextResources.push(view)
243243
}
244244
}

tests/unit/TablesMigratorTest.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -322,14 +322,12 @@ public function testImportRemapsViewCardSources(): void {
322322
],
323323
];
324324

325-
$importSource->method('getFileContents')->willReturnCallback(static function (string $file) use ($tableData, $columns, $views): string {
326-
return match ($file) {
325+
$importSource->method('getFileContents')->willReturnCallback(static fn(string $file): string => match ($file) {
327326
'tables.json' => json_encode([$tableData]),
328327
'columns.json' => json_encode($columns),
329328
'views.json' => json_encode($views),
330329
default => json_encode([]),
331-
};
332-
});
330+
});
333331

334332
$newTable = new Table();
335333
$newTable->setId(100);

0 commit comments

Comments
 (0)