Skip to content

Commit 614fa07

Browse files
authored
Merge pull request #1758 from Blair2004/dependabot/npm_and_yarn/vite-5.1.0
Bump vite from 4.5.2 to 5.1.0
2 parents cae77db + e2e7296 commit 614fa07

File tree

236 files changed

+11310
-31637
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

236 files changed

+11310
-31637
lines changed

app/Services/UsersService.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ public function storeWidgetsOnAreas(array $config, User $user = null): array
280280
* @var array $column
281281
*/
282282
foreach ($column[ 'widgets' ] as $position => $columnWidget) {
283-
$widget = UserWidget::where('identifier', $columnWidget[ 'componentName' ])
283+
$widget = UserWidget::where('identifier', $columnWidget[ 'component-name' ])
284284
->where('column', $column[ 'name' ])
285285
->where('user_id', $userId)
286286
->first();
@@ -289,15 +289,15 @@ public function storeWidgetsOnAreas(array $config, User $user = null): array
289289
$widget = new UserWidget;
290290
}
291291

292-
$widget->identifier = $columnWidget[ 'componentName' ];
293-
$widget->class_name = $columnWidget[ 'className' ] ?? '';
292+
$widget->identifier = $columnWidget[ 'component-name' ];
293+
$widget->class_name = $columnWidget[ 'class-name' ];
294294
$widget->position = $position;
295295
$widget->user_id = $userId;
296296
$widget->column = $column[ 'name' ];
297297
$widget->save();
298298
}
299299

300-
$identifiers = collect($column[ 'widgets' ])->map(fn($widget) => $widget[ 'componentName' ])->toArray();
300+
$identifiers = collect($column[ 'widgets' ])->map(fn($widget) => $widget[ 'component-name' ])->toArray();
301301

302302
UserWidget::whereNotIn('identifier', $identifiers)
303303
->where('column', $column[ 'name' ])

app/Services/WidgetService.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,10 @@ public function getAllWidgets(): Collection
106106
$widgetInstance = new $widget;
107107

108108
return (object) [
109-
'className' => $widget,
109+
'class-name' => $widget,
110110
'instance' => $widgetInstance,
111111
'name' => $widgetInstance->getName(),
112-
'component' => $widgetInstance->getVueComponent(),
112+
'component-name' => $widgetInstance->getVueComponent(),
113113
'canAccess' => $widgetInstance->canAccess(),
114114
];
115115
});
@@ -214,8 +214,8 @@ public function addDefaultWidgetsToAreas(User $user): void
214214
$widgetInstance = new $widgetClass;
215215

216216
$areaWidgets[ $areas[ $index % 3 ] ][] = [
217-
'className' => $widgetClass,
218-
'componentName' => $widgetInstance->getVueComponent(),
217+
'class-name' => $widgetClass,
218+
'component-name' => $widgetInstance->getVueComponent(),
219219
];
220220
}
221221

composer.lock

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)