patrick/OpenDTU-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extended config API to allow upload of individual files

Browse Source
This commit is contained in:
Thomas Basler 2023-01-05 14:41:15 +01:00
parent 20ae646561
commit af1a2a188e
5 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/WebApi_config.cpp
View File

@ -171,7 +171,12 @@ void WebApiConfigClass::onConfigUpload(AsyncWebServerRequest* request, String fi
if (!index) {
// open the file on first call and store the file handle in the request object
request->_tempFile = LittleFS.open(CONFIG_FILENAME, "w");
if (!request->hasParam("file")) {
request->send(500);
return;
}
String name = "/" + request->getParam("file")->value();
request->_tempFile = LittleFS.open(name, "w");
}
if (len) {

2
webapp/src/locales/de.json
View File

@ -412,6 +412,8 @@
"BackupHeader": "Sicherung: Sicherung der Konfigurationsdatei",
"BackupConfig": "Sicherung der Konfigurationsdatei",
"Backup": "Sichern",
"Restore": "Wiederherstellen",
"NoFileSelected": "Keine Datei Ausgewählt",
"RestoreHeader": "Wiederherstellen: Wiederherstellen der Konfigurationsdatei",
"Back": "Zurück",
"UploadSuccess": "Erfolgreich hochgeladen",

2
webapp/src/locales/en.json
View File

@ -412,6 +412,8 @@
"BackupHeader": "Backup: Configuration File Backup",
"BackupConfig": "Backup the configuration file",
"Backup": "Backup",
"Restore": "Restore",
"NoFileSelected": "No file selected",
"RestoreHeader": "Restore: Restore the Configuration File",
"Back": "Back",
"UploadSuccess": "Upload Success",

2
webapp/src/locales/fr.json
View File

@ -412,6 +412,8 @@
"BackupHeader": "Sauvegarder le fichier de configuration",
"BackupConfig": "Fichier de configuration",
"Backup": "Sauvegarder",
"Restore": "Restore",
"NoFileSelected": "No file selected",
"RestoreHeader": "Restaurer le fichier de configuration",
"Back": "Retour",
"UploadSuccess": "Succès du téléversement",

32
webapp/src/views/ConfigAdminView.vue
View File

@ -51,8 +51,19 @@
</div>
<div v-else-if="!uploading">
<div class="form-group pt-2 mt-3">
<input class="form-control" type="file" ref="file" accept=".json" @change="uploadConfig" />
<div class="row g-3 align-items-center form-group pt-2">
<div class="col-sm">
<select class="form-select" v-model="restoreFileSelect">
<option selected value="config.json">Main Config (config.json)</option>
</select>
</div>
<div class="col-sm">
<input class="form-control" type="file" ref="file" accept=".json" />
</div>
<div class="col-sm">
<button class="btn btn-primary" @click="uploadConfig">{{ $t('configadmin.Restore') }}
</button>
</div>
</div>
</div>
@ -135,6 +146,7 @@ export default defineComponent({
file: {} as Blob,
fileList: {} as ConfigFileList,
backupFileSelect: "",
restoreFileSelect: "config.json",
};
},
mounted() {
@ -197,11 +209,14 @@ export default defineComponent({
uploadConfig(event: Event | null) {
this.uploading = true;
const formData = new FormData();
if (event !== null) {
const target = event.target as HTMLInputElement;
if (target.files !== null) {
this.file = target.files[0];
}
const target = this.$refs.file as HTMLInputElement; // event.target as HTMLInputElement;
if (target.files !== null && target.files?.length > 0) {
this.file = target.files[0];
} else {
this.UploadError = this.$t("configadmin.NoFileSelected");
this.uploading = false;
this.progress = 0;
return;
}
const request = new XMLHttpRequest();
request.addEventListener("load", () => {
@ -223,7 +238,7 @@ export default defineComponent({
request.withCredentials = true;
formData.append("config", this.file, "config");
request.open("post", "/api/config/upload");
request.open("post", "/api/config/upload?file=" + this.restoreFileSelect);
authHeader().forEach((value, key) => {
request.setRequestHeader(key, value);
});
@ -232,6 +247,7 @@ export default defineComponent({
clear() {
this.UploadError = "";
this.UploadSuccess = false;
this.getFileList();
},
},
});