Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reporting Frontend Changes #1

Merged
merged 55 commits into from
Oct 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
ee30314
reporting wip
sadnub Apr 29, 2023
4d409ea
resolve query editor schema over http
sadnub May 2, 2023
f87f497
fix url
sadnub May 2, 2023
e0c37fa
fill out code functions for html template and report template
sadnub May 3, 2023
01a13f3
fix icon name
sadnub May 3, 2023
f7e6ebc
data source select in template editor
sadnub May 3, 2023
cb301d3
minor fixes
sadnub May 10, 2023
00df929
fix report assets and add allow selecting in the template form
sadnub May 11, 2023
cdbbddd
Load reports manager as an integration
sadnub May 13, 2023
93217b4
more improvements
sadnub May 26, 2023
3fd4483
update package-lock
sadnub May 26, 2023
dbe24f1
charting stuff
sadnub May 31, 2023
dddd317
wrap double quotes around {{}} tags automatically
sadnub Jun 1, 2023
91a2930
add autosave and some bug fixes
sadnub Jun 4, 2023
07c001d
add debug mode for preview. import/export templates. More fixes and f…
sadnub Jun 6, 2023
1e90dfc
variables introspection add
sadnub Jun 9, 2023
2b3916a
improve UI for variables sidebar
sadnub Jun 11, 2023
0778bee
ui improvements
sadnub Jun 11, 2023
2335d90
start on table maker ui
sadnub Jun 11, 2023
5b293fa
start help menu
sadnub Jun 14, 2023
397413e
popup
sadnub Jun 22, 2023
1686a15
vscode changes
sadnub Jul 7, 2023
8df4409
fix package-lock
sadnub Jul 7, 2023
2f0bc3b
change query schema and handle dark mode
wh1te909 Jul 9, 2023
89545a9
handle dark/light mode
wh1te909 Jul 9, 2023
73a72b7
fix random lockups when closing editors and other fixes
sadnub Aug 7, 2023
3a98d93
add save prompt of unedited changes are detected on close
sadnub Aug 9, 2023
7ea828f
make nicer column names in tablemaker and make dialog bigger
sadnub Aug 9, 2023
2a370ea
fix data queries not inserting when data_sources is null
sadnub Aug 9, 2023
01bcada
fix dependencies
sadnub Aug 26, 2023
817a37c
fix dependencies validation bug when running reports and also replace…
sadnub Aug 28, 2023
00b4896
fix quotes during import and moved the upload template button to drop…
sadnub Oct 2, 2023
99e4607
fix auto wrapping { or } in variables
sadnub Oct 3, 2023
b591b87
update reqs
wh1te909 Oct 3, 2023
0226e54
add an bar above the variables editor and make opening and closing ea…
sadnub Oct 4, 2023
598f0ee
add filterable dropdowns for dependency selection
sadnub Oct 4, 2023
dba81c0
fix reports view when there are empty dependsOn or dependencies
sadnub Oct 4, 2023
cb9488b
add in plain text template type
sadnub Oct 5, 2023
f5f984c
fix open html menu item not working for markdown templates
sadnub Oct 6, 2023
9ef7a0e
fix rendering markdown in preview
sadnub Oct 6, 2023
4f6bce3
allow editing querys in templates and make insert data source add the…
sadnub Oct 8, 2023
80aa321
fix issue with report view white screen
sadnub Oct 8, 2023
9d11a5b
show error message when parsing json in query editor
sadnub Oct 8, 2023
482e092
add download report options in report manager and right-click context…
sadnub Oct 9, 2023
44d561f
fix url when loading report dependencies
sadnub Oct 9, 2023
2720e1e
fix tab not selecting for markdown
sadnub Oct 13, 2023
ccecf0d
initial wip shared templates
sadnub Oct 15, 2023
4743d3e
fix some typings
sadnub Oct 15, 2023
e6300c4
add import icon
wh1te909 Oct 16, 2023
8eb216e
add reporting perms
wh1te909 Oct 20, 2023
b392ca6
update reqs
wh1te909 Oct 23, 2023
06d2fc4
update license
wh1te909 Oct 24, 2023
8c5ae39
remove console info
wh1te909 Oct 25, 2023
55695c0
update wording
wh1te909 Oct 25, 2023
ab5cd3b
add header
wh1te909 Oct 25, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@
"eslint.validate": ["javascript", "javascriptreact", "typescript", "vue"],
"typescript.tsdk": "node_modules/typescript/lib",
"files.watcherExclude": {
"files.watcherExclude": {
"**/.git/objects/**": true,
"**/.git/subtree-cache/**": true,
"**/node_modules/": true,
"/node_modules/**": true,
"**/env/": true,
"/env/**": true
}
}
},
"prettier.prettierPath": "./node_modules/prettier"
}
2,570 changes: 1,437 additions & 1,133 deletions package-lock.json

Large diffs are not rendered by default.

