Skip to content

Commit

Permalink
Merge pull request #1815 from fdm-monster/fix/remove-broken-server-re…
Browse files Browse the repository at this point in the history
…start

fix: server restart does not work - broken button removed
  • Loading branch information
davidzwa authored Jan 3, 2025
2 parents eab5c79 + fdb1cc0 commit 745a90a
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 32 deletions.
1 change: 1 addition & 0 deletions RELEASE_NOTES.MD
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Chores
Fixes

- Delete files on printer details (sidenav) should be protected by a confirmation dialog.
- Emergency commands: server restart does not work - broken button removed

## Client 25/12/2024 1.8.7

Expand Down
6 changes: 0 additions & 6 deletions src/backend/server-private.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,6 @@ import { downloadFileByBlob } from "@/utils/download-file.util";
import { getHttpClient } from "@/shared/http-client";

export class ServerPrivateService extends BaseService {
public static async restartServer() {
const path = ServerApi.serverRestartCommandRoute;

return await this.post(path);
}

public static async downloadYamlExport(input: ExportYamlModel) {
const client = await getHttpClient();
const response = await client.request<any>({
Expand Down
1 change: 0 additions & 1 deletion src/backend/server.api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ export class ServerApi {
static updateExperimentalClientSupportRoute = `${ServerApi.settingsRoute}/experimental-client-support`;

static serverPrivateRoute = `${ServerApi.base}/server`;
static serverRestartCommandRoute = `${ServerApi.serverPrivateRoute}/restart`;

static pluginRoute = `${ServerApi.base}/plugin`;
static pluginFirmwareUpdateRoute = `${ServerApi.pluginRoute}/firmware-update`;
Expand Down
25 changes: 0 additions & 25 deletions src/components/Settings/EmergencyCommands.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,6 @@
<v-list subheader>
<v-subheader>Emergency Commands to rectify problematic situations</v-subheader>

<!-- Server Commands -->
<v-list-item>
<v-list-item-content>
<v-list-item-title>Server commands</v-list-item-title>
<v-list-item-subtitle>
<span>Restart the server to resolve any active issues</span>
</v-list-item-subtitle>
</v-list-item-content>
<v-btn :disabled="isLoading" color="primary" @click="restartServer" class="ml-4">
Restart server
</v-btn>
<v-progress-circular v-if="isLoading" indeterminate size="30" width="4" class="ml-2" />
</v-list-item>

<!-- Batch Disabling -->
<v-list-item>
<v-list-item-content>
Expand Down Expand Up @@ -157,7 +143,6 @@ import {
import { Bar } from "vue-chartjs";
import { IdType } from "@/utils/id.type";
import { OctoPrintSettingsDto } from "@/backend/dto/octoprint-settings.dto";
import { sleep } from "@/utils/time.utils";
import SettingsToolbar from "@/components/Settings/Shared/SettingsToolbar.vue";
import { settingsPage } from "@/components/Settings/Shared/setting.constants";
import SettingSection from "@/components/Settings/Shared/SettingSection.vue";
Expand Down Expand Up @@ -267,16 +252,6 @@ async function clickFetchNameState() {
}
}
async function restartServer() {
isLoading.value = true;
try {
await ServerPrivateService.restartServer();
isLoading.value = false;
} finally {
isLoading.value = false;
}
}
async function batchToggleEnabled(enabled: boolean) {
if (!confirm("Are you sure you want to toggle all printers?")) {
return;
Expand Down

0 comments on commit 745a90a

Please sign in to comment.