Skip to content

Commit 263c13c

Browse files
committed
fix: #227 minor bugfixes
1 parent 242479f commit 263c13c

File tree

3 files changed

+36
-21
lines changed

3 files changed

+36
-21
lines changed

Diff for: resources/js/Pages/Services/Partials/DeploymentData.vue

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import Select from "@/Components/Select.vue";
77
import SecondaryButton from "@/Components/SecondaryButton.vue";
88
import TextArea from "@/Components/TextArea.vue";
99
import { computed, effect, nextTick, reactive, ref } from "vue";
10-
import { FwbToggle, FwbTooltip } from "flowbite-vue";
1110
import ProcessTabs from "@/Pages/Services/Partials/ProcessTabs.vue";
1211
import DangerButton from "@/Components/DangerButton.vue";
1312
import DialogModal from "@/Components/DialogModal.vue";
@@ -161,6 +160,8 @@ const removeProcess = (index) => {
161160
state.selectedProcessIndex[key] = model.value.processes.length - 1;
162161
}
163162
}
163+
164+
state.selectedProcessIndex["workers"] = 0;
164165
};
165166
166167
const addWorker = () => {
@@ -383,6 +384,7 @@ const selectedWorkerErrors = computed(() => {
383384
block="processes"
384385
:closable="true"
385386
@close="confirmProcessRemoval"
387+
@change="state.selectedProcessIndex['workers'] = 0"
386388
/>
387389

388390
<div class="flex items-center">

Diff for: resources/js/Pages/Services/Partials/ProcessTabs.vue

+8-2
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,18 @@ const props = defineProps({
1313
},
1414
});
1515
16-
const emit = defineEmits(["close"]);
16+
const emit = defineEmits(["close", "change"]);
1717
1818
const handleClose = (index) => {
1919
emit("close", index);
2020
};
2121
22+
const handleChange = (index) => {
23+
model.value.selectedProcessIndex[props.block] = index;
24+
25+
emit("change", index);
26+
};
27+
2228
const canClose = computed(() => {
2329
return props.closable && props.processes.length > 1;
2430
});
@@ -30,7 +36,7 @@ const canClose = computed(() => {
3036
<TabItem
3137
v-for="(process, index) in processes"
3238
:key="process.id"
33-
@click="model.selectedProcessIndex[block] = index"
39+
@click="handleChange(index)"
3440
:active="model.selectedProcessIndex[block] === index"
3541
:closable="canClose"
3642
@close="handleClose(index)"

Diff for: resources/js/Pages/Services/Partials/TemplatePicker.vue

+25-18
Original file line numberDiff line numberDiff line change
@@ -153,30 +153,37 @@ const mapProcessTemplate = (formData, templateSlug, process, newIndex) => {
153153
id: makeId("process"),
154154
name: "process_" + newIndex,
155155
placementNodeId: null,
156-
dockerRegistryId: null,
157-
dockerImage: "",
158-
releaseCommand: {
159-
command: "",
160-
},
161-
command: "",
162-
healthcheck: {
163-
command: null,
164-
interval: 10,
165-
timeout: 5,
166-
retries: 10,
167-
startPeriod: 60,
168-
startInterval: 10,
169-
},
170-
backups: [],
171-
workers: [],
172-
launchMode: "daemon",
173156
configFiles: [],
174157
secretFiles: [],
175158
ports: [],
176-
replicas: 1,
177159
redirectRules: [],
178160
fastCgi: null,
179161
...process.data,
162+
workers: process.data.workers.map((worker, idx) => {
163+
return {
164+
id: makeId("worker"),
165+
launchMode: "daemon",
166+
replicas: 1,
167+
dockerRegistryId: null,
168+
dockerImage: "",
169+
command: null,
170+
...worker,
171+
name: idx === 0 ? "main" : worker.name || "worker_" + idx,
172+
releaseCommand: {
173+
command: null,
174+
...worker.releaseCommand,
175+
},
176+
healthcheck: {
177+
interval: 10,
178+
timeout: 5,
179+
retries: 10,
180+
startPeriod: 60,
181+
startInterval: 10,
182+
command: null,
183+
...worker.healthcheck,
184+
},
185+
};
186+
}),
180187
rewriteRules:
181188
process.data.rewriteRules?.map((rule) => {
182189
return {

0 commit comments

Comments
 (0)