Skip to content
This repository was archived by the owner on Sep 3, 2025. It is now read-only.

Fixing selects when not yet loaded #5380

Merged
whitdog47 merged 3 commits into from
Oct 23, 2024
Merged

Fixing selects when not yet loaded #5380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
505a49a
Fixing selects when not yet loaded
kevgliss Oct 22, 2024
0c54b3e
Merge branch 'master' into bugfix(ui)/incident-select
kevgliss Oct 22, 2024
285f97d
Merge branch 'master' into bugfix(ui)/incident-select
whitdog47 Oct 23, 2024
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
12 changes: 9 additions & 3 deletions src/dispatch/static/dispatch/src/case/priority/CasePrioritySelect.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,15 @@ export default {
project: {
handler(newProject) {
if (newProject?.id !== this.lastProjectId) {
this.lastProjectId = newProject?.id
this.resetSelection()
this.fetchData()
// Check if we're moving to a valid project (not null)
if (this.lastProjectId) {
this.lastProjectId = newProject.id
this.resetSelection()
this.fetchData()
} else {
// If new project is null/undefined, just update lastProjectId
this.lastProjectId = null
}
}
this.validatePriority()
},
Expand Down
12 changes: 9 additions & 3 deletions src/dispatch/static/dispatch/src/case/type/CaseTypeSelect.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,15 @@ export default {
project: {
handler(newProject) {
if (newProject?.id !== this.lastProjectId) {
this.lastProjectId = newProject?.id
this.resetSelection()
this.fetchData()
// Check if we're moving to a valid project (not null)
if (this.lastProjectId) {
this.lastProjectId = newProject.id
this.resetSelection()
this.fetchData()
} else {
// If new project is null/undefined, just update lastProjectId
this.lastProjectId = null
}
}
this.validateType()
},
Expand Down
13 changes: 10 additions & 3 deletions src/dispatch/static/dispatch/src/incident/priority/IncidentPrioritySelect.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,17 @@ export default {
project: {
handler(newProject) {
if (newProject?.id !== this.lastProjectId) {
this.lastProjectId = newProject?.id
this.resetSelection()
this.fetchData()
// Check if we're moving to a valid project (not null)
if (this.lastProjectId) {
this.lastProjectId = newProject.id
this.resetSelection()
this.fetchData()
} else {
// If new project is null/undefined, just update lastProjectId
this.lastProjectId = null
}
}

this.validatePriority()
},
deep: true,
Expand Down
12 changes: 9 additions & 3 deletions src/dispatch/static/dispatch/src/incident/type/IncidentTypeSelect.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,15 @@ export default {
project: {
handler(newProject) {
if (newProject?.id !== this.lastProjectId) {
this.lastProjectId = newProject?.id
this.clearSelection()
this.fetchData()
// Check if we're moving to a valid project (not null)
if (this.lastProjectId) {
this.lastProjectId = newProject.id
this.resetSelection()
this.fetchData()
} else {
// If new project is null/undefined, just update lastProjectId
this.lastProjectId = null
}
}
},
},
Expand Down
Loading