diff --git a/live_monitor_vue/Makefile b/live_monitor_vue/Makefile index 2be211f..67249b4 100644 --- a/live_monitor_vue/Makefile +++ b/live_monitor_vue/Makefile @@ -1,12 +1,19 @@ HOOK_NAME=pre-push -HOOK_PATH=.git/hooks/$(HOOK_NAME) +HOOK_PATH=../.git/hooks/$(HOOK_NAME) -pre_hook: +prehook: @echo "Setting up pre-push hook..." @rm -f $(HOOK_PATH) @echo '#!/bin/sh' >> $(HOOK_PATH) - @echo 'echo "Running tests..."' >> $(HOOK_PATH) - @echo 'go test ./...' >> $(HOOK_PATH) + @echo 'echo "Running lint for proxy-ui-app"' >> $(HOOK_PATH) + @echo 'cd ./proxy-ui-app' >> $(HOOK_PATH) + @echo 'yarn lint' >> $(HOOK_PATH) + @echo 'if [ $$? -ne 0 ]; then' >> $(HOOK_PATH) + @echo ' echo "Tests failed, push aborted."' >> $(HOOK_PATH) + @echo ' exit 1' >> $(HOOK_PATH) + @echo 'fi' >> $(HOOK_PATH) + @echo 'echo "Running tests for proxy-ui"' >> $(HOOK_PATH) + @echo 'yarn test_ones' >> $(HOOK_PATH) @echo 'if [ $$? -ne 0 ]; then' >> $(HOOK_PATH) @echo ' echo "Tests failed, push aborted."' >> $(HOOK_PATH) @echo ' exit 1' >> $(HOOK_PATH) @@ -14,3 +21,10 @@ pre_hook: @echo 'exit 0' >> $(HOOK_PATH) @chmod +x $(HOOK_PATH) @echo "Pre-push hook set successfully." + +push: +ifeq ($(commit),) + $(error mn is not set) +endif + make prehook + git add . && git commit -m "feat($(commit)):" && git push diff --git a/live_monitor_vue/package.json b/live_monitor_vue/package.json index e254c7b..18dd808 100755 --- a/live_monitor_vue/package.json +++ b/live_monitor_vue/package.json @@ -16,12 +16,14 @@ }, "dependencies": { "1-toolkits-helpers": "../repo/1-toolkits-helpers/", + "D": "^1.0.0", "axios": "^1.6.2", "echarts": "^5.4.3", "flatpickr": "^4.6.13", "flowbite": "^2.2.0", "flowbite-vue": "^0.1.1", "handlebars": "^4.7.8", + "happy-dom": "^14.3.1", "lucide": "^0.298.0", "moment": "^2.29.4", "ol": "^8.2.0", @@ -38,6 +40,7 @@ "devDependencies": { "@tailwindcss/forms": "^0.5.7", "@vitejs/plugin-vue": "^4.5.2", + "@vue/test-utils": "^2.4.5", "autoprefixer": "^10.4.16", "eslint": "^8.56.0", "eslint-plugin-vue": "^9.19.2", @@ -46,6 +49,7 @@ "postcss-apply": "^0.12.0", "postcss-nesting": "^12.0.2", "tailwindcss": "^3.3.6", - "vite": "^5.0.8" + "vite": "^5.0.8", + "vitest": "^1.4.0" } } diff --git a/live_monitor_vue/src/adapters/AdapterOfMachines.js b/live_monitor_vue/src/adapters/AdapterOfMachines.js index e69de29..394d723 100644 --- a/live_monitor_vue/src/adapters/AdapterOfMachines.js +++ b/live_monitor_vue/src/adapters/AdapterOfMachines.js @@ -0,0 +1,38 @@ +import {scandApiRequest} from '@helpers/apiHelpers.js' +import {Adapter} from '1-toolkits-helpers' + +const {convertList} = Adapter + +const machinesConfig = { + zav_nomer: 'zavNomer', + type: 'type', + railway_name: 'railwayName', + org_name: 'orgName', + nomer_zn8: 'nomerZn8', + machine_type: 'machineType', + machine_id: 'machineId', + imei: 'imei', + device_number: 'deviceNumber', + device_id: 'deviceId' +} + +class AdapterOfMachines { + + /** + * + * @param {String} url + */ + constructor(url) { + this.url = url + } + + async getModalMachines() { + let result = await scandApiRequest('ScandApi.LiveMonitor.Machines', 'select_machines', []) + result = convertList(result, { + config: machinesConfig + }) + return result + } +} + +export default AdapterOfMachines \ No newline at end of file diff --git a/live_monitor_vue/src/components/5_pages/Main/Machines/Machines.vue b/live_monitor_vue/src/components/5_pages/Main/Machines/Machines.vue index d037523..13b257b 100644 --- a/live_monitor_vue/src/components/5_pages/Main/Machines/Machines.vue +++ b/live_monitor_vue/src/components/5_pages/Main/Machines/Machines.vue @@ -57,11 +57,11 @@ export default { const urlParams = path.value === '/' && query?.value?.mode ? query.value.mode : '' const externalParams = {historyData: updatedData, urlParams: urlParams} - store.commit('machines/setHistoryData', updatedData) - store.dispatch('machines/uploadData', externalParams) + store.commit('layoutMachines/setHistoryData', updatedData) + store.dispatch('layoutMachines/uploadData', externalParams) }, computed: { - ...mapGetters('machines', ['searchModes', 'searchValue', 'selectedSearchMode', 'leftTopButtons', 'rightTopButtons', 'selectedMode', 'toggleFilter', 'activeFilterBtn', 'mapData', 'machinesData']), + ...mapGetters('layoutMachines', ['searchModes', 'searchValue', 'selectedSearchMode', 'leftTopButtons', 'rightTopButtons', 'selectedMode', 'toggleFilter', 'activeFilterBtn', 'mapData', 'machinesData']), ...mapGetters('layout', ['isOpenMenu']), }, mounted () { @@ -81,7 +81,7 @@ export default { }, unmounted() { const store = useStore(); - store.dispatch('machines/resetStore') + store.dispatch('layoutMachines/resetStore') }, watch: { isSuccessSearch: { @@ -92,8 +92,8 @@ export default { }, }, methods: { - ...mapMutations('machines', ['setSearchMode', 'setSelectedMode', 'setToggleFilter', 'setActiveFilterBtn']), - ...mapActions('machines', ['updateSearch', 'clearFilters']), + ...mapMutations('layoutMachines', ['setSearchMode', 'setSelectedMode', 'setToggleFilter', 'setActiveFilterBtn']), + ...mapActions('layoutMachines', ['updateSearch', 'clearFilters']), updateSearchMode: function(selectedSearchMode) { this.setSearchMode(selectedSearchMode) }, diff --git a/live_monitor_vue/src/components/5_pages/Main/index.vue b/live_monitor_vue/src/components/5_pages/Main/index.vue index 4f76c19..4e695a4 100644 --- a/live_monitor_vue/src/components/5_pages/Main/index.vue +++ b/live_monitor_vue/src/components/5_pages/Main/index.vue @@ -69,9 +69,6 @@ export default {