Skip to content

Dumps page modal issue #426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: 1110-vue3
Choose a base branch
from
Open

Dumps page modal issue #426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77148f3
Dumps page modal issue
vedangimittal Jun 12, 2025
28dcaf1
Fixed dumps list and required checkbox issue
vedangimittal Jun 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions src/views/Logs/Dumps/DumpsForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@
</b-button>
</BForm>
<modal-confirmation
v-modal="modalConfirmation"
v-model="modalConfirmation"
@ok="createSystemDump($t(`pageDumps.form.${selectedDumpType}Dump`))"
/>
<modal-partition-dump-confirmation
v-modal="modalPartition"
v-model="modalPartition"
:selected="selectedDumpType"
@ok="
selectedDumpType === 'partition'
Expand Down Expand Up @@ -109,8 +109,8 @@ const resourceSelectorValue = ref(null);
const resourcePasswordValue = ref(null);
const dumpTypeOptions = ref([]);
const taskProgress = ref('');
const modalConfirmation = ref('false')
const modalPartition = ref('false')
const modalConfirmation = ref(false)
const modalPartition = ref(false)

onBeforeMount(() => {
checkForUserData();
Expand All @@ -119,6 +119,7 @@ onBeforeMount(() => {
global.getHmcManaged(),
global.getBootProgress(),
ibmiServiceFunctions.getAvailableServiceFunctions(),
serverBootSettings.fetchBiosAttributes(),
serverBootSettings.getBiosAttributes,
]);
});
Expand Down Expand Up @@ -334,10 +335,10 @@ const isFunctionDisabled = (value) => {
}
};
const showConfirmationModal = () => {
modalConfirmation=True
modalConfirmation.value = true
};
const showPartitionDumpConfirmationModal = () => {
modalPartition=True
modalPartition.value = true
};
const createSystemDump = (dumpType) => {
dumps.createSystemDump(dumpType)
Expand All @@ -349,4 +350,4 @@ const createSystemDump = (dumpType) => {
)
.catch(({ message }) => errorToast(message));
};
</script>
</script>
15 changes: 8 additions & 7 deletions src/views/Logs/Dumps/DumpsModalConfirmation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
id="modal-confirmation"
ref="modal"
:title="$t('pageDumps.modal.initiateSystemDump')"
@hidden="resetForm"
@show="resetForm"
>
<p>
<strong>
Expand All @@ -18,7 +18,7 @@
<status-icon status="danger" />
{{ $t('pageDumps.modal.initiateSystemDumpMessage3') }}
</p>
<BFormCheckbox v-model="confirmed" @input="v$.confirmed.$touch()">
<BFormCheckbox v-model="confirmed" @update:modelValue="v$.confirmed.$touch()">
{{ $t('pageDumps.modal.initiateSystemDumpMessage4') }}
</BFormCheckbox>
<BFormInvalidFeedback
Expand All @@ -27,11 +27,11 @@
>
{{ $t('global.form.required') }}
</BFormInvalidFeedback>
<template #modal-footer="{ cancel }">
<template #footer="{ cancel }">
<BButton variant="secondary" @click="cancel()">
{{ $t('global.action.cancel') }}
</BButton>
<BButton variant="danger" @click="handleSubmit">
<BButton variant="danger" @click="handleSubmit()">
{{ $t('pageDumps.form.initiateDump') }}
</BButton>
</template>
Expand All @@ -43,7 +43,8 @@ import { ref, computed, nextTick } from 'vue';
import StatusIcon from '@/components/Global/StatusIcon.vue';
import useVuelidateComposable from '@/components/Composables/useVuelidateComposable';
import { useVuelidate } from '@vuelidate/core';
import eventBus from '@/eventBus';

const emit = defineEmits(['ok']);

const { getValidationState } = useVuelidateComposable();

Expand All @@ -68,8 +69,8 @@ const closeModal = () => {
};
const handleSubmit = () => {
v$.value.$touch();
if ( v$.value.$invalid) return;
eventBus.emit('ok');
if (v$.value.$invalid) return;
emit('ok');
closeModal();
};
const resetForm = () => {
Expand Down
13 changes: 7 additions & 6 deletions src/views/Logs/Dumps/DumpsPartitionModalConfirmation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
? $t('pageDumps.modal.initiatePartitionDump')
: $t('pageDumps.modal.initiateRetryPartitionDump')
"
@hidden="resetForm"
@show="resetForm"
>
<p>
<strong>
Expand All @@ -19,7 +19,7 @@
<status-icon status="danger" />
{{ $t('pageDumps.modal.initiatePartitionDumpMessage1') }}
</p>
<BFormCheckbox v-model="confirmed" @input="v$.confirmed.$touch()">
<BFormCheckbox v-model="confirmed" @update:modelValue="v$.confirmed.$touch()">
{{ $t('pageDumps.modal.initiatePartitionDumpMessage2') }}
</BFormCheckbox>
<BFormInvalidFeedback
Expand All @@ -28,11 +28,11 @@
>
{{ $t('global.form.required') }}
</BFormInvalidFeedback>
<template #modal-footer="{ cancel }">
<template #footer="{ cancel }">
<BButton variant="secondary" @click="cancel()">
{{ $t('global.action.cancel') }}
</BButton>
<BButton variant="danger" @click="handleSubmit">
<BButton variant="danger" @click="handleSubmit()">
{{ $t('pageDumps.form.initiateDump') }}
</BButton>
</template>
Expand All @@ -44,7 +44,8 @@ import { ref, computed, nextTick } from 'vue';
import StatusIcon from '@/components/Global/StatusIcon.vue';
import useVuelidateComposable from '@/components/Composables/useVuelidateComposable';
import { useVuelidate } from '@vuelidate/core';
import eventBus from '@/eventBus';

const emit = defineEmits(['ok']);

const { getValidationState } = useVuelidateComposable();

Expand Down Expand Up @@ -77,7 +78,7 @@ const closeModal = () => {
const handleSubmit = () => {
v$.value.$touch();
if (v$.value.$invalid) return;
eventBus.emit('ok');
emit('ok');
closeModal();
};
const resetForm = () => {
Expand Down