-
+
Search for an aquifer by name or id number
diff --git a/app/frontend/src/wells/views/WellDetail.vue b/app/frontend/src/wells/views/WellDetail.vue
index 000ec9bc86..ae605d1a9d 100644
--- a/app/frontend/src/wells/views/WellDetail.vue
+++ b/app/frontend/src/wells/views/WellDetail.vue
@@ -86,7 +86,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
Alternative specs submitted: {{ well.alternative_specs_submitted }}
- Artesian Condition: {{ well.artesian_conditions | nullBooleanToYesNo }}Artesian Condition: {{ nullBooleanToYesNo(well.artesian_conditions) }}Technical Report:
Report Available
N/A
Drinking Water Area Indicator: {{ well.drinking_water_protection_area_ind | nullBooleanToYesNo }}Drinking Water Area Indicator: {{ nullBooleanToYesNo(well.drinking_water_protection_area_ind) }}
@@ -245,7 +245,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
>
- {{ data.item.create_date | moment("MMMM Do YYYY [at] LT") }}
+ {{ formatDate(data.item.create_date) }}
@@ -268,30 +268,30 @@ Licensed under the Apache License, Version 2.0 (the "License");
Well Completion Data
- Total Depth Drilled: {{ well.total_depth_drilled | excludeZeroDecimals }} {{ well.total_depth_drilled ? 'ft bgl':''}}Estimated Well Yield: {{ well.well_yield | excludeZeroDecimals }} {{ well.well_yield ? 'USgpm':'' }}Static Water Level (BTOC): {{ well.static_water_level | excludeZeroDecimals }} {{ well.static_water_level ? 'feet btoc': ''}}Total Depth Drilled: {{ excludeZeroDecimals(well.total_depth_drilled) }} {{ well.total_depth_drilled ? 'ft bgl':''}}Estimated Well Yield: {{ excludeZeroDecimals(well.well_yield) }} {{ well.well_yield ? 'USgpm':'' }}Static Water Level (BTOC): {{ excludeZeroDecimals(well.static_water_level) }} {{ well.static_water_level ? 'feet btoc': ''}}
- Finished Well Depth: {{ well.finished_well_depth | excludeZeroDecimals }} {{ well.finished_well_depth ? 'ft bgl':''}}Finished Well Depth: {{ excludeZeroDecimals(well.finished_well_depth) }} {{ well.finished_well_depth ? 'ft bgl':''}}Well Cap: {{ well.well_cap_type }}Artesian Flow: {{ well.artesian_flow | excludeZeroDecimals }} {{ well.artesian_flow ? 'USgpm':'' }}Artesian Flow: {{ excludeZeroDecimals(well.artesian_flow) }} {{ well.artesian_flow ? 'USgpm':'' }}
- Final Casing Stick Up: {{ well.final_casing_stick_up | excludeZeroDecimals }} {{ well.final_casing_stick_up ? 'inches':''}}Final Casing Stick Up: {{ excludeZeroDecimals(well.final_casing_stick_up) }} {{ well.final_casing_stick_up ? 'inches':''}}Well Disinfected Status: {{ well.well_disinfected_status }}Artesian Pressure (head): {{ well.artesian_pressure_head | excludeZeroDecimals }}Artesian Pressure (head): {{ excludeZeroDecimals(well.artesian_pressure_head) }}
- Depth to Bedrock: {{ well.bedrock_depth | excludeZeroDecimals }} {{ well.bedrock_depth ? 'feet bgl':''}}Depth to Bedrock: {{ excludeZeroDecimals(well.bedrock_depth) }} {{ well.bedrock_depth ? 'feet bgl':''}}
Drilling Methods :
, {{ method.description }}
- Artesian Pressure (PSI): {{ well.artesian_pressure | excludeZeroDecimals }}Artesian Pressure (PSI): {{ excludeZeroDecimals(well.artesian_pressure) }}
- Ground elevation: {{ well.ground_elevation | excludeZeroDecimals }} {{ well.ground_elevation ? 'feet':'' }}Ground elevation: {{ excludeZeroDecimals(well.ground_elevation) }} {{ well.ground_elevation ? 'feet':'' }}Method of determining elevation: {{ well.ground_elevation_method }}Orientation of Well: {{ well.well_orientation_status }}
@@ -306,9 +306,9 @@ Licensed under the Apache License, Version 2.0 (the "License");
:items="well.lithologydescription_set"
show-empty
:fields="lithology_fields">
- {{ data.item.start | excludeZeroDecimals }}
- {{ data.item.end | excludeZeroDecimals }}
- {{ data.item.water_bearing_estimated_flow | excludeZeroDecimals }}
+ {{ excludeZeroDecimals(data.item.start) }}
+ {{ excludeZeroDecimals(data.item.end) }}
+ {{ excludeZeroDecimals(data.item.water_bearing_estimated_flow) }}
@@ -323,16 +323,16 @@ Licensed under the Apache License, Version 2.0 (the "License");
:fields="['from', 'to', 'casing_type', 'casing_material', 'diameter', 'wall_thickness', 'drive_shoe']"
show-empty>
- {{ data.item.start | excludeZeroDecimals }}
+ {{ excludeZeroDecimals(data.item.start) }}
{{ data.label }} (ft bgl)
- {{ data.item.end | excludeZeroDecimals }}
+ {{ excludeZeroDecimals(data.item.end) }}
{{ data.label }} (ft bgl)
{{codeToDescription('casing_codes', data.item.casing_code)}}
{{codeToDescription('casing_materials', data.item.casing_material)}}
{{ data.label }} (in)
- {{ data.item.diameter | excludeZeroDecimals }}
+ {{ excludeZeroDecimals(data.item.diameter) }}
{{ data.label }} (in)
- {{ data.item.wall_thickness | excludeZeroDecimals }}
+ {{ excludeZeroDecimals(data.item.wall_thickness) }}
{{codeToDescription('drive_shoe', data.item.drive_shoe_status)}}
@@ -346,13 +346,13 @@ Licensed under the Apache License, Version 2.0 (the "License");
Surface Seal Installation Method: {{ codeToDescription('surface_seal_methods', well.surface_seal_method) }}Backfill Depth: {{ well.backfill_depth | excludeZeroDecimals }} {{ well.backfill_depth ? 'feet':'' }}Backfill Depth: {{ excludeZeroDecimals(well.backfill_depth) }} {{ well.backfill_depth ? 'feet':'' }}
- Surface Seal Thickness: {{ well.surface_seal_thickness | excludeZeroDecimals }} {{ well.surface_seal_thickness ? 'inches':'' }}Surface Seal Thickness: {{ excludeZeroDecimals(well.surface_seal_thickness) }} {{ well.surface_seal_thickness ? 'inches':'' }}
- Surface Seal Depth: {{ well.surface_seal_depth | excludeZeroDecimals }} {{ well.surface_seal_depth ? 'feet':''}}Surface Seal Depth: {{ excludeZeroDecimals(well.surface_seal_depth) }} {{ well.surface_seal_depth ? 'feet':''}}
@@ -364,12 +364,12 @@ Licensed under the Apache License, Version 2.0 (the "License");
Liner Material: {{ codeToDescription('liner_materials', well.liner_material) }}
- Liner Diameter: {{ well.liner_diameter | excludeZeroDecimals }} {{ well.liner_diameter ? 'inches':'' }}Liner Thickness: {{ well.liner_thickness | excludeZeroDecimals }} {{ well.liner_thickness ? 'inches':'' }}Liner Diameter: {{ excludeZeroDecimals(well.liner_diameter) }} {{ well.liner_diameter ? 'inches':'' }}Liner Thickness: {{ excludeZeroDecimals(well.liner_thickness) }} {{ well.liner_thickness ? 'inches':'' }}
- Liner from: {{ well.liner_from | excludeZeroDecimals }} {{ well.liner_from ? '(ft bgl)':'' }}Liner to: {{ well.liner_to | excludeZeroDecimals }} {{ well.liner_to ? '(ft bgl)':'' }}Liner from: {{ excludeZeroDecimals(well.liner_from) }} {{ well.liner_from ? '(ft bgl)':'' }}Liner to: {{ excludeZeroDecimals(well.liner_to) }} {{ well.liner_to ? '(ft bgl)':'' }}
@@ -383,9 +383,9 @@ Licensed under the Apache License, Version 2.0 (the "License");
show-empty
>
{{data.label}} (ft bgl)
- {{ data.item.start | excludeZeroDecimals }}
+ {{ excludeZeroDecimals(data.item.start) }}
{{data.label}} (ft bgl)
- {{ data.item.end | excludeZeroDecimals }}
+ {{ excludeZeroDecimals(data.item.end) }}
@@ -440,7 +440,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
Developed by:
, {{ method.description }}Development Total Duration: {{ well.development_hours | excludeZeroDecimals }} {{ well.development_hours ? 'hours':'' }}Development Total Duration: {{ excludeZeroDecimals(well.development_hours) }} {{ well.development_hours ? 'hours':'' }}
Estimation Method: {{codeToDescription('yield_estimation_methods', well.yield_estimation_method)}} Estimation Rate: {{ well.yield_estimation_rate | excludeZeroDecimals }} {{ well.yield_estimation_rate ? 'USgpm':'' }}Estimation Duration: {{ well.yield_estimation_duration | excludeZeroDecimals }} {{ well.yield_estimation_duration ? 'hours':'' }}Estimation Rate: {{ excludeZeroDecimals(well.yield_estimation_rate) }} {{ well.yield_estimation_rate ? 'USgpm':'' }}Estimation Duration: {{ excludeZeroDecimals(well.yield_estimation_duration) }} {{ well.yield_estimation_duration ? 'hours':'' }}
- Static Water Level Before Test: {{ well.static_level_before_test | excludeZeroDecimals }} {{well.static_level_before_test ? 'ft (btoc)':'' }}Drawdown: {{ well.drawdown | excludeZeroDecimals }} {{ well.drawdown ? 'ft (btoc)':'' }}Static Water Level Before Test: {{ excludeZeroDecimals(well.static_level_before_test) }} {{well.static_level_before_test ? 'ft (btoc)':'' }}Drawdown: {{ excludeZeroDecimals(well.drawdown) }} {{ well.drawdown ? 'ft (btoc)':'' }}
- Hydrofracturing Performed: {{well.hydro_fracturing_performed | nullBooleanToYesNo}}Increase in Yield Due to Hydrofracturing: {{ well.hydro_fracturing_yield_increase | excludeZeroDecimals }} {{ well.hydro_fracturing_yield_increase ? 'USgpm':'' }}Hydrofracturing Performed: {{ nullBooleanToYesNo(well.hydro_fracturing_performed) }}Increase in Yield Due to Hydrofracturing: {{ excludeZeroDecimals(well.hydro_fracturing_yield_increase) }} {{ well.hydro_fracturing_yield_increase ? 'USgpm':'' }}
@@ -585,6 +585,7 @@ import { FETCH_CODES } from '@/submissions/store/actions.types.js'
import { RESET_WELL_DATA } from '@/wells/store/actions.types.js'
import { SET_WELL_RECORD, SET_WELL_LICENCE } from '@/wells/store/mutations.types.js'
import { TOOLTIP_TEXT } from '@/common/constants.js';
+import { nullBooleanToYesNo, excludeZeroDecimals } from '@/common/helpers/utils.js';
export default {
name: 'WellDetail',
@@ -676,6 +677,12 @@ export default {
...mapGetters(['userRoles', 'config', 'well', 'wellLicence', 'storedWellId', 'codes'])
},
methods: {
+ nullBooleanToYesNo(value) {
+ return nullBooleanToYesNo(value)
+ },
+ excludeZeroDecimals(value) {
+ return excludeZeroDecimals(value)
+ },
handlePrint () {
window.print()
},
diff --git a/app/frontend/tests/unit/specs/APIErrorMessage.spec.js b/app/frontend/tests/unit/specs/APIErrorMessage.spec.js
index 940bf27d1a..6a3c194e96 100644
--- a/app/frontend/tests/unit/specs/APIErrorMessage.spec.js
+++ b/app/frontend/tests/unit/specs/APIErrorMessage.spec.js
@@ -4,7 +4,7 @@ import APIErrorMessage from '@/common/components/APIErrorMessage'
import { SET_ERROR } from '@/registry/store/mutations.types'
const localVue = createLocalVue()
-localVue.use(Vuex)
+// localVue.use(Vuex)
describe('APIErrorMessage.vue', () => {
let mutations
diff --git a/app/frontend/tests/unit/specs/aquifers/components/Search.spec.js b/app/frontend/tests/unit/specs/aquifers/components/Search.spec.js
index edf427ba64..2ee478ddf4 100644
--- a/app/frontend/tests/unit/specs/aquifers/components/Search.spec.js
+++ b/app/frontend/tests/unit/specs/aquifers/components/Search.spec.js
@@ -24,7 +24,7 @@ import aquiferStore from '@/aquifers/store/index.js'
jest.mock('axios')
const localVue = createLocalVue()
-localVue.use(Vuex)
+// localVue.use(Vuex)
localVue.use(VueMoment)
const aquiferFixture = {
diff --git a/app/frontend/tests/unit/specs/aquifers/components/View.spec.js b/app/frontend/tests/unit/specs/aquifers/components/View.spec.js
index e9649d4cad..01ba9e638c 100644
--- a/app/frontend/tests/unit/specs/aquifers/components/View.spec.js
+++ b/app/frontend/tests/unit/specs/aquifers/components/View.spec.js
@@ -29,7 +29,7 @@ import ViewComponent from '@/aquifers/components/View.vue'
jest.mock('axios')
const localVue = createLocalVue()
-localVue.use(Vuex)
+// localVue.use(Vuex)
const aquiferFixture = {
aquifer_id: '4',
diff --git a/app/frontend/tests/unit/specs/common/filters/Filters.spec.js b/app/frontend/tests/unit/specs/common/filters/Filters.spec.js
index c401228960..a84c6ba114 100644
--- a/app/frontend/tests/unit/specs/common/filters/Filters.spec.js
+++ b/app/frontend/tests/unit/specs/common/filters/Filters.spec.js
@@ -1,6 +1,6 @@
-import { excludeZeroDecimals } from '@/common/filters'
+import { excludeZeroDecimals } from '@/common/helps/utils.js'
-const excludeZeroDecimalsFixture = [
+const excludeZeroDecimalsUtil = [
{ was: 1.500, should: 1.5 },
{ was: 1.000, should: 1 },
{ was: 1.006, should: 1.006 },
@@ -18,9 +18,9 @@ const excludeZeroDecimalsFixture = [
{ was: ' ', should: ' ' }
]
-describe('filters', () => {
+describe('utils', () => {
it('prove excludeZeroDecimals', () => {
- excludeZeroDecimalsFixture.forEach(c => {
+ excludeZeroDecimalsUtil.forEach(c => {
expect(excludeZeroDecimals(c.was)).toEqual(c.should)
})
})
diff --git a/app/frontend/tests/unit/specs/components/Header.spec.js b/app/frontend/tests/unit/specs/components/Header.spec.js
index 0176f0dc1e..3628e49ca6 100644
--- a/app/frontend/tests/unit/specs/components/Header.spec.js
+++ b/app/frontend/tests/unit/specs/components/Header.spec.js
@@ -3,7 +3,7 @@ import Vuex from 'vuex'
import Header from '@/common/components/Header.vue'
const localVue = createLocalVue()
-localVue.use(Vuex)
+// localVue.use(Vuex)
describe('Header.vue', () => {
let getters
diff --git a/app/frontend/tests/unit/specs/people/ApplicationAddEdit.spec.js b/app/frontend/tests/unit/specs/people/ApplicationAddEdit.spec.js
index 5967cb772b..209194470e 100644
--- a/app/frontend/tests/unit/specs/people/ApplicationAddEdit.spec.js
+++ b/app/frontend/tests/unit/specs/people/ApplicationAddEdit.spec.js
@@ -5,7 +5,7 @@ import { FETCH_DRILLER_OPTIONS } from '@/registry/store/actions.types'
import fakeOptions from '../fakeDrillerOptions'
const localVue = createLocalVue()
-localVue.use(Vuex)
+// localVue.use(Vuex)
describe('ApplicationAddEdit.vue', () => {
describe('When loaded', () => {
diff --git a/app/frontend/tests/unit/specs/people/ApplicationDetail.spec.js b/app/frontend/tests/unit/specs/people/ApplicationDetail.spec.js
index 932cd5f6ea..8586bdc3d7 100644
--- a/app/frontend/tests/unit/specs/people/ApplicationDetail.spec.js
+++ b/app/frontend/tests/unit/specs/people/ApplicationDetail.spec.js
@@ -11,7 +11,7 @@ import ApiService from '@/common/services/ApiService.js'
jest.mock('@/common/services/ApiService.js')
const localVue = createLocalVue()
-localVue.use(Vuex)
+// localVue.use(Vuex)
const GET_DEFAULT_STORE_MODULES = () => {
return {
diff --git a/app/frontend/tests/unit/specs/people/ChangeHistory.spec.js b/app/frontend/tests/unit/specs/people/ChangeHistory.spec.js
index 30961355d5..785bb65bec 100644
--- a/app/frontend/tests/unit/specs/people/ChangeHistory.spec.js
+++ b/app/frontend/tests/unit/specs/people/ChangeHistory.spec.js
@@ -5,7 +5,7 @@ import moxios from 'moxios'
import ChangeHistory from '@/common/components/ChangeHistory'
const localVue = createLocalVue()
-localVue.use(Vuex)
+// localVue.use(Vuex)
localVue.use(VueMoment)
describe('Notes.vue', () => {
diff --git a/app/frontend/tests/unit/specs/people/Notes.spec.js b/app/frontend/tests/unit/specs/people/Notes.spec.js
index d7bd6381ee..9c5b0e2ac3 100644
--- a/app/frontend/tests/unit/specs/people/Notes.spec.js
+++ b/app/frontend/tests/unit/specs/people/Notes.spec.js
@@ -5,7 +5,7 @@ import Notes from '@/registry/components/people/Notes'
import fakePerson from '../fakePerson'
const localVue = createLocalVue()
-localVue.use(Vuex)
+// localVue.use(Vuex)
localVue.use(VueMoment)
describe('Notes.vue', () => {
diff --git a/app/frontend/tests/unit/specs/people/OrganizationEdit.spec.js b/app/frontend/tests/unit/specs/people/OrganizationEdit.spec.js
index b4dc0b7678..413c951f99 100644
--- a/app/frontend/tests/unit/specs/people/OrganizationEdit.spec.js
+++ b/app/frontend/tests/unit/specs/people/OrganizationEdit.spec.js
@@ -7,7 +7,7 @@ import { FETCH_DRILLER_OPTIONS } from '@/registry/store/actions.types'
import fakeOptions from '../fakeDrillerOptions'
const localVue = createLocalVue()
-localVue.use(Vuex)
+// localVue.use(Vuex)
describe('OrganizationEdit.vue', () => {
let store
diff --git a/app/frontend/tests/unit/specs/people/PersonDetail.spec.js b/app/frontend/tests/unit/specs/people/PersonDetail.spec.js
index 13e21c4098..a3271f7976 100644
--- a/app/frontend/tests/unit/specs/people/PersonDetail.spec.js
+++ b/app/frontend/tests/unit/specs/people/PersonDetail.spec.js
@@ -10,7 +10,7 @@ import { FETCH_DRILLER, FETCH_DRILLER_OPTIONS } from '@/registry/store/actions.t
import fakePerson from '../fakePerson'
const localVue = createLocalVue()
-localVue.use(Vuex)
+// localVue.use(Vuex)
localVue.use(VueMoment)
const GET_DEFAULT_STORE_MODULES = () => {
diff --git a/app/frontend/tests/unit/specs/people/PersonNotes.spec.js b/app/frontend/tests/unit/specs/people/PersonNotes.spec.js
index d3868887a1..6795341661 100644
--- a/app/frontend/tests/unit/specs/people/PersonNotes.spec.js
+++ b/app/frontend/tests/unit/specs/people/PersonNotes.spec.js
@@ -5,7 +5,7 @@ import PersonNotes from '@/registry/components/people/PersonNotes'
import fakePerson from '../fakePerson'
const localVue = createLocalVue()
-localVue.use(Vuex)
+// localVue.use(Vuex)
localVue.use(VueMoment)
const GET_DEFAULT_STORE_MODULES = () => {
diff --git a/app/frontend/tests/unit/specs/search/SearchHome.spec.js b/app/frontend/tests/unit/specs/search/SearchHome.spec.js
index 2b6f068821..86a8bcfeef 100644
--- a/app/frontend/tests/unit/specs/search/SearchHome.spec.js
+++ b/app/frontend/tests/unit/specs/search/SearchHome.spec.js
@@ -17,7 +17,7 @@ import { SET_SEARCH_RESPONSE, SET_LAST_SEARCHED_PARAMS } from '@/registry/store/
import fakePersonList from '../fakePersonList.js'
const localVue = createLocalVue()
-localVue.use(Vuex)
+// localVue.use(Vuex)
const DEFAULT_REGISTRIES_STORE_GETTERS = {
drillerOptions: jest.fn().mockReturnValue(fakeDrillerOptions),
diff --git a/app/frontend/tests/unit/specs/search/SearchTable.spec.js b/app/frontend/tests/unit/specs/search/SearchTable.spec.js
index 4c3ad7b37e..597016e514 100644
--- a/app/frontend/tests/unit/specs/search/SearchTable.spec.js
+++ b/app/frontend/tests/unit/specs/search/SearchTable.spec.js
@@ -15,7 +15,7 @@ import {
import fakePersonList from '../fakePersonList.js'
const localVue = createLocalVue()
-localVue.use(Vuex)
+// localVue.use(Vuex)
localVue.use(VueRouter)
const DEFAULT_AUTH_STORE_GETTERS = () => {
diff --git a/app/frontend/tests/unit/specs/submissions/ActivitySubmissionForm.spec.js b/app/frontend/tests/unit/specs/submissions/ActivitySubmissionForm.spec.js
index c23dcf061a..f9087b1f26 100644
--- a/app/frontend/tests/unit/specs/submissions/ActivitySubmissionForm.spec.js
+++ b/app/frontend/tests/unit/specs/submissions/ActivitySubmissionForm.spec.js
@@ -6,7 +6,7 @@ import ActivitySubmissionForm from '@/submissions/components/SubmissionForm/Acti
import Lithology from '@/submissions/components/SubmissionForm/Lithology'
const localVue = createLocalVue()
-localVue.use(Vuex)
+// localVue.use(Vuex)
localVue.use(VueRouter)
const router = new VueRouter()
diff --git a/app/frontend/tests/unit/specs/submissions/Casings.spec.js b/app/frontend/tests/unit/specs/submissions/Casings.spec.js
index 6066083c5d..25d029afe2 100644
--- a/app/frontend/tests/unit/specs/submissions/Casings.spec.js
+++ b/app/frontend/tests/unit/specs/submissions/Casings.spec.js
@@ -4,7 +4,7 @@ import Vuex from 'vuex'
import Casings from '@/submissions/components/SubmissionForm/Casings.vue'
const localVue = createLocalVue()
-localVue.use(Vuex)
+// localVue.use(Vuex)
describe('Casings.vue', () => {
let store
diff --git a/app/frontend/tests/unit/specs/submissions/ClosureDescription.spec.js b/app/frontend/tests/unit/specs/submissions/ClosureDescription.spec.js
index 3eeb2f1661..ad33d390cf 100644
--- a/app/frontend/tests/unit/specs/submissions/ClosureDescription.spec.js
+++ b/app/frontend/tests/unit/specs/submissions/ClosureDescription.spec.js
@@ -5,7 +5,7 @@ import ClosureDescription from '@/submissions/components/SubmissionForm/ClosureD
const localVue = createLocalVue()
const defaultRows = 10
-localVue.use(Vuex)
+// localVue.use(Vuex)
describe('ClosureDescription.vue', () => {
let store
diff --git a/app/frontend/tests/unit/specs/submissions/Coords.spec.js b/app/frontend/tests/unit/specs/submissions/Coords.spec.js
index c560024a13..4addb504df 100644
--- a/app/frontend/tests/unit/specs/submissions/Coords.spec.js
+++ b/app/frontend/tests/unit/specs/submissions/Coords.spec.js
@@ -4,7 +4,7 @@ import Vuex from 'vuex'
import Coords from '@/submissions/components/SubmissionForm/Coords.vue'
const localVue = createLocalVue()
-localVue.use(Vuex)
+// localVue.use(Vuex)
describe('Coords.vue', () => {
let store
diff --git a/app/frontend/tests/unit/specs/submissions/Liner.spec.js b/app/frontend/tests/unit/specs/submissions/Liner.spec.js
index 10ca8fb33c..e86c7b0466 100644
--- a/app/frontend/tests/unit/specs/submissions/Liner.spec.js
+++ b/app/frontend/tests/unit/specs/submissions/Liner.spec.js
@@ -3,7 +3,7 @@ import Vuex from 'vuex'
import Liner from '@/submissions/components/SubmissionForm/Liner.vue'
const localVue = createLocalVue()
-localVue.use(Vuex)
+// localVue.use(Vuex)
describe('Liner.vue', () => {
let store
diff --git a/app/frontend/tests/unit/specs/submissions/Lithology.spec.js b/app/frontend/tests/unit/specs/submissions/Lithology.spec.js
index 7a083ec72f..c55bfd80f9 100644
--- a/app/frontend/tests/unit/specs/submissions/Lithology.spec.js
+++ b/app/frontend/tests/unit/specs/submissions/Lithology.spec.js
@@ -3,7 +3,7 @@ import Vuex from 'vuex'
import Lithology from '@/submissions/components/SubmissionForm/Lithology.vue'
const localVue = createLocalVue()
-localVue.use(Vuex)
+// localVue.use(Vuex)
describe('Lithology.vue', () => {
let store
diff --git a/app/frontend/tests/unit/specs/submissions/Screens.spec.js b/app/frontend/tests/unit/specs/submissions/Screens.spec.js
index 73fa431571..33f0471657 100644
--- a/app/frontend/tests/unit/specs/submissions/Screens.spec.js
+++ b/app/frontend/tests/unit/specs/submissions/Screens.spec.js
@@ -3,7 +3,7 @@ import Vuex from 'vuex'
import Screens from '@/submissions/components/SubmissionForm/Screens.vue'
const localVue = createLocalVue()
-localVue.use(Vuex)
+// localVue.use(Vuex)
describe('Screens.vue', () => {
let store
diff --git a/app/frontend/tests/unit/specs/submissions/SubmissionPreview.spec.js b/app/frontend/tests/unit/specs/submissions/SubmissionPreview.spec.js
index 9bb54261fe..d96fa00843 100644
--- a/app/frontend/tests/unit/specs/submissions/SubmissionPreview.spec.js
+++ b/app/frontend/tests/unit/specs/submissions/SubmissionPreview.spec.js
@@ -5,7 +5,7 @@ import SubmissionPreview from '@/submissions/components/SubmissionPreview/Submis
import { shallowMount, createLocalVue } from '@vue/test-utils'
const localVue = createLocalVue()
-localVue.use(Vuex)
+// localVue.use(Vuex)
describe('filterBlankRows', () => {
let store
diff --git a/app/frontend/tests/unit/specs/submissions/SubmissionsHome.spec.js b/app/frontend/tests/unit/specs/submissions/SubmissionsHome.spec.js
index 88809e5ace..975b00839d 100644
--- a/app/frontend/tests/unit/specs/submissions/SubmissionsHome.spec.js
+++ b/app/frontend/tests/unit/specs/submissions/SubmissionsHome.spec.js
@@ -8,7 +8,7 @@ import SubmissionsHome from '@/submissions/views/SubmissionsHome.vue'
import { FETCH_CODES, FETCH_WELL_TAGS } from '@/submissions/store/actions.types.js'
const localVue = createLocalVue()
-localVue.use(Vuex)
+// localVue.use(Vuex)
localVue.use(VueRouter)
const router = new VueRouter()
diff --git a/app/frontend/tests/unit/specs/submissions/WellType.spec.js b/app/frontend/tests/unit/specs/submissions/WellType.spec.js
index d18a681c49..1140b4e749 100644
--- a/app/frontend/tests/unit/specs/submissions/WellType.spec.js
+++ b/app/frontend/tests/unit/specs/submissions/WellType.spec.js
@@ -4,7 +4,7 @@ import Vuex from 'vuex'
import WellType from '@/submissions/components/SubmissionForm/WellType.vue'
const localVue = createLocalVue()
-localVue.use(Vuex)
+// localVue.use(Vuex)
describe('WellType.vue', () => {
let store
diff --git a/app/frontend/tests/unit/specs/surveys/Surveys.spec.js b/app/frontend/tests/unit/specs/surveys/Surveys.spec.js
index 80e2a2dfba..e20c513511 100644
--- a/app/frontend/tests/unit/specs/surveys/Surveys.spec.js
+++ b/app/frontend/tests/unit/specs/surveys/Surveys.spec.js
@@ -3,7 +3,7 @@ import Vuex from 'vuex'
import Surveys from '@/surveys/views/Surveys.vue'
const localVue = createLocalVue()
-localVue.use(Vuex)
+// localVue.use(Vuex)
describe('Surveys.vue', () => {
let store
diff --git a/app/frontend/tests/unit/specs/wells/EditWellAquifers.spec.js b/app/frontend/tests/unit/specs/wells/EditWellAquifers.spec.js
index 9e4b20534d..76c2ab1007 100644
--- a/app/frontend/tests/unit/specs/wells/EditWellAquifers.spec.js
+++ b/app/frontend/tests/unit/specs/wells/EditWellAquifers.spec.js
@@ -19,7 +19,7 @@ import EditWellAquifers from '@/wells/views/EditWellAquifers.vue'
import auth from '@/common/store/auth.js'
const localVue = createLocalVue()
-localVue.use(Vuex)
+// localVue.use(Vuex)
describe('EditWellAquifers.vue', () => {
const component = (options, storeState = {}) => {
diff --git a/app/frontend/tests/unit/specs/wells/WellDetail.spec.js b/app/frontend/tests/unit/specs/wells/WellDetail.spec.js
index 52d684a625..1afd84b776 100644
--- a/app/frontend/tests/unit/specs/wells/WellDetail.spec.js
+++ b/app/frontend/tests/unit/specs/wells/WellDetail.spec.js
@@ -22,7 +22,7 @@ import wellsStore from '@/wells/store/index.js'
import documentState from '@/common/store/documents.js'
const localVue = createLocalVue()
-localVue.use(Vuex)
+// localVue.use(Vuex)
describe('WellDetail.vue', () => {
const id = 113169
diff --git a/app/frontend/tests/unit/specs/wells/WellSearch.spec.js b/app/frontend/tests/unit/specs/wells/WellSearch.spec.js
index 0e70b5d2a4..d41450ec3c 100644
--- a/app/frontend/tests/unit/specs/wells/WellSearch.spec.js
+++ b/app/frontend/tests/unit/specs/wells/WellSearch.spec.js
@@ -23,7 +23,7 @@ import wellsStore from '@/wells/store/index.js'
import documentState from '@/common/store/documents.js'
const localVue = createLocalVue()
-localVue.use(Vuex)
+// localVue.use(Vuex)
describe('WellSearch.vue', () => {
const component = (options, storeState = {}) => {
diff --git a/app/frontend/vue.config.js b/app/frontend/vue.config.js
index a1c3b91cd7..906533f726 100644
--- a/app/frontend/vue.config.js
+++ b/app/frontend/vue.config.js
@@ -2,27 +2,42 @@ if (process.env.API_TARGET) {
console.log(`Targetting the API ${process.env.API_TARGET}`)
}
+process.env.VUE_CLI_TEST = false
+
module.exports = {
lintOnSave: false,
runtimeCompiler: true,
publicPath: process.env.NODE_ENV === 'production' ? '/gwells/' : '/',
configureWebpack: {
+ devtool: 'source-map',
resolve: {
alias: {
moment: 'moment/src/moment',
- lodash: 'lodash-es'
- }
- },
- devServer: {
- watchOptions: {
- ignored: /node_modules/,
- poll: 1000
+ lodash: 'lodash-es',
+ vue$: '@vue/compat'
+ },
+ fallback: {
+ 'querystring': require.resolve('querystring-es3')
}
}
},
- transpileDependencies: [
- '@geolonia/mbgl-gesture-handling'
- ],
+ chainWebpack: config => {
+ config.resolve.alias.set('vue', '@vue/compat')
+ config.module
+ .rule('vue')
+ .use('vue-loader')
+ .tap(options => {
+ return {
+ ...options,
+ compilerOptions: {
+ compatConfig: {
+ MODE: 2 // Enable Vue 2 compat mode
+ }
+ }
+ }
+ })
+ },
+ transpileDependencies: ['@geolonia/mbgl-gesture-handling'],
devServer: {
proxy: {
'^/api/': {
diff --git a/docker-compose.yml b/docker-compose.yml
index 667b7f4063..035e3b1545 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.7'
+version: "3.7"
# NOTE For Red Hat or other images on the internal registry please login as follows:
# 1. Be logged into the BC Gov OpenShift Console
# https://console.pathfinder.gov.bc.ca:8443/console/catalog)
@@ -8,17 +8,17 @@ version: '3.7'
# For example:
# docker login -u garywong-bc -p `oc whoami -t` docker-registry.pathfinder.gov.bc.ca
services:
-#############################################################################################
-### Minio-Pub ###
-#############################################################################################
+ #############################################################################################
+ ### Minio-Pub ###
+ #############################################################################################
minio-public:
build:
context: ./openshift/docker/minio/
hostname: minio
ports:
- - "9000:9000"
+ - "9000:9000"
volumes:
- - /data
+ - /data
environment:
MINIO_ACCESS_KEY: minio
MINIO_SECRET_KEY: minio1234
@@ -27,17 +27,17 @@ services:
command: server /data
networks:
- gwells-network
-#############################################################################################
-### Minio-Priv ###
-#############################################################################################
+ #############################################################################################
+ ### Minio-Priv ###
+ #############################################################################################
minio-private:
build:
context: ./openshift/docker/minio/
hostname: minio
ports:
- - "9001:9001"
+ - "9001:9001"
volumes:
- - /data
+ - /data
environment:
MINIO_ACCESS_KEY: minio
MINIO_SECRET_KEY: minio1234
@@ -46,9 +46,9 @@ services:
command: server --address :9001 /data
networks:
- gwells-network
-#############################################################################################
-### CrunchyDB ###
-#############################################################################################
+ #############################################################################################
+ ### CrunchyDB ###
+ #############################################################################################
db:
platform: linux/x86_64
image: crunchydata/crunchy-postgres-gis:centos7-12.2-4.2.2
@@ -72,7 +72,7 @@ services:
TILESERVER_USER: ftw_reader
TILESERVER_PASSWORD: test1
ports:
- - "5432:5432"
+ - "5432:5432"
volumes:
- pgdata-volume:/pgdata:z
- type: bind
@@ -87,9 +87,9 @@ services:
start_period: 120s
networks:
- gwells-network
-#############################################################################################
-### Tileserv ###
-#############################################################################################
+ #############################################################################################
+ ### Tileserv ###
+ #############################################################################################
tileserv:
hostname: tileserv
depends_on:
@@ -97,8 +97,8 @@ services:
platform: linux/x86_64
image: pramsey/pg_tileserv:20231005
env_file:
- - path: ./.env.test
- required: false
+ - path: ./.env.test
+ required: false
environment:
DATABASE_URL: "postgres://ftw_reader:${DATABASE_PASSWORD:-test1}@${GWELLS_SERVICE_HOST:-db}:${GWELLS_SERVICE_PORT:-5432}/gwells"
ports:
@@ -106,11 +106,14 @@ services:
entrypoint: sh -c "sleep 10; /app/pg_tileserv"
networks:
- gwells-network
-#############################################################################################
-### Frontend ###
-#############################################################################################
+ #############################################################################################
+ ### Frontend ###
+ #############################################################################################
frontend:
- image: node:14.21.3
+ image: node:18.12.0
+ build:
+ context: ./app/frontend
+ dockerfile: Dockerfile
hostname: frontend
working_dir: /app/frontend
environment:
@@ -120,10 +123,10 @@ services:
VECTOR_TILE_SERVER: "http://tileserv:7800/"
API_TARGET: "${API_TARGET:-http://backend:8000/}"
command: /bin/bash -c "
- set -x &&
- cd /app/frontend &&
- npm install &&
- npm run serve"
+ set -x &&
+ cd /app/frontend &&
+ npm install --legacy-peer-deps &&
+ npm run serve --legacy-peer-deps"
ports:
- "8080:8080"
volumes:
@@ -135,9 +138,9 @@ services:
- backend
networks:
- gwells-network
-#############################################################################################
-### Backend ###
-#############################################################################################
+ #############################################################################################
+ ### Backend ###
+ #############################################################################################
backend:
platform: linux/x86_64
build:
@@ -145,8 +148,8 @@ services:
dockerfile: Dockerfile.dev
hostname: backend
env_file:
- - path: ./.env.test
- required: false
+ - path: ./.env.test
+ required: false
environment:
ENVIRONMENT: "${ENVIRONMENT:-local}"
APP_CONTEXT_ROOT: gwells
@@ -179,7 +182,7 @@ services:
S3_HOST: minio-public:9000
S3_PRIVATE_HOST: minio-private:9001
S3_PRIVATE_BUCKET: gwells
- S3_PRIVATE_ROOT_BUCKET: gwells
+ S3_PRIVATE_ROOT_BUCKET: gwells
S3_PRIVATE_WELL_BUCKET: well-docs
S3_PRIVATE_AQUIFER_BUCKET: aquifer-docs
S3_PRIVATE_REGISTRANT_BUCKET: driller-docs
@@ -187,7 +190,7 @@ services:
S3_PUBLIC_SECRET_KEY: minio1234
S3_AQUIFER_BUCKET: aquifer-docs
S3_REGISTRANT_BUCKET: driller-docs
- S3_ROOT_BUCKET: gwells
+ S3_ROOT_BUCKET: gwells
S3_WELL_BUCKET: well-docs
S3_WELL_EXPORT_BUCKET: gwells
S3_USE_SECURE: 0
@@ -213,9 +216,9 @@ services:
networks:
- gwells-network
-#############################################################################################
-### Volumes ###
-#############################################################################################
+ #############################################################################################
+ ### Volumes ###
+ #############################################################################################
pgadmin:
container_name: gwells-pgadmin
image: dpage/pgadmin4
@@ -227,7 +230,6 @@ services:
networks:
- gwells-network
-
#############################################################################################
### Volumes ###
#############################################################################################