Skip to content

Commit b7fb6d6

Browse files
committed
refactor: improve maintainability
1 parent 12788f7 commit b7fb6d6

File tree

5 files changed

+9
-12
lines changed

5 files changed

+9
-12
lines changed

src/fragments/forms/map-form/components/optimization/components/edit-dialog/edit-dialog.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,6 @@ export default {
164164
methods: {
165165
vehicleColors,
166166
vehicleIcon,
167-
isEnabled (action) {
168-
const disabled = this.disabledActions
169-
return !disabled.includes(action)
170-
},
171167
// close editJobs dialog
172168
closeEditModal () {
173169
this.isEditOpen = false
@@ -212,7 +208,8 @@ export default {
212208
for (const s of this.editSkills) {
213209
editSkillIds.push(s.id)
214210
}
215-
for (const id of newSkillIds.sort((a,b) => a-b)) {
211+
newSkillIds.sort((a,b) => a-b)
212+
for (const id of newSkillIds) {
216213
if (!editSkillIds.includes(id)) {
217214
this.editSkills.push(new Skill(' Skill from imported ' + this.content.item + ' ' + id, id))
218215
}

src/fragments/forms/map-form/components/optimization/components/optimization-details/optimization-details.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export default {
4242
}
4343
const routes = []
4444
for (const key in this.localMapViewData.routes) {
45-
const route = Object.assign({}, this.localMapViewData.routes[key])
45+
const route = {...this.localMapViewData.routes[key]}
4646
if (!route.summary) {
4747
route.summary = geoUtils.getHumanizedTimeAndDistance({distance: route.distance, duration:route.duration, unit: 'm'}, this.$t('global.units'))
4848
this.parseSteps(route.steps)

src/fragments/forms/map-form/components/optimization/components/optimization-import/optimization-import.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export default {
100100
parsedInfos = this.parseCsvFile(fileContent)
101101
} else if (type.indexOf('json') > -1 || type.indexOf('geojson') > -1) {
102102
const parsedJson = JSON.parse(fileContent)
103-
if (parsedJson && parsedJson.features) {
103+
if (parsedJson?.features) {
104104
parsedInfos = this.parseGeojsonFile(parsedJson)
105105
} else {
106106
parsedInfos= this.parseJsonFile(parsedJson)

src/models/job.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ class Job extends Place {
185185
}
186186
}
187187

188-
if (props.skills && props.skills.length) {
188+
if (props.skills?.length) {
189189
let skillIds = []
190190
for (const skill of props.skills) {
191191
skillIds.push(skill.id)

src/support/app-modes/strategies/optimization-mode.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ class OptimizationMode {
2525
/**
2626
* Build an optimization route
2727
* @param {*} appRouteData
28-
* @returns {Object} route like {name: 'MapDirections', params: {...} }
28+
* @param options
29+
* @returns {Object} route like {name: 'MapDirections', params: {...}}
2930
*/
3031
getRoute = (appRouteData, options = null) => {
3132
options = options || appRouteData.options
3233
const params = RouteUtils.buildRouteParams(appRouteData, options)
3334
// Build and return the route object
34-
const route = { name: 'MapOptimization', params: params }
35-
return route
35+
return {name: 'MapOptimization', params: params}
3636
}
3737

3838
/**
@@ -50,7 +50,7 @@ class OptimizationMode {
5050
// In the 'directions' mode, the options parameter may contain an options object
5151
// that is expected to be used as the ORS API request options (avoid_polygons, avoid_features etc.)
5252
// So, as they are stringified on the url, we try to parse them back to an object
53-
if (appRouteData.options && appRouteData.options.options) {
53+
if (appRouteData.options?.options) {
5454
appRouteData.options.options = Utils.tryParseJson(appRouteData.options.options) || appRouteData.options.options
5555
}
5656

0 commit comments

Comments
 (0)