Skip to content

Commit 60135db

Browse files
author
Iurii Karpov
committed
TM-123: Fix default settings for task creating process and also editing data
1 parent 4dcbdb6 commit 60135db

2 files changed

Lines changed: 37 additions & 12 deletions

File tree

‎src/actions/tmgr/settings.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export interface FormSetting {
99
}
1010

1111
export interface Setting extends Omit<FormSetting, 'value'> {
12-
component_type: 'time_in_seconds' | 'integer';
12+
component_type: 'time_in_seconds' | 'integer' | 'select';
1313
custom_value_available: boolean;
1414
default_values: any[];
1515
rules: string;

‎src/components/SettingsComponent.vue‎

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</span>
3030
</div>
3131

32-
<div v-for="(setting, index) in settings" id="settings" class="mt-4">
32+
<div v-for="setting in settings" :key="setting.id" id="settings" class="mt-4">
3333
<label
3434
:for="`setting-${setting.id}`"
3535
class="mb-2 block text-left text-sm font-bold"
@@ -45,7 +45,7 @@
4545
/>
4646
<template v-else-if="setting.component_type === 'select'">
4747
<Select
48-
v-model="settings.value"
48+
v-model="setting.value"
4949
:options="
5050
setting.default_values.map((val) => ({
5151
label: val.value,
@@ -103,9 +103,9 @@
103103
Setting,
104104
updateOneTaskSettings,
105105
} from '@/actions/tmgr/settings';
106-
import { onBeforeMount, ref } from 'vue';
106+
import { onBeforeMount, ref, watch } from 'vue';
107107
import { Task } from '@/actions/tmgr/tasks';
108-
import { CogIcon, XMarkIcon } from '@heroicons/vue/20/solid';
108+
import { CogIcon } from '@heroicons/vue/20/solid';
109109
import {
110110
Dialog,
111111
DialogContent,
@@ -115,29 +115,54 @@
115115
DialogTitle,
116116
DialogTrigger,
117117
} from '@/components/ui/dialog';
118-
import { Button } from '@/components/ui/button';
119118
import Select from '@/components/general/Select.vue';
120119
121120
const emit = defineEmits(['close']);
122121
122+
interface SettingWithValue extends Setting {
123+
value: any;
124+
}
125+
123126
interface Props {
124127
form: Task;
125128
}
126129
127130
const props = defineProps<Props>();
128-
const settings = ref<Setting[]>([]);
131+
const settings = ref<SettingWithValue[]>([]);
132+
const settingsSchema = ref<Setting[]>([]);
129133
130134
onBeforeMount(async () => {
131-
await loadTaskSettings();
135+
settingsSchema.value = await getTaskSettings();
136+
mergeSettingsWithFormValues();
132137
});
133138
134-
async function loadTaskSettings() {
135-
settings.value = await getTaskSettings();
139+
watch(
140+
() => props.form.settings,
141+
() => {
142+
mergeSettingsWithFormValues();
143+
},
144+
{ deep: true }
145+
);
146+
147+
function mergeSettingsWithFormValues() {
148+
if (!settingsSchema.value.length) return;
149+
150+
settings.value = settingsSchema.value.map((setting: Setting) => {
151+
const taskSetting = props.form.settings?.find(
152+
(s: any) => s.id === setting.id || s.key === setting.key
153+
) as any;
154+
155+
return {
156+
...setting,
157+
value: taskSetting?.value ?? taskSetting?.pivot?.value ?? '',
158+
};
159+
});
136160
}
137161
138-
async function saveSettings(settings: FormSetting) {
162+
async function saveSettings(formSettings: FormSetting) {
163+
if (!props.form.id) return;
139164
try {
140-
await updateOneTaskSettings(props.form.id, settings);
165+
await updateOneTaskSettings(props.form.id, formSettings);
141166
} catch (e) {
142167
console.error(e);
143168
throw e;

0 commit comments

Comments
 (0)