Aaltronav/dougal-software
1
0
Fork 0
mirror of https://gitlab.com/wgp/dougal/software.git synced 2025-12-06 10:27:09 +00:00
Code Issues Packages Projects Releases Activity

Refactor the interface between ProjectSettings and subcomponents.

Browse Source 
This is still not set in stone and not fully consistent from one
subcomponent to another, but the general idea is that instead of
passing everything in one property via v-model we use v-bind
instead with a variable list of props depending on the needs of
the subcomponent.

We listen for @input and a new @merge event in order to apply
any changes to the *local* configuration. The local configuration
then needs to be uploaded to the server via a separate step. We
might change this in a later commit, so that changes made in
subcomponents are automatically applied to the local configuration.
This commit is contained in:
D. Berge
2023-11-13 21:00:07 +01:00
parent 13f68d7314
commit 399e86be87
1 changed files with 37 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

165
lib/www/client/source/src/views/ProjectSettings.vue
View File

@@ -55,7 +55,12 @@
</v-col>
<v-col cols="8" v-if="activeComponent">
<component :is="activeComponent" :value="activeValues" @input="save" @close="deselect"></component>
<component
:is="activeComponent"
v-bind="activeValues"
@merge="merge"
@close="deselect"
></component>
</v-col>
<v-col cols="8" v-else>
<v-card>
@@ -206,68 +211,41 @@ export default {
values: (obj) => ({
id: obj?.id,
name: obj?.name
}),
save: async (data, cfg) => {
await this.patch({
id: data.id,
name: data.name,
});
}
})
},
{
id: "groups",
name: "Groups",
values: (obj) => ({
groups: obj?.groups
}),
save: async (data, cfg) => {
await this.patch({
groups: data.groups,
});
}
})
},
{
id: "geodetics",
name: "Geodetics",
values: (obj) => ({
epsg: obj?.epsg
}),
save: async (data, cfg) => {
await this.patch({
epsg: data.epsg
});
}
})
},
{
id: "binning",
name: "Binning",
values: (obj) => {
const data = {...obj.binning};
data.origin = {...obj.binning.origin};
return data;
},
save: async (data, cfg) => {
await this.patch({binning: {...data}});
}
values: (obj) => ({
...obj.binning
})
},
{
id: "input_files",
name: "Input files",
values: obj => ({ path: obj.rootPath}),
save: async (data, cfg) => {
await this.patch({rootPath: data.path});
},
values: obj => ({ rootPath: obj.rootPath}),
children: [
{
id: "preplots",
name: "Preplots",
values: (obj) => ({
preplots: obj.preplots,
preplots: structuredClone(obj.preplots),
rootPath: obj.rootPath
}),
save: async (data, cfg) => {
await this.patch({preplots: [...data.preplots]})
}
})
},
{
id: "raw_data",
@@ -278,16 +256,14 @@ export default {
name: "P1/11",
values: (obj) => ({
rootPath: obj.rootPath,
globs: [...obj.raw.p111.globs],
paths: [...obj.raw.p111.paths],
pattern: structuredClone(obj.raw.p111.pattern)
}),
save: async (data, cfg) => {
await this.patch({raw: {p111: {...data}}});
}
globs: obj.raw.p111.globs,
paths: obj.raw.p111.paths,
pattern: obj.raw?.p111?.pattern,
lineNameInfo: obj.raw?.p111?.lineNameInfo
})
},
{
id: "raw_data_smartsource",
id: "raw_data_smsrc",
name: "Smartsource",
values: (obj) => ({
rootPath: obj.rootPath,
@@ -305,20 +281,8 @@ export default {
values: (obj) => ({
regex: obj.raw.ntbp?.pattern?.regex,
flags: obj.raw.ntbp?.pattern?.flags
}),
save: async (data, cfg) => {
await this.patch({
raw:{
ntbp: {
pattern: {
regex: data.regex,
flags: data.flags
}
}
}
})
}
}
]
},
{
@@ -330,13 +294,10 @@ export default {
name: "P1/11",
values: (obj) => ({
rootPath: obj.rootPath,
globs: [...obj.final.p111.globs],
paths: [...obj.final.p111.paths],
pattern: structuredClone(obj.final.p111.pattern)
}),
save: async (data, cfg) => {
await this.patch({final: {p111: {...data}}});
}
globs: obj.final.p111.globs,
paths: obj.final.p111.paths,
pattern: obj.final.p111.pattern
})
},
{
id: "final_data_pending",
@@ -344,20 +305,8 @@ export default {
values: (obj) => ({
regex: obj.final.pending?.pattern?.regex,
flags: obj.final.pending?.pattern?.flags
}),
save: async (data, cfg) => {
await this.patch({
final:{
pending: {
pattern: {
regex: data.regex,
flags: data.flags
}
}
}
})
}
}
]
},
]
@@ -365,52 +314,19 @@ export default {
{
id: "line_name_format",
name: "Line name format",
values: (obj) => ({...obj.online?.line?.pattern}),
save: async (data, cfg) => {
await this.patch({
online: {
line: {
pattern: {
...data
}
}
}
});
}
values: (obj) => ({
lineNameInfo: obj?.online?.line?.lineNameInfo
})
},
{
id: "planner_settings",
name: "Planner settings",
values: (obj) => ({...obj.planner}),
save: async (data, cfg) => {
await this.patch({
planner: {...data}
});
}
values: (obj) => ({planner: obj?.planner})
},
{
id: "production",
name: "Production settings",
values: (obj) => ({...obj.production}),
save: async (data, cfg) => {
await this.patch({
production: {...data}
});
}
},
{
id: "logging",
name: "Logging",
children: [
{
id: "logging_preset_comments",
name: "Preset comments"
},
{
id: "logging_labels",
name: "Labels"
}
]
values: (obj) => ({production: obj?.production})
},
{
id: "cloud_apis",
@@ -419,10 +335,7 @@ export default {
{
id: "asaqc",
name: "ASAQC",
values: (obj) => ({...obj.asaqc}),
save: async (data, cfg) => {
await this.patch({asaqc: {...cfg}});
}
values: (obj) => ({value: obj?.cloud?.asaqc}),
}
]
}
@@ -530,20 +443,12 @@ export default {
this.active.pop();
},
async save (data) {
console.log("SAVING", data);
if (this.activeItem?.save) {
await this.activeItem.save(data, this.configuration);
/*
const cfg = this.activeItem.save(data, this.configuration);
this.configuration = {...cfg};
this.surveyState = false;
*/
// TODO And now push to the server
}
merge ([path, value]) {
console.log("MERGING", path, value);
deepSet(this.configuration, path, value);
},
// Use to change the project's archival status
async patch (data) {
const url = `/project/${this.$route.params.project}/configuration`;
const init = {