diff --git a/frontend/vue/components/Admin/CustomFields.vue b/frontend/vue/components/Admin/CustomFields.vue
index 567df7241..cdcdfdcfd 100644
--- a/frontend/vue/components/Admin/CustomFields.vue
+++ b/frontend/vue/components/Admin/CustomFields.vue
@@ -71,7 +71,7 @@ import DataTable from '~/components/Common/DataTable.vue';
import EditModal from './CustomFields/EditModal.vue';
import Icon from '~/components/Common/Icon.vue';
import InfoCard from '~/components/Common/InfoCard.vue';
-import _, {get} from 'lodash';
+import {get} from 'lodash';
import {useTranslate} from "~/vendor/gettext";
import {ref} from "vue";
import {useSweetAlert} from "~/vendor/sweetalert";
diff --git a/frontend/vue/components/Admin/Index.vue b/frontend/vue/components/Admin/Index.vue
index 2dc6cf90c..c5e6f573c 100644
--- a/frontend/vue/components/Admin/Index.vue
+++ b/frontend/vue/components/Admin/Index.vue
@@ -368,26 +368,7 @@
class="align-middle"
>
-
-
-
- {{ langServiceRunning }}
-
-
-
-
-
- {{ langServiceStopped }}
-
-
+
|
@@ -474,11 +455,12 @@
import Icon from '~/components/Common/Icon';
import CpuStatsHelpModal from "./Index/CpuStatsHelpModal";
import MemoryStatsHelpModal from "./Index/MemoryStatsHelpModal";
-import _ from 'lodash';
+import {isObject, upperFirst} from 'lodash';
+import RunningBadge from "~/components/Common/Badges/RunningBadge.vue";
export default {
name: 'AdminIndex',
- components: {CpuStatsHelpModal, MemoryStatsHelpModal, Icon},
+ components: {RunningBadge, CpuStatsHelpModal, MemoryStatsHelpModal, Icon},
props: {
adminPanels: {
type: Object,
@@ -537,21 +519,13 @@ export default {
services: []
};
},
- computed: {
- langServiceRunning() {
- return this.$gettext('Service Running');
- },
- langServiceStopped() {
- return this.$gettext('Service Stopped');
- }
- },
created() {
this.updateStats();
this.updateServices();
},
methods: {
formatCpuName(cpuName) {
- return _.upperFirst(cpuName);
+ return upperFirst(cpuName);
},
formatPercentageString(value) {
return value + '%';
@@ -575,7 +549,7 @@ export default {
let key = data[0];
let value = data[1];
- if (_.isObject(value)) {
+ if (isObject(value)) {
value = value.readable + '/s';
}
diff --git a/frontend/vue/components/Admin/Permissions.vue b/frontend/vue/components/Admin/Permissions.vue
index 677240b71..ba0bf020f 100644
--- a/frontend/vue/components/Admin/Permissions.vue
+++ b/frontend/vue/components/Admin/Permissions.vue
@@ -85,7 +85,7 @@ import DataTable from '~/components/Common/DataTable';
import EditModal from './Permissions/EditModal';
import Icon from '~/components/Common/Icon';
import InfoCard from '~/components/Common/InfoCard';
-import _ from 'lodash';
+import {filter, get, map} from 'lodash';
export default {
name: 'AdminPermissions',
@@ -119,17 +119,17 @@ export default {
},
methods: {
getGlobalPermissionNames(permissions) {
- return _.filter(_.map(permissions, (permission) => {
- return _.get(this.globalPermissions, permission, null);
+ return filter(map(permissions, (permission) => {
+ return get(this.globalPermissions, permission, null);
}));
},
getStationPermissionNames(permissions) {
- return _.filter(_.map(permissions, (permission) => {
- return _.get(this.stationPermissions, permission, null);
+ return filter(map(permissions, (permission) => {
+ return get(this.stationPermissions, permission, null);
}));
},
getStationName(stationId) {
- return _.get(this.stations, stationId, null);
+ return get(this.stations, stationId, null);
},
relist() {
this.$refs.datatable.refresh();
diff --git a/frontend/vue/components/Admin/Permissions/EditModal.vue b/frontend/vue/components/Admin/Permissions/EditModal.vue
index 53c2343bf..3fe3d4cba 100644
--- a/frontend/vue/components/Admin/Permissions/EditModal.vue
+++ b/frontend/vue/components/Admin/Permissions/EditModal.vue
@@ -31,7 +31,7 @@ import {required} from '@vuelidate/validators';
import BaseEditModal from '~/components/Common/BaseEditModal';
import AdminPermissionsGlobalForm from "./Form/GlobalForm";
import AdminPermissionsStationForm from "./Form/StationForm";
-import _ from 'lodash';
+import {forEach, map} from 'lodash';
import {useVuelidateOnForm} from "~/functions/useVuelidateOnForm";
export default {
@@ -87,7 +87,7 @@ export default {
populateForm(data) {
this.form.name = data.name;
this.form.permissions.global = data.permissions.global;
- this.form.permissions.station = _.map(data.permissions.station, (permissions, stationId) => {
+ this.form.permissions.station = map(data.permissions.station, (permissions, stationId) => {
return {
'station_id': stationId,
'permissions': permissions
@@ -103,7 +103,7 @@ export default {
}
};
- _.forEach(this.form.permissions.station, (row) => {
+ forEach(this.form.permissions.station, (row) => {
form.permissions.station[row.station_id] = row.permissions;
});
diff --git a/frontend/vue/components/Admin/Stations.vue b/frontend/vue/components/Admin/Stations.vue
index e499ebc12..3f1c5b2d4 100644
--- a/frontend/vue/components/Admin/Stations.vue
+++ b/frontend/vue/components/Admin/Stations.vue
@@ -88,7 +88,7 @@
import DataTable from '~/components/Common/DataTable';
import Icon from '~/components/Common/Icon';
import AdminStationsEditModal from "./Stations/EditModal";
-import _ from "lodash";
+import {get} from "lodash";
import AdminStationsCloneModal from "./Stations/CloneModal";
import stationFormProps from "./Stations/stationFormProps";
@@ -148,10 +148,10 @@ export default {
});
},
getFrontendName(frontend_type) {
- return _.get(this.frontendTypes, [frontend_type, 'name'], '');
+ return get(this.frontendTypes, [frontend_type, 'name'], '');
},
getBackendName(backend_type) {
- return _.get(this.backendTypes, [backend_type, 'name'], '');
+ return get(this.backendTypes, [backend_type, 'name'], '');
}
}
};
diff --git a/frontend/vue/components/Admin/Users/EditModal.vue b/frontend/vue/components/Admin/Users/EditModal.vue
index bf0f4a175..7156e050f 100644
--- a/frontend/vue/components/Admin/Users/EditModal.vue
+++ b/frontend/vue/components/Admin/Users/EditModal.vue
@@ -21,7 +21,7 @@ import useVuelidate from "@vuelidate/core";
import {email, required} from '@vuelidate/validators';
import BaseEditModal from '~/components/Common/BaseEditModal';
import AdminUsersForm from './Form.vue';
-import _ from 'lodash';
+import {map} from 'lodash';
import validatePassword from "~/functions/validatePassword";
export default {
@@ -75,7 +75,7 @@ export default {
name: data.name,
email: data.email,
new_password: '',
- roles: _.map(data.roles, 'id')
+ roles: map(data.roles, 'id')
};
},
}
diff --git a/frontend/vue/components/Common/AudioPlayer.vue b/frontend/vue/components/Common/AudioPlayer.vue
index fb4bf9d8b..58896f1b4 100644
--- a/frontend/vue/components/Common/AudioPlayer.vue
+++ b/frontend/vue/components/Common/AudioPlayer.vue
@@ -16,7 +16,7 @@ export default defineComponent({
props: {
title: {
type: String,
- required: true
+ default: null
},
volume: {
type: Number,
diff --git a/frontend/vue/components/Common/Charts/TimeSeriesChart.vue b/frontend/vue/components/Common/Charts/TimeSeriesChart.vue
index d0ab2f45c..24095d985 100644
--- a/frontend/vue/components/Common/Charts/TimeSeriesChart.vue
+++ b/frontend/vue/components/Common/Charts/TimeSeriesChart.vue
@@ -8,7 +8,7 @@
import {get} from "@vueuse/core";
import {Tableau20} from "~/vendor/chartjs-colorschemes/colorschemes.tableau";
import {DateTime} from "luxon";
-import _ from "lodash";
+import {defaultsDeep} from "lodash";
import {Chart} from "chart.js";
import {onMounted, onUnmounted, ref} from "vue";
import {useTranslate} from "~/vendor/gettext";
@@ -16,7 +16,9 @@ import {useTranslate} from "~/vendor/gettext";
const props = defineProps({
options: {
type: Object,
- required: true
+ default: () => {
+ return {};
+ }
},
data: {
type: Array,
@@ -99,7 +101,7 @@ onMounted(() => {
$chart.destroy();
}
- let chartOptions = _.defaultsDeep({}, props.options, defaultOptions);
+ let chartOptions = defaultsDeep({}, props.options, defaultOptions);
$chart = new Chart(get($canvas).getContext('2d'), chartOptions);
});
diff --git a/frontend/vue/components/Common/ModalForm.vue b/frontend/vue/components/Common/ModalForm.vue
index 0d640187c..3ae156922 100644
--- a/frontend/vue/components/Common/ModalForm.vue
+++ b/frontend/vue/components/Common/ModalForm.vue
@@ -75,7 +75,7 @@
|