Skip to content

Commit f6e9123

Browse files
jamm1985jamm1985
authored
Merge pull request #350 from armd-pro/master
Unit tests
2 parents 780fd3e + 00f3a00 commit f6e9123

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+909
-75
lines changed

‎src/App.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
.catch(error => { console.log(error) })
5858
},
5959
fetchSystemInfo: function() {
60-
this.$http.get(this.$root.$options.settings.api.endpointSystemInfo)
60+
this.$http.get(appSettings.endpointSystemInfo)
6161
.then(response => {
6262
(data => {
6363
this.$store.dispatch('setMsk64ConfigVersion', data.msk64Config.data.config_version)

‎src/components/CountersHeader.vue

+3-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
<script>
3737
import ModalMap from '@/components/maps/ModalMap'
3838
import ExportDropDown from '@/components/ExportDropDown'
39+
import apiSettings from '@/settings/api'
40+
3941
export default {
4042
props: {
4143
trainingEventsBtnDisabled: false,
@@ -56,7 +58,7 @@
5658
methods: {
5759
export2xls: function(request) {
5860
let params = Object.assign({}, this.filtersData)
59-
request(this.$root.$options.settings.api.endpointEvents, Object.assign(params, {
61+
request(apiSettings.endpointEvents, Object.assign(params, {
6062
limit: 5000
6163
}))
6264
},

‎src/components/Events.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ import Filters from '@/components/Filters.vue'
8585
import Spinner from '@/components/Spinner'
8686
import apiSettings from '@/settings/api'
8787
import { round } from '@/helpers/math'
88+
import eventsSettings from '@/settings/events'
8889
8990
export default {
9091
components: { CountersHeader, Filters, Spinner },
@@ -101,7 +102,7 @@ export default {
101102
},
102103
events: [],
103104
disabledFilters: false,
104-
highlightEventTreshold: this.$root.$options.settings.events.highlightTreshold,
105+
highlightEventTreshold: eventsSettings.highlightTreshold,
105106
spinners: {
106107
loadMoreEvents: false
107108
},

‎src/components/charts/ChartByDatetime.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<script>
22
import { Line } from 'vue-chartjs'
3+
import apiSettings from '@/settings/api'
34
45
export default Line.extend({
56
props: ['filtersParams'],
@@ -65,7 +66,7 @@ export default Line.extend({
6566
},
6667
methods: {
6768
drawChart: function(params = {}) {
68-
this.$http.get(this.$root.$options.settings.api.endpointAnalyticsEarthquakeCounts, { params: params })
69+
this.$http.get(apiSettings.endpointAnalyticsEarthquakeCounts, { params: params })
6970
.then(response => {
7071
const dates = this.prepareDates(response.data.data.dates)
7172
this.chartData.datasets[0].label = 'Количество землетрясений'

‎src/components/charts/ChartByDensityCounts.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<script>
22
import { Line } from 'vue-chartjs'
3+
import apiSettings from '@/settings/api'
34
45
export default Line.extend({
56
props: ['filtersParams'],
@@ -71,7 +72,7 @@ export default Line.extend({
7172
},
7273
methods: {
7374
drawChart: function(params = {}) {
74-
this.$http.get(this.$root.$options.settings.api.endpointAnalyticsDensityCounts, { params: params })
75+
this.$http.get(apiSettings.endpointAnalyticsDensityCounts, { params: params })
7576
.then(response => {
7677
this.chartData.datasets[0].label = 'Плотностное распределение повторяемости (ML)'
7778
this.chartData.datasets[0].data = response.data.data.counts

‎src/components/charts/ChartByMagnitudeCumulative.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<script>
22
import { Line } from 'vue-chartjs'
3+
import apiSettings from '@/settings/api'
34
45
export default Line.extend({
56
props: ['filtersParams'],
@@ -76,7 +77,7 @@ export default Line.extend({
7677
},
7778
methods: {
7879
drawChart: function(params = {}) {
79-
this.$http.get(this.$root.$options.settings.api.endpointAnalyticsCumulativeCounts, { params: params })
80+
this.$http.get(apiSettings.endpointAnalyticsCumulativeCounts, { params: params })
8081
.then(response => {
8182
this.chartData.datasets[0].label = 'Кумулятивный график повторяемости (ML)'
8283
this.chartData.datasets[0].data = response.data.data.counts

‎src/components/charts/ChartByRMSAllocation.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<script>
22
import { Line } from 'vue-chartjs'
3+
import apiSettings from '@/settings/api'
34
45
export default Line.extend({
56
props: ['filtersParams'],
@@ -65,7 +66,7 @@ export default Line.extend({
6566
},
6667
methods: {
6768
drawChart: function(params = {}) {
68-
this.$http.get(this.$root.$options.settings.api.endpointAnalyticsRMSAllocation, { params: params })
69+
this.$http.get(apiSettings.endpointAnalyticsRMSAllocation, { params: params })
6970
.then(response => {
7071
this.chartData.datasets[0].label = 'Распределение RMS'
7172
this.chartData.datasets[0].data = response.data.data.counts

‎src/components/charts/ChartByStationCounts.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<script>
22
import { Line } from 'vue-chartjs'
3+
import apiSettings from '@/settings/api'
34
45
export default Line.extend({
56
props: ['filtersParams'],
@@ -65,7 +66,7 @@ export default Line.extend({
6566
},
6667
methods: {
6768
drawChart: function(params = {}) {
68-
this.$http.get(this.$root.$options.settings.api.endpointAnalyticsStationCounts, { params: params })
69+
this.$http.get(apiSettings.endpointAnalyticsStationCounts, { params: params })
6970
.then(response => {
7071
this.chartData.datasets[0].label = 'События по количеству станций'
7172
this.chartData.datasets[0].data = response.data.data.counts

‎src/components/event/Buildings.vue

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
</template>
1111

1212
<script>
13+
import apiSettings from '@/settings/api'
1314
export default {
1415
props: ['event'],
1516
data() {
@@ -98,7 +99,7 @@
9899
},
99100
methods: {
100101
fetchData: function() {
101-
this.$http.get(this.$root.$options.settings.api.endpointEventBuildings(this.event.id))
102+
this.$http.get(apiSettings.endpointEventBuildings(this.event.id))
102103
.then(response => {
103104
this.$root.$emit('onMapBuildingsDataFetched', response.data.data)
104105
this.setData(response.data.data)
@@ -127,7 +128,7 @@
127128
},
128129
watch: {
129130
event: function() {
130-
this.fetchData(this.event.id)
131+
this.fetchData()
131132
}
132133
}
133134
}

‎src/components/event/Header.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
import Spinner from '@/components/Spinner'
6464
import ExportDropDown from '@/components/ExportDropDown'
6565
import { agency, agencyDescription } from '@/helpers/event'
66+
import apiSettings from '@/settings/api'
6667
6768
export default {
6869
components: { Spinner, ExportDropDown },
@@ -105,7 +106,7 @@
105106
}
106107
},
107108
export2xls: function(request) {
108-
request(this.$root.$options.settings.api.endpointEvent(this.event.id))
109+
request(apiSettings.endpointEvent(this.event.id))
109110
}
110111
},
111112
computed: {

‎src/components/event/LDOs.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
<script>
1616
import Spinner from '@/components/Spinner'
17+
import apiSettings from '@/settings/api'
1718
1819
export default {
1920
components: { Spinner },
@@ -61,7 +62,7 @@ export default {
6162
},
6263
methods: {
6364
fetchData: function() {
64-
this.$http.get(this.$root.$options.settings.api.endpointEventLDOs(this.event.id), {
65+
this.$http.get(apiSettings.endpointEventLDOs(this.event.id), {
6566
params: {
6667
customer_ids: [1], // Change id(s) when the user management is implemented.
6768
show_all_parts: 1

‎src/components/event/MomentTensor.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070

7171
<script>
7272
import Spinner from '@/components/Spinner'
73+
import apiSettings from '@/settings/api'
7374
7475
export default {
7576
components: { Spinner },
@@ -137,7 +138,7 @@
137138
},
138139
methods: {
139140
fetchData: function() {
140-
this.$http.get(this.$root.$options.settings.api.endpointMomentTensor(this.event.id))
141+
this.$http.get(apiSettings.endpointMomentTensor(this.event.id))
141142
.then(response => {
142143
this.setData(response.data.data[0])
143144
})

‎src/components/event/Settlements.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import Spinner from '@/components/Spinner'
2626
import { convertMsk64 } from '@/map_functions'
2727
import { round } from '@/helpers/math'
28+
import apiSettings from '@/settings/api'
2829
2930
export default {
3031
components: { Spinner },
@@ -89,7 +90,7 @@
8990
this.items = []
9091
},
9192
fetchData: function() {
92-
this.$http.get(this.$root.$options.settings.api.endpointEventSettlements(this.event.id), {
93+
this.$http.get(apiSettings.endpointEventSettlements(this.event.id), {
9394
params: {
9495
cursor: this.cursor,
9596
limit: 10

‎src/components/event/Tabs.vue

+2-27
Original file line numberDiff line numberDiff line change
@@ -29,39 +29,14 @@
2929

3030
<script>
3131
import { round } from '@/helpers/math'
32+
import eventTabs from '@/data/event-tabs'
3233
3334
export default {
3435
props: ['event'],
3536
data() {
3637
return {
3738
activeTab: '#' + this.$router.currentRoute.fullPath,
38-
tabs: {
39-
generalInformation: {
40-
label: 'Общая информация',
41-
available: true,
42-
href: '#'
43-
},
44-
settlements: {
45-
label: 'Ближайшие населенные пункты',
46-
available: false,
47-
href: '#'
48-
},
49-
buildings: {
50-
label: 'Здания и сооружения',
51-
available: false,
52-
href: '#'
53-
},
54-
momentTensor: {
55-
label: 'Тензор момента',
56-
available: false,
57-
href: '#'
58-
},
59-
ldos: {
60-
label: 'Магистральные объекты',
61-
available: false,
62-
href: '#'
63-
}
64-
}
39+
tabs: eventTabs
6540
}
6641
},
6742
metaInfo() {

‎src/components/maps/GeneralInformation.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<script>
66
import { addEpicenter, createMap, id, removeEpicenter, setView } from '@/map_functions'
77
import { numberDeclension } from '@/helpers/number'
8+
import apiSettings from '@/settings/api'
89
910
export default {
1011
props: ['event', 'tab'],
@@ -93,7 +94,7 @@
9394
return this.putEpicenter()
9495
}
9596
96-
this.$http.get(this.$root.$options.settings.api.endpointEventPga(this.event.id))
97+
this.$http.get(apiSettings.endpointEventPga(this.event.id))
9798
.then(response => {
9899
this.addData(response.data.data)
99100
})

‎src/components/maps/Mainpage.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<script>
66
import {createMap, createMapEventMarker} from '@/map_functions'
77
import {EVENTS_RANGES} from '@/helpers/event'
8+
import apiSettings from '@/settings/api'
89
910
export default {
1011
data() {
@@ -30,7 +31,6 @@
3031
})
3132
3233
const defaultEventsRange = this.map.defaultEventsRange
33-
let apiSettings = this.$root.$options.settings.api
3434
let $moment = this.$moment
3535
let $http = this.$http
3636

‎src/components/users/ConfirmPassword.vue

+8-2
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151
</template>
5252

5353
<script>
54+
import apiSettings from '@/settings/api'
55+
5456
export default {
5557
data() {
5658
return {
@@ -66,7 +68,11 @@
6668
email: null,
6769
form: {
6870
fields: {
69-
password: { value: '', disabled: false, state: null }
71+
password: {
72+
value: '',
73+
disabled: false,
74+
state: null
75+
}
7076
},
7177
messages: {
7278
password: 'Некорректный пароль'
@@ -107,7 +113,7 @@
107113
108114
this.disableFields()
109115
110-
this.$http.post(this.$root.$options.settings.api.endpointUserResetPasswordComplete, payload)
116+
this.$http.post(apiSettings.endpointUserResetPasswordComplete, payload)
111117
.then(response => {
112118
this.passwordChanged = true
113119
})

‎src/components/users/Confirmation.vue

+3-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
</template>
2121

2222
<script>
23+
import apiSettings from '@/settings/api'
24+
2325
export default {
2426
data() {
2527
return {
@@ -44,7 +46,7 @@
4446
},
4547
methods: {
4648
confirmEmail: function(token) {
47-
this.$http.post(this.$root.$options.settings.api.endpointEmailConfirmation(token))
49+
this.$http.post(apiSettings.endpointEmailConfirmation(token))
4850
.then(response => {
4951
this.status = 'success'
5052
this.message = response.data.data

‎src/components/users/Registration.vue

+5-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<b-row v-if="registrationComplete">
1010
<b-col class="complete" cols="8" offset="2" align="center">
1111
<h5>Регистрация завершена</h5>
12-
<p>На указанный электронный адрес отправлено письмо. </p>
12+
<p>На указанный электронный адрес отправлено письмо.</p>
1313
<p>Вам осталось только открыть это письмо и нажать на кнопку "Подтвердить регистрацию".</p>
1414
</b-col>
1515
</b-row>
@@ -123,6 +123,8 @@
123123
</template>
124124

125125
<script>
126+
import apiSettings from '@/settings/api'
127+
126128
export default {
127129
data() {
128130
return {
@@ -184,7 +186,7 @@
184186
this.changeFieldsDisabledState(true)
185187
},
186188
getPurposesList: function() {
187-
this.$http.get(this.$root.$options.settings.api.endpointPurposesList)
189+
this.$http.get(apiSettings.endpointPurposesList)
188190
.then(response => {
189191
Object.keys(response.data.data).forEach(key => {
190192
this.form.purposes.values.push({ value: key, text: response.data.data[key] })
@@ -211,7 +213,7 @@
211213
212214
this.disableFields()
213215
214-
this.$http.post(this.$root.$options.settings.api.endpointUserRegistration, payload)
216+
this.$http.post(apiSettings.endpointUserRegistration, payload)
215217
.then(response => {
216218
this.registrationComplete = true
217219
})

‎src/components/users/ResetPassword.vue

+3-1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@
4747
</template>
4848

4949
<script>
50+
import apiSettings from '@/settings/api'
51+
5052
export default {
5153
data() {
5254
return {
@@ -101,7 +103,7 @@
101103
102104
this.disableFields()
103105
104-
this.$http.post(this.$root.$options.settings.api.endpointUserResetPassword, payload)
106+
this.$http.post(apiSettings.endpointUserResetPassword, payload)
105107
.then(response => {
106108
this.resetComplete = true
107109
})

0 commit comments

Comments
 (0)