Skip to content

Commit

Permalink
Release 0.101.48
Browse files Browse the repository at this point in the history
  • Loading branch information
wh1te909 committed Aug 5, 2024
2 parents b4b6382 + dce732e commit 393b4fa
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 23 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "web",
"version": "0.101.47",
"version": "0.101.48",
"private": true,
"productName": "Tactical RMM",
"scripts": {
Expand Down
6 changes: 4 additions & 2 deletions src/components/AdminManager.vue
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,9 @@
<script>
import mixins from "@/mixins/mixins";
import { computed } from "vue";
import { mapState, useStore } from "vuex";
import { useStore } from "vuex";
import { mapState as piniaMapState } from "pinia";
import { useAuthStore } from "@/stores/auth";
import UserForm from "@/components/modals/admin/UserForm.vue";
import UserResetPasswordForm from "@/components/modals/admin/UserResetPasswordForm.vue";
Expand Down Expand Up @@ -316,7 +318,7 @@ export default {
},
},
computed: {
...mapState({
...piniaMapState(useAuthStore, {
logged_in_user: (state) => state.username,
}),
},
Expand Down
13 changes: 8 additions & 5 deletions src/components/agents/AgentActionMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -302,18 +302,21 @@ export default {
async function getURLActions() {
menuLoading.value = true;
try {
urlActions.value = (await fetchURLActions()).filter(
(action) => action.action_type === "web",
);
urlActions.value = (await fetchURLActions())
.filter((action) => action.action_type === "web")
.sort((a, b) => a.name.localeCompare(b.name));
if (urlActions.value.length === 0) {
notifyWarning(
"No URL Actions configured. Go to Settings > Global Settings > URL Actions",
);
return;
}
} catch (e) {}
menuLoading.value = true;
} catch (e) {
console.error(e);
} finally {
menuLoading.value = false;
}
}
function showSendCommand(agent) {
Expand Down
5 changes: 3 additions & 2 deletions src/components/modals/admin/UserForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@
</template>

<script>
import { mapState } from "vuex";
import { mapState as piniaMapState } from "pinia";
import { useAuthStore } from "@/stores/auth";
import mixins from "@/mixins/mixins";
export default {
Expand Down Expand Up @@ -145,7 +146,7 @@ export default {
title() {
return this.user ? "Edit User" : "Add User";
},
...mapState({
...piniaMapState(useAuthStore, {
logged_in_user: (state) => state.username,
}),
},
Expand Down
1 change: 1 addition & 0 deletions src/components/modals/coresettings/CustomFieldsTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
<!-- name -->
<q-td>
{{ props.row.name }}
<q-tooltip :delay="600">ID: {{ props.row.id }}</q-tooltip>
</q-td>
<!-- type -->
<q-td>
Expand Down
13 changes: 7 additions & 6 deletions src/components/modals/coresettings/UserPreferences.vue
Original file line number Diff line number Diff line change
Expand Up @@ -313,18 +313,19 @@ export default {
},
getURLActions() {
this.$axios.get("/core/urlaction/").then((r) => {
if (r.data.length === 0) {
this.notifyWarning(
"No URL Actions configured. Go to Settings > Global Settings > URL Actions",
);
return;
}
this.urlActions = r.data
.filter((action) => action.action_type === "web")
.sort((a, b) => a.name.localeCompare(b.name))
.map((action) => ({
label: action.name,
value: action.id,
}));
if (this.urlActions.length === 0) {
this.notifyWarning(
"No URL Actions configured. Go to Settings > Global Settings > URL Actions",
);
}
});
},
getUserPrefs() {
Expand Down
1 change: 1 addition & 0 deletions src/components/scripts/ScriptManager.vue
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,7 @@
>
{{ props.row.name }}
</q-tooltip>
<q-tooltip :delay="600">ID: {{ props.row.id }}</q-tooltip>
</q-td>
<!-- args -->
<q-td key="args" :props="props">
Expand Down
9 changes: 4 additions & 5 deletions src/views/DashboardView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -818,15 +818,14 @@ export default {
},
getURLActions() {
this.$axios.get("/core/urlaction/").then((r) => {
if (r.data.length === 0) {
this.urlActions = r.data
.filter((action) => action.action_type === "web")
.sort((a, b) => a.name.localeCompare(b.name));
if (this.urlActions.length === 0) {
this.notifyWarning(
"No URL Actions configured. Go to Settings > Global Settings > URL Actions",
);
return;
}
this.urlActions = r.data.filter(
(action) => action.action_type === "web",
);
});
},
runURLAction(id, action, model) {
Expand Down

0 comments on commit 393b4fa

Please sign in to comment.