Moonlight-Panel/Moonlight
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #49 from Moonlight-Panel/ModifyUsageOfWingsFileAccess

Browse Source 
Replaced legacy dependency resolve with server service function for w…
This commit is contained in:
Marcel Baumgartner
2023-04-06 19:34:00 +02:00
committed by GitHub
parent e483bb7ed8 c18d683fb8
commit 271f56e992
3 changed files with 8 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Moonlight/Shared/Components/ServerControl/Settings/JavascriptFileSetting.razor
View File

@@ -2,13 +2,12 @@
@using Moonlight.App.Repositories.Servers @using Moonlight.App.Repositories.Servers
@using Moonlight.Shared.Components.FileManagerPartials @using Moonlight.Shared.Components.FileManagerPartials
@using Moonlight.App.Database.Entities @using Moonlight.App.Database.Entities
@using Moonlight.App.Helpers
@using Moonlight.App.Helpers.Files @using Moonlight.App.Helpers.Files
@using Moonlight.App.Services @using Moonlight.App.Services
@inject ServerRepository ServerRepository @inject ServerRepository ServerRepository
@inject WingsApiHelper WingsApiHelper
@inject SmartTranslateService SmartTranslateService @inject SmartTranslateService SmartTranslateService
@inject ServerService ServerService
<div class="col"> <div class="col">
<div class="card card-body"> <div class="card card-body">
@@ -42,14 +41,9 @@
private FileSelectModal FileSelectModal; private FileSelectModal FileSelectModal;
private LazyLoader LazyLoader; private LazyLoader LazyLoader;
protected override void OnInitialized() protected override async Task OnInitializedAsync()
{ {
Access = new WingsFileAccess(WingsApiHelper, Access = await ServerService.CreateFileAccess(CurrentServer, null!);
null!,
CurrentServer,
null!,
null!
);
} }
private async Task Load(LazyLoader lazyLoader) private async Task Load(LazyLoader lazyLoader)

11
Moonlight/Shared/Components/ServerControl/Settings/PythonFileSetting.razor
View File

@@ -7,7 +7,7 @@
@using Moonlight.App.Services @using Moonlight.App.Services
@inject ServerRepository ServerRepository @inject ServerRepository ServerRepository
@inject WingsApiHelper WingsApiHelper @inject ServerService ServerService
@inject SmartTranslateService SmartTranslateService @inject SmartTranslateService SmartTranslateService
<div class="col"> <div class="col">
@@ -42,14 +42,9 @@
private FileSelectModal FileSelectModal; private FileSelectModal FileSelectModal;
private LazyLoader LazyLoader; private LazyLoader LazyLoader;
protected override void OnInitialized() protected override async Task OnInitializedAsync()
{ {
Access = new WingsFileAccess(WingsApiHelper, Access = await ServerService.CreateFileAccess(CurrentServer, null!);
null!,
CurrentServer,
null!,
null!
);
} }
private async Task Load(LazyLoader lazyLoader) private async Task Load(LazyLoader lazyLoader)

12
Moonlight/Shared/Components/ServerControl/Settings/ServerResetSetting.razor
View File

@@ -7,8 +7,6 @@
@inject SmartTranslateService SmartTranslateService @inject SmartTranslateService SmartTranslateService
@inject AlertService AlertService @inject AlertService AlertService
@inject ToastService ToastService @inject ToastService ToastService
@inject WingsApiHelper WingsApiHelper
@inject ConfigService ConfigService
@inject ServerService ServerService @inject ServerService ServerService
<WButton Text="@(SmartTranslateService.Translate("Reset"))" <WButton Text="@(SmartTranslateService.Translate("Reset"))"
@@ -34,14 +32,8 @@
if (b) if (b)
{ {
await ToastService.CreateProcessToast("serverReset", SmartTranslateService.Translate("Resetting server")); await ToastService.CreateProcessToast("serverReset", SmartTranslateService.Translate("Resetting server"));
var access = new WingsFileAccess( var access = await ServerService.CreateFileAccess(CurrentServer, null!);
WingsApiHelper,
null!,
CurrentServer,
ConfigService,
null!
);
var files = await access.Ls(); var files = await access.Ls();