diff --git a/package.json b/package.json index 18ccc20..19270ca 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,6 @@ "dependencies": { "@ckeditor/ckeditor5-vue2": "^3.0.1", "@firebase/messaging": "^0.7.4", - "@mescius/activereportsjs": "^5.0.4", "@tinymce/tinymce-vue": "^3.0.0", "accounting-js": "^1.1.1", "ag-grid-community": "28.2.1", @@ -106,5 +105,6 @@ ], "publishConfig": { "access": "public" - } + }, + "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e" } diff --git a/qodana.yaml b/qodana.yaml new file mode 100644 index 0000000..26a653d --- /dev/null +++ b/qodana.yaml @@ -0,0 +1,32 @@ +#-------------------------------------------------------------------------------# +# Qodana analysis is configured by qodana.yaml file # +# https://www.jetbrains.com/help/qodana/qodana-yaml.html # +#-------------------------------------------------------------------------------# +version: "1.0" + +#Specify inspection profile for code analysis +profile: + name: qodana.starter + +#Enable inspections +#include: +# - name: + +#Disable inspections +#exclude: +# - name: +# paths: +# - + +php: + version: 8.1 #(Applied in CI/CD pipeline) + +#Execute shell command before Qodana execution (Applied in CI/CD pipeline) +#bootstrap: sh ./prepare-qodana.sh + +#Install IDE plugins before Qodana execution (Applied in CI/CD pipeline) +#plugins: +# - id: #(plugin id can be found at https://plugins.jetbrains.com) + +#Specify Qodana linter for analysis (Applied in CI/CD pipeline) +linter: jetbrains/qodana-php:latest diff --git a/src/components/IconSelector.vue b/src/components/IconSelector.vue index 5f27a5b..76f5705 100644 --- a/src/components/IconSelector.vue +++ b/src/components/IconSelector.vue @@ -3024,7 +3024,7 @@ export default { let iconGroup = []; if (this.iconSearch !== null && this.iconSearch != "") { this.iconData.forEach(group => { - if (group.hasOwnProperty("icons")) { + if (group && group.hasOwnProperty("icons")) { let icons = group.icons.filter(icon => icon.toLowerCase().includes(this.iconSearch.toLowerCase())); if (icons.length >= 1) { iconGroup.push({ diff --git a/src/components/UserControl.vue b/src/components/UserControl.vue index 1bb282d..1ac268e 100644 --- a/src/components/UserControl.vue +++ b/src/components/UserControl.vue @@ -91,7 +91,8 @@ export default { methods: { logout() { - axios.post("/auth/logout", {}).then(o => { + // eslint-disable-next-line no-undef + axios.post("/auth/logout", {}).then(()=> { window.location = "/auth/login"; }); }, diff --git a/src/components/listview.vue b/src/components/listview.vue index 151f431..1489beb 100644 --- a/src/components/listview.vue +++ b/src/components/listview.vue @@ -61,7 +61,7 @@ - @@ -147,6 +147,7 @@ export default { }, methods: { getData() { + // eslint-disable-next-line no-undef axios.get(this.$props.src).then(({data}) => { this.loading = false; this.listData = data.data.sort((s1, s2) => { @@ -186,6 +187,7 @@ export default { if (this.type === "datasource") { src = "/lambda/puzzle/schema/datasource" } + // eslint-disable-next-line no-undef axios.post(src, data).then(({data}) => { if (data.status) { this.$Notice.success({ @@ -218,6 +220,7 @@ export default { src = `/lambda/puzzle/project/${this.$project.id}/grid/${id}` } } + // eslint-disable-next-line no-undef axios.get(src) .then(({data}) => { this.duplicateData.name = data.data.hasOwnProperty('name') ? data.data.name : data.data.model; @@ -229,6 +232,7 @@ export default { }); }, deleteListItem(id) { + // eslint-disable-next-line no-undef axios.delete(this.$project ? `/lambda/puzzle/delete/project/vb_schemas/${this.$project.id}/${this.type}/${id}` : `/lambda/puzzle/delete/vb_schemas/${this.type}/${id}`).then(o => { this.filteredList = this.filteredList.filter( item => item.id !== id diff --git a/src/index.js b/src/index.js index 55f462e..dba0880 100644 --- a/src/index.js +++ b/src/index.js @@ -3,7 +3,7 @@ */ import Vue from "vue"; import axios from 'axios'; -import {i18n} from './locale'; +import { i18n } from './locale'; import router from './router' import App from './app.vue'; import { diff --git a/src/modules/agent/index.js b/src/modules/agent/index.js index 671237f..7ef1a37 100755 --- a/src/modules/agent/index.js +++ b/src/modules/agent/index.js @@ -8,7 +8,7 @@ const components = { 'agent-form': AgentForm }; -const install = function (Vue, options) { +const install = function (Vue) { if (install.installed) return; Object.keys(components).forEach(key => Vue.component(key, components[key])); }; diff --git a/src/modules/agent/views/agentform.vue b/src/modules/agent/views/agentform.vue index 98e308b..8b897f7 100644 --- a/src/modules/agent/views/agentform.vue +++ b/src/modules/agent/views/agentform.vue @@ -1,7 +1,7 @@ -
@@ -69,6 +68,7 @@ :onRowSelect="onRowSelectedEvent" :hasSelection="hasSelection" :permissions="permissions" + :on-filter-change="onFilterChange" :page_id="page_id" :custom_condition="$props.custom_condition? $props.custom_condition :null" :user_condition="user_condition ? user_condition.gridCondition : null"> @@ -130,6 +130,7 @@ export default { }; }, created() { + console.log("on FILTER", this.onFilter); }, components: { "slide-panel": slidePanel, diff --git a/src/modules/krud/templates/list.vue b/src/modules/krud/templates/list.vue index 104d8f7..2b490cf 100644 --- a/src/modules/krud/templates/list.vue +++ b/src/modules/krud/templates/list.vue @@ -1,84 +1,84 @@