Skip to content

Commit

Permalink
Addressing many of the comments from kevgliss
Browse files Browse the repository at this point in the history
  • Loading branch information
wssheldon committed Nov 29, 2023
1 parent 2d263a0 commit 84d8f52
Show file tree
Hide file tree
Showing 20 changed files with 95 additions and 459 deletions.
27 changes: 3 additions & 24 deletions src/dispatch/static/dispatch/src/case/CaseAttributesDrawer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ watchEffect(() => {
</div>

<v-card flat color="grey-lighten-5" class="rounded-lg mt-6 ml-2 mr-2">
<tiptap
<RichEditor
:resolution="true"
v-model="modelValue.resolution"
style="min-height: 400px; margin: 10px; font-size: 0.9125rem; font-weight: 400"
Expand All @@ -206,7 +206,8 @@ watchEffect(() => {
</div>
</template>

<style scope>
<style lang="scss" scoped>
@import "@/styles/index.scss";
.dispatch-font {
color: rgb(107, 111, 118) !important;
font-size: 0.8125rem !important;
Expand All @@ -218,26 +219,4 @@ watchEffect(() => {
font-size: 1.2125rem !important;
font-weight: 500;
}
.dispatch-button-out {
text-transform: none !important;
display: inline-flex !important;
align-items: center !important;
justify-content: center !important;
margin: 0px !important;
font-weight: 500px !important;
line-height: normal !important;
transition-property: border, background-color, color, opacity !important;
transition-duration: 0.15s !important;
user-select: none !important;
box-shadow: rgba(0, 0, 0, 0.09) 0px 1px 4px !important;
background-color: rgb(255, 255, 255) !important;
border: 1px solid rgb(223, 225, 228) !important;
border-radius: 4px !important;
color: rgb(60, 65, 73) !important;
min-width: 28px !important;
height: 28px !important;
padding: 0px 14px !important;
font-size: 0.75rem !important;
}
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -29,42 +29,18 @@ const selectCaseResolution = async (caseResolutionName: string) => {
<template>
<SearchPopover
:items="caseResolutions"
class="dispatch-button-out"
class="dispatch-button"
:initialValue="caseResolution || 'Resolution Reason'"
@item-selected="selectCaseResolution"
label="Set resolution..."
:hotkeys="[]"
>
<template v-slot:default="{ item }">
<v-list-item-title class="item-title-font">{{ item }}</v-list-item-title>
<v-list-item-title class="dispatch-text-title">{{ item }}</v-list-item-title>
</template>
</SearchPopover>
</template>

<style scoped>
.item-title-font {
font-size: 13px !important;
}
.dispatch-button-out {
text-transform: none !important;
display: inline-flex !important;
align-items: center !important;
justify-content: center !important;
margin: 0px !important;
font-weight: 500px !important;
line-height: normal !important;
transition-property: border, background-color, color, opacity !important;
transition-duration: 0.15s !important;
user-select: none !important;
box-shadow: rgba(0, 0, 0, 0.09) 0px 1px 4px !important;
background-color: rgb(255, 255, 255) !important;
border: 1px solid rgb(223, 225, 228) !important;
border-radius: 4px !important;
color: rgb(60, 65, 73) !important;
min-width: 28px !important;
height: 28px !important;
padding: 0px 14px !important;
font-size: 0.75rem !important;
}
<style lang="scss" scoped>
@import "@/styles/index.scss";
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<span style="font-size: 0.8rem" class="pl-8">
{{ item.signal.name }}
</span>
<span style="font-size: 0.75rem" class="pl-1">
<span class="pl-1 dispatch-text-paragraph">
· {{ formatRelativeDate(item.created_at) }}
</span>
<!-- Other data fields... -->
Expand All @@ -25,7 +25,7 @@
<!-- Column for Raw Signal Viewer -->
<v-col cols="9">
<v-card elevation="0" class="signal-card pt-2">
<span style="font-size: 0.75rem">
<span class="dispatch-text-paragraph">
<!-- {{ selectedItem.signal.name }} -->
</span>
<raw-signal-viewer :value="selectedItem" />
Expand All @@ -41,7 +41,6 @@ import { useRoute, useRouter } from "vue-router"
import { formatRelativeDate } from "@/filters"
import RawSignalViewer from "@/signal/NewRawSignalViewer.vue"
import HoverCard from "@/components/HoverCard.vue"
// Define props
const props = withDefaults(
Expand Down Expand Up @@ -108,7 +107,8 @@ watch(
)
</script>

<style scoped>
<style lang="scss" scoped>
@import "@/styles/index.scss";
.signal-card {
border: 0.5px solid rgb(216, 216, 216) !important;
border-radius: 8px !important;
Expand Down
101 changes: 0 additions & 101 deletions src/dispatch/static/dispatch/src/case/CaseTimelineTabOld.vue

This file was deleted.

6 changes: 3 additions & 3 deletions src/dispatch/static/dispatch/src/case/EditSheet.vue
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<case-participants-tab />
</v-window-item>
<v-window-item key="timeline">
<case-timeline-tab-old />
<case-timeline-tab-v1 />
</v-window-item>
<v-window-item key="workflow_instances">
<workflow-instance-tab v-model="workflow_instances" />
Expand Down Expand Up @@ -84,7 +84,7 @@ import { formatRelativeDate } from "@/filters"
import CaseDetailsTab from "@/case/DetailsTab.vue"
import CaseParticipantsTab from "@/case/ParticipantsTab.vue"
import CaseResourcesTab from "@/case/ResourcesTab.vue"
import CaseTimelineTabOld from "@/case/CaseTimelineTabOld.vue"
import CaseTimelineTabV1 from "@/case/CaseTimelineTabV1.vue"
import WorkflowInstanceTab from "@/workflow/WorkflowInstanceTab.vue"
import SignalInstanceTab from "@/signal/SignalInstanceTab.vue"
import EntitiesTab from "@/entity/EntitiesTab.vue"
Expand All @@ -96,7 +96,7 @@ export default {
CaseDetailsTab,
CaseResourcesTab,
CaseParticipantsTab,
CaseTimelineTabOld,
CaseTimelineTabV1,
WorkflowInstanceTab,
SignalInstanceTab,
EntitiesTab,
Expand Down
6 changes: 3 additions & 3 deletions src/dispatch/static/dispatch/src/case/Page.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<CaseAttributesDrawer v-model="caseDetails" :open="isDrawerOpen" />
<VDivider />
<div class="container mx-auto px-4">
<Tiptap :title="true" v-model="caseDetails.title" class="pl-8 pb-6 pt-6" />
<Tiptap :description="true" v-model="caseDetails.description" class="pl-8 pb-6" />
<RichEditor :title="true" v-model="caseDetails.title" class="pl-8 pb-6 pt-6" />
<RichEditor :description="true" v-model="caseDetails.description" class="pl-8 pb-6" />
<CaseStatusSelectGroup v-model="caseDetails" class="pl-4 pb-8" />
<CaseTabs :loading="loading" v-model="caseDetails" />
</div>
Expand All @@ -27,7 +27,7 @@ import CaseApi from "@/case/api"
import CaseAttributesDrawer from "@/case/CaseAttributesDrawer.vue"
import PageHeader from "@/case//PageHeader.vue"
import CaseTabs from "@/case/CaseTabs.vue"
import Tiptap from "@/components/Tiptap.vue"
import RichEditor from "@/components/RichEditor.vue"
import CaseStatusSelectGroup from "@/case/CaseStatusSelectGroup.vue"
const route = useRoute()
Expand Down
1 change: 1 addition & 0 deletions src/dispatch/static/dispatch/src/case/PageHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import { useRoute } from "vue-router"
import { computed, ref } from "vue"
import LockButton from "@/components/LockButton.vue"
import EscalateButton from "@/case/EscalateButton.vue"
import FancyTooltip from "@/components/FancyTooltip.vue"
import ParticipantAvatarGroup from "@/participant/ParticipantAvatarGroup.vue"
import CaseApi from "@/case/api"
Expand Down
26 changes: 4 additions & 22 deletions src/dispatch/static/dispatch/src/case/TimelineTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ const menu = ref(false)
<v-row>
<v-col cols="12">
<div>
<span style="font-size: 0.75rem">
<span class="dispatch-text-paragraph">
<b>
{{ sourceIconMap[event.source]?.sourceName || event.source }}
</b>
Expand Down Expand Up @@ -135,25 +135,7 @@ const menu = ref(false)
</v-container>
</template>

<style scoped src="@/styles/timeline.css">
.cn-button {
border-radius: 4px !important;
font-weight: 500 !important;
line-height: normal !important;
border: 1px solid rgb(223, 225, 228) !important;
box-shadow: rgba(0, 0, 0, 0.09) 0px 1px 4px !important;
background-color: rgb(255, 255, 255) !important;
color: rgb(60, 65, 73) !important;
height: 28px !important;
padding: 0px 14px !important;
}
.dispatch-side-card {
backdrop-filter: blur(12px) saturate(190%) contrast(50%) brightness(130%) !important;
border: 0.5px solid rgb(216, 216, 216) !important;
border-radius: 8px !important;
box-shadow: rgba(0, 0, 0, 0.09) 0px 3px 12px !important;
color: rgb(60, 65, 73) !important;
opacity: 2 !important;
}
<style lang="scss" scoped>
@import "@/styles/index.scss";
@import "@/styles/timeline.css";
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,11 @@ const selectCasePriority = async (casePriorityName: string) => {
:hotkeys="[]"
>
<template v-slot:default="{ item }">
<v-list-item-title class="item-title-font">{{ item }}</v-list-item-title>
<v-list-item-title class="dispatch-text-title">{{ item }}</v-list-item-title>
</template>
</SearchPopover>
</template>

<style scoped>
.item-title-font {
font-size: 13px !important;
}
<style lang="scss" scoped>
@import "@/styles/index.scss";
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,11 @@ const selectCaseSeverity = async (caseSeverityName: string) => {
:hotkeys="[]"
>
<template v-slot:default="{ item }">
<v-list-item-title class="item-title-font">{{ item }}</v-list-item-title>
<v-list-item-title class="dispatch-text-title">{{ item }}</v-list-item-title>
</template>
</SearchPopover>
</template>

<style scoped>
.item-title-font {
font-size: 13px !important;
}
<style lang="scss" scoped>
@import "@/styles/index.scss";
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,11 @@ const selectCaseType = async (caseTypeName: string) => {
:hotkeys="[]"
>
<template v-slot:default="{ item }">
<v-list-item-title class="item-title-font">{{ item }}</v-list-item-title>
<v-list-item-title class="dispatch-text-title">{{ item }}</v-list-item-title>
</template>
</SearchPopover>
</template>

<style scoped>
.item-title-font {
font-size: 13px !important;
}
<style lang="scss" scoped>
@import "@/styles/index.scss";
</style>
21 changes: 0 additions & 21 deletions src/dispatch/static/dispatch/src/components/EscalateButton.vue

This file was deleted.

Loading

0 comments on commit 84d8f52

Please sign in to comment.