Skip to content

Commit a42668d

Browse files
committed
4.4.2 release
1 parent 45082dd commit a42668d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+3896
-567
lines changed

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,10 @@
4848
"@vue/babel-preset-jsx": "^1.2.4",
4949
"axios": "^1.6.2",
5050
"chart.js": "^3.9.1",
51+
"chartjs-adapter-date-fns": "^3.0.0",
5152
"colors": "1.4.0",
5253
"core-js": "^3.21.1",
54+
"date-fns": "4.1.0",
5355
"dompurify": "^2.4.1",
5456
"html-to-image": "^1.11.11",
5557
"idb": "^7.0.1",
@@ -75,6 +77,7 @@
7577
"vue-property-decorator": "^9.1.2",
7678
"vue-router": "^3.5.2",
7779
"vuetify": "~2.6.16",
80+
"vuewordcloud": "17.12.23",
7881
"vuex": "^3.6.2",
7982
"vuex-class": "^0.3.2"
8083
},

src/App.vue

Lines changed: 7 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,8 @@
44
<ScotNavBar style="z-index: 99;"/>
55
<v-main style="max-height: 100vh">
66
<QuickSettingsDrawer />
7-
<v-dialog v-if="searchResults != undefined" :value="showSearchOverlay">
8-
<v-card rounded :light="darkMode" :dark="!darkMode" v-click-outside="onClickOutsideOverlay" elevation="5">
9-
<v-card-title class="text-decoration-underline">Search Results</v-card-title>
10-
<v-card-subtitle> {{ searchResults.length }} results </v-card-subtitle>
11-
<v-list two-line>
12-
<v-list-item v-for="(result, index) in searchResults" :key="result.entry_id" :href="constructSearchLink(result.target_type, result.target_id, result.entry_id)" :link=true target="_blank">
13-
<v-list-item-icon>
14-
<v-icon> mdi-magnify</v-icon>
15-
</v-list-item-icon>
16-
<v-list-item-content>
17-
<v-list-item-title class="text-decoration-underline" v-html="result.target_type.charAt(0).toUpperCase() + result.target_type.slice(1) + ' ' + result.target_id + ' : ' + result.parent_text"></v-list-item-title>
18-
<v-list-item-subtitle>
19-
<i>
20-
{{ "Entry " }}
21-
<b>{{ result.entry_id}} </b>
22-
</i>
23-
</v-list-item-subtitle>
24-
<v-list-item-subtitle v-html="result.entry_text">
25-
</v-list-item-subtitle>
26-
<v-divider inset
27-
v-if="index < searchResults.length - 1"
28-
:key="index"></v-divider>
29-
</v-list-item-content>
30-
</v-list-item>
31-
</v-list>
32-
</v-card>
33-
</v-dialog>
34-
<router-view>
35-
</router-view>
7+
<SearchDialog v-if="showSearchOverlay"/>
8+
<router-view></router-view>
369
</v-main>
3710
<v-footer app padless>
3811
<v-card elevation=0 width="100%" class="text-center">
@@ -43,7 +16,6 @@
4316
<v-snackbar v-model="showErrorPopup"
4417
multi-line>
4518
{{ errorText }}
46-
4719
<template v-slot:action="{ attrs }">
4820
<v-btn color="red"
4921
text
@@ -62,14 +34,16 @@
6234
import Component from 'vue-class-component';
6335
import ScotNavBar from '@/components/NavigationComponents/ScotNavBar.vue'
6436
import QuickSettingsDrawer from '@/components/UserSettingsComponent/QuickSettingsDrawer.vue'
65-
import { Action, Getter, Mutation } from 'vuex-class';
37+
import SearchDialog from '@/components/IRElementComponents/SearchDialog.vue'
38+
import { Getter, Mutation } from 'vuex-class';
6639
import { Watch } from 'vue-property-decorator'
6740
import { IRElementType } from './store/modules/IRElements/types';
6841
6942
@Component({
7043
components: {
7144
ScotNavBar,
72-
QuickSettingsDrawer
45+
QuickSettingsDrawer,
46+
SearchDialog
7347
},
7448
})
7549
export default class App extends Vue {
@@ -78,11 +52,8 @@
7852
@Getter('darkMode', { 'namespace': 'user' }) darkMode: boolean
7953
@Getter('firehose', { 'namespace': 'user' }) firehose: EventSource | undefined
8054
@Getter('error') error: boolean
81-
@Getter('searchResults', { 'namespace': 'user' }) searchResults: any
82-
@Action('clearSearchResults', { 'namespace': 'user' }) clearSearchResults: CallableFunction
8355
@Getter('errorText') errorText: string
8456
@Getter('showSearchOverlay', { 'namespace': 'user' }) showSearchOverlay: boolean
85-
@Action('changeShowSearchOverlay', { 'namespace': 'user' }) changeShowSearchOverlay: CallableFunction
8657
@Mutation('clearError') clearError: CallableFunction
8758
metaInfo() {
8859
return { meta: [{ "http-equiv": "Content-Security-Policy", "content": "upgrade-insecure-requests" }] }
@@ -104,36 +75,11 @@
10475
}
10576
}
10677
107-
constructSearchLink(targetType: string, targetId: number, entryId: number): string {
108-
return window.location.protocol + "//" + window.location.host + "/#/" + this.targetTypePluralized(targetType) + "/" + targetId + "/" + entryId
109-
}
110-
111-
targetTypePluralized(targetType: string): string | null {
112-
if (targetType == IRElementType.Entity.toLowerCase()) {
113-
return "entities"
114-
}
115-
else if (targetType == IRElementType.Dispatch.toLowerCase()) {
116-
return "dispatches"
117-
}
118-
else if (targetType == IRElementType.EntityClass.toLowerCase()) {
119-
return "entity classes"
120-
}
121-
else if (targetType == IRElementType.Entry.toLowerCase()) {
122-
return "entries"
123-
}
124-
else {
125-
return targetType + "s"
126-
}
127-
}
128-
129-
async onClickOutsideOverlay() {
130-
await this.changeShowSearchOverlay({ value: false })
131-
}
132-
13378
@Watch('darkMode')
13479
onDarkModeChange() {
13580
this.$vuetify.theme.dark = this.darkMode
13681
}
82+
13783
transitionName() {
13884
if (this.$route.meta && this.$route.meta.transitionName != undefined) {
13985
return this.$route.meta.transitionName

0 commit comments

Comments
 (0)