4.3 Release

Author: toddbruner

.eslintrc.js

@@ -22,7 +22,8 @@ module.exports = {
         "allowDestructuring": true, // Allow `const { props, state } = this`; false by default
         "allowedNames": ["vm"] // Allow `const vm= this`; `[]` by default
       }
-    ]
+    ],
+    "vue/valid-v-slot": ["error", {"allowModifiers": true}]
   },
   overrides: [
     {
@@ -34,5 +35,5 @@ module.exports = {
         jest: true
       }
     }
-  ]
+  ],
 }

package.json

@@ -41,6 +41,7 @@
     "@ckeditor/ckeditor5-theme-lark": "^35.0.0",
     "@ckeditor/ckeditor5-upload": "^35.0.0",
     "@ckeditor/ckeditor5-vue2": "^3.0.0",
+    "@types/leaflet": "^1.9.14",
     "@types/marked": "^4.0.7",
     "@types/qs": "^6.9.7",
     "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1",
@@ -50,7 +51,9 @@
     "colors": "1.4.0",
     "core-js": "^3.21.1",
     "dompurify": "^2.4.1",
+    "html-to-image": "^1.11.11",
     "idb": "^7.0.1",
+    "leaflet": "^1.9.4",
     "localforage": "^1.10.0",
     "marked": "^4.2.5",
     "postcss": "^8.4.31",
@@ -66,7 +69,6 @@
     "vue-cookies": "^1.7.4",
     "vue-final-modal": "^2.4.3",
     "vue-js-modal": "^2.0.1",
-    "vue-matomo": "^4.1.0",
     "vue-meta": "^2.4.0",
     "vue-observe-visibility": "^1.0.0",
     "vue-pdf-embed": "^1.1.4",

public/layers-2x.png

@@ -1,7 +1,7 @@
 <!-- App.vue -->
 <template>
     <v-app>
-        <ScotNavBar />
+        <ScotNavBar style="z-index: 99;"/>
         <v-main style="max-height: 100vh">
             <QuickSettingsDrawer />
             <v-dialog v-if="searchResults != undefined" :value="showSearchOverlay">

public/layers.png

@@ -90,6 +90,13 @@ export default (axios: AxiosStatic) => ({
             method: 'GET',
             withCredentials: true
         })
+    },
+    async resetPasswordAttempts(username: number): Promise<any> {
+        return axios({
+            url: '/users/' + username + '/reset-failed-attempts',
+            method: 'POST',
+            withCredentials: true
+        })
     }
 }
 );

public/marker-icon-2x.png

@@ -2,7 +2,7 @@ import {AxiosStatic} from "axios"
 import { IRElementType, IRElementStatus, PermissionEnum } from "@/store/modules/IRElements/types"
 import { convertToSnakeCase } from '@/utils/elementUtils'
 
-const IRElementAPIPaths: {[key in IRElementType]?: string}= {
+const IRElementAPIPaths: {[key in IRElementType]?: string} = {
     [IRElementType.Alertgroup]: "/alertgroup",
     [IRElementType.Event]: "/event",
     [IRElementType.Alert]: "/alert",
@@ -142,14 +142,15 @@ export default (axios: AxiosStatic) => ({
         })
     },
 
-    async submitFile(formData:FormData, targetType:string, targetId:string): Promise<any> {
+    async submitFile(formData: FormData, targetType: string, targetId: string, description: string | null = null): Promise<any> {
         return axios({
             url: '/file/',
             method: 'POST',
             headers: {
                 'Content-Type': 'multipart/form-data',
                 'target_type': targetType,
                 'target_id': targetId,
+                'description': description
             },
             withCredentials: true,
             data: formData
@@ -195,6 +196,26 @@ export default (axios: AxiosStatic) => ({
         })
     },
 
+    async updateFileById(fileId: number, filename: string | null, description: string | null) {
+        const path = 'file' + '/' + fileId
+        const data: any = {}
+        if (filename) {
+            data["filename"] = filename
+        }
+        if (description) {
+            data["description"] = description
+        }
+        return axios({
+            url: path,
+            method: 'PUT',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            withCredentials: true,
+            data: data
+        })
+    },
+
     async undeleteElementById(elementId: number, elementType: IRElementType, keep_id: boolean = true) {
         const path = IRElementAPIPaths[elementType] + '/undelete'
         return axios({
@@ -615,6 +636,18 @@ export default (axios: AxiosStatic) => ({
     })
     },
 
+    async addEntityTag(entityId:number, tagToAdd:any): Promise<any> {
+        return axios({
+        url: `/entity/${entityId}/tag`,
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json'
+        },
+        withCredentials:true,
+        data: {'id': tagToAdd}
+    })
+    },
+
     async removeEntityClass(entityId:number, entityClassesToRemove:any): Promise<any> {
         return axios({
         url: `/entity/${entityId}/entity_class/remove`,
@@ -742,4 +775,57 @@ export default (axios: AxiosStatic) => ({
             withCredentials: true
         })
     },
-   });
+
+    async upvoteElement(elementID: number, elementType: IRElementType, abortController: AbortController): Promise<any> {
+        return axios({
+            url: `${IRElementAPIPaths[elementType]}/${elementID}/upvote`,
+            method: 'POST',
+            withCredentials: true,
+            signal: abortController?.signal
+        })
+    },
+
+    async downvoteElement(elementID: number, elementType: IRElementType, abortController: AbortController): Promise<any> {
+        return axios({
+            url: `${IRElementAPIPaths[elementType]}/${elementID}/downvote`,
+            method: 'POST',
+            withCredentials: true,
+            signal: abortController?.signal
+        })
+    },
+
+    async favoriteElement(elementID: number, elementType: IRElementType, abortController: AbortController): Promise<any> {
+        return axios({
+            url: `${IRElementAPIPaths[elementType]}/${elementID}/favorite`,
+            method: 'POST',
+            withCredentials: true,
+            signal: abortController?.signal
+        })
+    },
+
+    async subscribeElement(elementID: number, elementType: IRElementType, abortController: AbortController): Promise<any> {
+        return axios({
+            url: `notification/subscribe`,
+            method: 'POST',
+            withCredentials: true,
+            data: {
+                target_type: convertToSnakeCase(elementType),
+                target_id: elementID
+            },
+            signal: abortController?.signal
+        })
+    },
+
+    async unsubscribeElement(elementID: number, elementType: IRElementType, abortController: AbortController): Promise<any> {
+        return axios({
+            url: `notification/unsubscribe`,
+            method: 'POST',
+            withCredentials: true,
+            data: {
+                target_type: convertToSnakeCase(elementType),
+                target_id: elementID
+            },
+            signal: abortController?.signal
+        })
+    },
+});