18 changes: 11 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,27 @@
"axios": "1.5.1",
"dotenv": "16.3.1",
"qrcode.vue": "3.4.1",
"quasar": "2.12.7",
"vue": "3.3.4",
"quasar": "2.13.0",
"vue": "3.3.6",
"vue3-ace-editor": "2.2.3",
"vue3-apexcharts": "1.4.4",
"vuedraggable": "4.1.0",
"vue-router": "4.2.5",
"vuex": "4.1.0"
"@vueuse/core": "10.5.0",
"@vueuse/shared": "10.5.0",
"monaco-editor": "0.44.0",
"vuex": "4.1.0",
"yaml": "2.3.3"
},
"devDependencies": {
"@quasar/cli": "2.3.0",
"@intlify/unplugin-vue-i18n": "1.4.0",
"@quasar/app-vite": "1.6.2",
"@types/node": "20.8.0",
"@typescript-eslint/eslint-plugin": "6.7.3",
"@typescript-eslint/parser": "6.7.3",
"@types/node": "20.8.7",
"@typescript-eslint/eslint-plugin": "6.9.0",
"@typescript-eslint/parser": "6.9.0",
"autoprefixer": "10.4.16",
"eslint": "8.50.0",
"eslint": "8.52.0",
"eslint-config-prettier": "9.0.0",
"eslint-plugin-vue": "8.7.1",
"prettier": "3.0.3",
Expand Down
2 changes: 1 addition & 1 deletion quasar.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ module.exports = configure(function (/* ctx */) {
// app boot file (/src/boot)
// --> boot files are part of "main.js"
// https://v2.quasar.dev/quasar-cli-vite/boot-files
boot: ["axios"],
boot: ["axios", "monaco", "integrations"],

// https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
css: ["app.sass"],
Expand Down
15 changes: 15 additions & 0 deletions src/boot/axios.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@ export const getBaseUrl = () => {
}
};

export function setErrorMessage(data, message) {
console.log(data);
return [
() => {
message;
},
];
}

export default function ({ app, router, store }) {
app.config.globalProperties.$axios = axios;

Expand All @@ -19,6 +28,12 @@ export default function ({ app, router, store }) {
if (token != null) {
config.headers.Authorization = `Token ${token}`;
}
// config.transformResponse = [
// function (data) {
// console.log(data);
// return data;
// },
// ];
return config;
},
function (err) {
Expand Down
10 changes: 10 additions & 0 deletions src/boot/integrations.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { boot } from "quasar/wrappers";

export default boot(({ app }) => {
app.config.globalProperties.$integrations = {
fileBarIntegrations: [],
clientMenuIntegrations: [],
siteMenuIntegrations: [],
agentMenuIntegrations: [],
};
});
23 changes: 23 additions & 0 deletions src/boot/monaco.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import editorWorker from "monaco-editor/esm/vs/editor/editor.worker?worker";
import cssWorker from "monaco-editor/esm/vs/language/css/css.worker?worker";
import htmlWorker from "monaco-editor/esm/vs/language/html/html.worker?worker";
import jsonWorker from "monaco-editor/esm/vs/language/json/json.worker?worker";

import { boot } from "quasar/wrappers";

export default boot(() => {
self.MonacoEnvironment = {
getWorker(_: unknown, label: string) {
if (label === "json") {
return new jsonWorker();
}
if (label === "css" || label === "scss" || label === "less") {
return new cssWorker();
}
if (label === "html" || label === "handlebars" || label === "razor") {
return new htmlWorker();
}
return new editorWorker();
},
};
});
51 changes: 51 additions & 0 deletions src/components/FileBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,49 @@
</q-list>
</q-menu>
</q-btn>
<!-- integrations -->
<q-btn size="md" dense no-caps flat label="Integrations">
<q-menu auto-close>
<q-list
v-if="
$integrations &&
$integrations.fileBarIntegrations &&
$integrations.fileBarIntegrations.length > 0
"
dense
style="min-width: 100px"
>
<q-item
v-for="integration in $integrations.fileBarIntegrations"
:key="integration.name"
@click="
integration.type === 'dialog'
? $q.dialog({ component: integration.component })
: undefined
"
:to="integration.type === 'route' ? integration.uri : undefined"
clickable
v-close-popup
>
<q-item-section>{{ integration.name }}</q-item-section>
</q-item>
</q-list>
<q-list v-else dense style="min-width: 100px">
<q-item
clickable
v-close-popup
@click="
notifyWarning(
'Reporting feature requires a valid code signing token. Please check the docs for more info.',
10000,
)
"
>
<q-item-section>Reporting Manager</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-btn>
<!-- help -->
<q-btn v-if="!hosted" size="md" dense no-caps flat label="Help">
<q-menu auto-close>
Expand Down Expand Up @@ -234,6 +277,9 @@ import ServerMaintenance from "@/components/modals/core/ServerMaintenance.vue";
import CodeSign from "@/components/modals/coresettings/CodeSign.vue";
import PermissionsManager from "@/components/accounts/PermissionsManager.vue";

// eslint-disable-next-line @typescript-eslint/no-unused-vars
import { notifyWarning } from "@/utils/notify";

export default {
name: "FileBar",
mixins: [mixins],
Expand Down Expand Up @@ -396,6 +442,11 @@ export default {
component: DeploymentTable,
});
},
showReportsManager() {
this.$q.dialog({
component: ReportsManager,
});
},
},
};
</script>
Loading