Skip to content

Commit

Permalink
Fixing styling for incident priority settings, search filter settings…
Browse files Browse the repository at this point in the history 
…, and plugins table (#3918)
  • Loading branch information
@whitdog47 @metroid-samus
whitdog47 authored and metroid-samus committed Nov 29, 2023
1 parent f221d09 commit 884525b
Show file tree
Hide file tree
Showing 3 changed files with 94 additions and 92 deletions.
45 changes: 25 additions & 20 deletions src/dispatch/static/dispatch/src/incident/priority/Table.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,31 +76,36 @@
<v-col>
<div class="text-body-1 ml-4 mt-6">Incident priority settings</div>
<v-row align="start" no-gutters>
<v-col class="d-flex justify-start">
<v-checkbox
class="ml-10 mr-5"
v-model="restrictStable"
label="Restrict Stable status to this priority:"
@update:model-value="updateStablePriority"
/>
<v-tooltip max-width="500px" open-delay="50" location="bottom">
<template #activator="{ props }">
<v-icon v-bind="props">mdi-information</v-icon>
</template>
<span>
If activated, Dispatch will automatically change Stable incidents to this priority.
Also, users will not be permitted to change the priority on Stable incidents.
</span>
</v-tooltip>
<span max-width="500px">
<div class="d-flex justify-content-start">
<v-col cols="10" class="mt-2">
<v-checkbox
class="ml-10 mr-5"
v-model="restrictStable"
label="Restrict Stable status to this priority:"
@update:model-value="updateStablePriority"
/>
</v-col>
<v-col class="mt-5">
<v-tooltip max-width="500px" open-delay="50" location="bottom">
<template #activator="{ props }">
<v-icon v-bind="props">mdi-information</v-icon>
</template>
<span>
If activated, Dispatch will automatically change Stable incidents to this
priority. Also, users will not be permitted to change the priority on Stable
incidents.
</span>
</v-tooltip>
</v-col>
<v-col cols="6">
<incident-priority-select
class="ml-4"
max-width="400px"
width="400px"
v-model="stablePriority"
:project="project[0]"
/>
</span>
</v-col>
</v-col>
</div>
</v-row>
</v-col>
</v-row>
Expand Down
1 change: 0 additions & 1 deletion src/dispatch/static/dispatch/src/plugin/Table.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
clearable
/>
</v-card-title>
<pre>{{ itemsPerPage }}</pre>
<v-data-table-server
:headers="headers"
:items="items"
Expand Down
140 changes: 69 additions & 71 deletions src/dispatch/static/dispatch/src/search/EditDialog.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,79 +11,77 @@
<v-list-item-title class="text-h6"> Edit </v-list-item-title>
<v-list-item-subtitle>Search Filter</v-list-item-subtitle>

<v-btn
icon
variant="text"
color="info"
:loading="loading"
:disabled="!isValid.value"
@click="save()"
>
<v-icon>mdi-content-save</v-icon>
</v-btn>
<v-btn icon variant="text" color="secondary" @click="closeCreateEdit">
<v-icon>mdi-close</v-icon>
</v-btn>
<template #append>
<v-btn
icon
variant="text"
color="info"
:loading="loading"
:disabled="!isValid.value"
@click="save()"
>
<v-icon>mdi-content-save</v-icon>
</v-btn>
<v-btn icon variant="text" color="secondary" @click="closeCreateEdit">
<v-icon>mdi-close</v-icon>
</v-btn>
</template>
</v-list-item>
<v-card>
<v-card-text>
<v-container>
<v-row>
<v-col cols="12">
<v-text-field
v-model="name"
label="Name"
name="Name"
hint="Name of type."
clearable
required
:rules="[rules.required]"
/>
</v-col>
<v-col cols="12">
<v-textarea
v-model="description"
label="Description"
name="Description"
hint="Description of type."
clearable
required
:rules="[rules.required]"
/>
</v-col>
</v-row>
<div class="text-body-2 ml-1 mt-2">Individuals</div>
<v-divider class="mt-2" />
<v-list style="max-height: 500px" class="overflow-y-auto">
<v-list-item v-for="individual in individuals" :key="individual.id">
<incident-participant :participant="convertToParticipant(individual)" />
</v-list-item>
</v-list>
<div class="text-body-2 ml-1 mt-2">Teams</div>
<v-divider class="mt-2" />
<v-list style="max-height: 500px" class="overflow-y-auto">
<v-list-item v-for="team in teams" :key="team.id">
<v-list-item-title>{{ team.name }}</v-list-item-title>
</v-list-item>
</v-list>
<div class="text-body-2 ml-1 mt-2">Services</div>
<v-divider class="mt-2" />
<v-list style="max-height: 500px" class="overflow-y-auto">
<v-list-item v-for="service in services" :key="service.id">
<v-list-item-title>{{ service.name }}</v-list-item-title>
</v-list-item>
</v-list>
<div class="text-body-2 ml-1 mt-2">Notifications</div>
<v-divider class="mt-2" />
<v-list style="max-height: 500px" class="overflow-y-auto">
<v-list-item v-for="notification in notifications" :key="notification.id">
<v-list-item-title>{{ notification.name }}</v-list-item-title>
</v-list-item>
</v-list>
</v-container>
</v-card-text>
</v-card>
</template>
<v-container>
<v-row>
<v-col cols="12">
<v-text-field
v-model="name"
label="Name"
name="Name"
hint="Name of type."
clearable
required
:rules="[rules.required]"
/>
</v-col>
<v-col cols="12">
<v-textarea
v-model="description"
label="Description"
name="Description"
hint="Description of type."
clearable
required
:rules="[rules.required]"
/>
</v-col>
</v-row>
<div class="text-body-2 ml-1 mt-2">Individuals</div>
<v-divider class="mt-2" />
<v-list style="max-height: 500px">
<v-list-item v-for="individual in individuals" :key="individual.id">
<incident-participant :participant="convertToParticipant(individual)" />
</v-list-item>
</v-list>
<div class="text-body-2 ml-1 mt-2">Teams</div>
<v-divider class="mt-2" />
<v-list style="max-height: 500px">
<v-list-item v-for="team in teams" :key="team.id">
<v-list-item-title>{{ team.name }}</v-list-item-title>
</v-list-item>
</v-list>
<div class="text-body-2 ml-1 mt-2">Services</div>
<v-divider class="mt-2" />
<v-list style="max-height: 500px">
<v-list-item v-for="service in services" :key="service.id">
<v-list-item-title>{{ service.name }}</v-list-item-title>
</v-list-item>
</v-list>
<div class="text-body-2 ml-1 mt-2">Notifications</div>
<v-divider class="mt-2" />
<v-list style="max-height: 500px">
<v-list-item v-for="notification in notifications" :key="notification.id">
<v-list-item-title>{{ notification.name }}</v-list-item-title>
</v-list-item>
</v-list>
</v-container>
</v-navigation-drawer>
</v-form>
</template>
Expand Down

0 comments on commit 884525b

Please sign in to comment.