-
+ {_appConfig ? (
+
+
+ ) : (
+
+
+ {_showApplicationAlert ?
+ )}
Launch Your Own
-{APP_NAME}
+{DEFAULT_APP_NAME}
- Now you can view your own datasets by deploying {APP_NAME} into your - AWS account! Simply follow the instructions below to get started. + Now you can view your own datasets by deploying {DEFAULT_APP_NAME}{' '} + into your AWS account! Simply follow the instructions below to get + started.
- Sign In to the Console @@ -62,7 +63,7 @@ const LaunchModal = () => { Create a new CloudFormation Stack with the template link below
- Configure new Stack as needed -
- Launch your own {APP_NAME} +
- Launch your own {DEFAULT_APP_NAME}
@@ -70,7 +71,7 @@ const LaunchModal = () => { URL" field:
-
- onImageClick()}>
+ {templateURL}
+ {_appConfig.CF_TEMPLATE_URL}
- {ANALYZE_LINK && (
+ {_appConfig.ANALYZE_BTN_URL && (
)}
- {SHOW_PUBLISH_BTN === true && (
+ {_appConfig.SHOW_PUBLISH_BTN === true && (
)}
- {CF_TEMPLATE_URL && (
+ {_appConfig.CF_TEMPLATE_URL && (
@@ -135,7 +128,7 @@ const BottomContent = () => {
{_showAppLoading && (
{
+ const user = userEvent.setup()
const setup = () =>
render(
@@ -13,24 +23,190 @@ describe('Search', () => {
)
- beforeEach(() => {
- vi.mock('../../assets/config', async () => {
- const actualConfig = await vi.importActual('../../assets/config')
- return {
- ...actualConfig,
- VITE_ADVANCED_SEARCH_ENABLED: false
- }
- })
- })
-
afterEach(() => {
vi.resetAllMocks()
})
- describe('on render', () => {
- it('should render auto search when VITE_ADVANCED_SEARCH_ENABLED is false', () => {
- setup()
- expect(screen.getByText(/auto search/i)).toBeInTheDocument()
+ describe('if advanced search enabled is false', () => {
+ beforeEach(() => {
+ store.dispatch(setappConfig(mockAppConfig))
+ })
+ describe('on render', () => {
+ it('should render auto search when ADVANCED_SEARCH_ENABLED is false', () => {
+ setup()
+ expect(screen.getByText(/auto search/i)).toBeInTheDocument()
+ })
+ })
+ })
+ describe('if advanced search enabled is true', () => {
+ beforeEach(() => {
+ vi.mock('../../utils/mapHelper')
+ vi.mock('../../utils/searchHelper')
+ const mockAppConfigSearchEnabled = {
+ ...mockAppConfig,
+ ADVANCED_SEARCH_ENABLED: true
+ }
+ store.dispatch(setappConfig(mockAppConfigSearchEnabled))
+ })
+ describe('on render', () => {
+ it('should not render auto search when ADVANCED_SEARCH_ENABLED is true', () => {
+ setup()
+ expect(
+ screen.queryByText('test_autoSearchContainer')
+ ).not.toBeInTheDocument()
+ })
+ it('should not render disabled search bar overlay div', async () => {
+ setup()
+ expect(
+ screen.queryByTestId('test_disableSearchOverlay')
+ ).not.toBeInTheDocument()
+ })
+ })
+ describe('when search options changed', () => {
+ it('should set showAdvancedSearchOptions to false in redux', () => {
+ store.dispatch(setshowAdvancedSearchOptions(true))
+ setup()
+ store.dispatch(setCloudCover(5))
+ expect(store.getState().mainSlice.showAdvancedSearchOptions).toBeFalsy()
+ })
+ })
+ describe('when search button clicked', () => {
+ it('should set showAdvancedSearchOptions to false in redux', async () => {
+ store.dispatch(setshowAdvancedSearchOptions(true))
+ setup()
+ const searchButton = screen.getByRole('button', {
+ name: /search/i
+ })
+ await user.click(searchButton)
+ expect(store.getState().mainSlice.showAdvancedSearchOptions).toBeFalsy()
+ })
+ })
+ describe('when advanced clicked', () => {
+ it('should set showAdvancedSearchOptions be the opposite showAdvancedSearchOptions of in redux', async () => {
+ setup()
+ const advancedButton = screen.getByText(/advanced/i)
+ await user.click(advancedButton)
+ expect(
+ store.getState().mainSlice.showAdvancedSearchOptions
+ ).toBeTruthy()
+ await user.click(advancedButton)
+ expect(store.getState().mainSlice.showAdvancedSearchOptions).toBeFalsy()
+ })
+ })
+ describe('when draw boundary button clicked', () => {
+ it('should not call functions if geom already exists', async () => {
+ const spyEnableMapPolyDrawing = vi.spyOn(
+ mapHelper,
+ 'enableMapPolyDrawing'
+ )
+ store.dispatch(
+ setsearchGeojsonBoundary({
+ type: 'Polygon',
+ coordinates: [[]]
+ })
+ )
+ setup()
+ const advancedButton = screen.getByText(/advanced/i)
+ await user.click(advancedButton)
+ const drawBoundaryButton = screen.getByRole('button', {
+ name: /draw boundary/i
+ })
+ await user.click(drawBoundaryButton)
+ expect(spyEnableMapPolyDrawing).not.toHaveBeenCalled()
+ })
+ it('should enter drawing state if geom does not exists', async () => {
+ const spyEnableMapPolyDrawing = vi.spyOn(
+ mapHelper,
+ 'enableMapPolyDrawing'
+ )
+ store.dispatch(setshowAdvancedSearchOptions(true))
+ setup()
+ const advancedButton = screen.getByText(/advanced/i)
+ await user.click(advancedButton)
+ const drawBoundaryButton = screen.getByRole('button', {
+ name: /draw boundary/i
+ })
+ await user.click(drawBoundaryButton)
+ expect(spyEnableMapPolyDrawing).toHaveBeenCalled()
+ expect(store.getState().mainSlice.showAdvancedSearchOptions).toBeFalsy()
+ expect(store.getState().mainSlice.isDrawingEnabled).toBeTruthy()
+ })
+ })
+ describe('when clear button clicked', () => {
+ it('should not call functions if geom does not exists', async () => {
+ const spyClearLayer = vi.spyOn(mapHelper, 'clearLayer')
+ setup()
+ const advancedButton = screen.getByText(/advanced/i)
+ await user.click(advancedButton)
+ const clearButton = screen.getByRole('button', {
+ name: /clear/i
+ })
+ await user.click(clearButton)
+ expect(spyClearLayer).not.toHaveBeenCalled()
+ })
+ it('should clear layer and close options if geom exists', async () => {
+ const spyClearLayer = vi.spyOn(mapHelper, 'clearLayer')
+ store.dispatch(
+ setsearchGeojsonBoundary({
+ type: 'Polygon',
+ coordinates: [[]]
+ })
+ )
+ setup()
+ const advancedButton = screen.getByText(/advanced/i)
+ await user.click(advancedButton)
+ const clearButton = screen.getByRole('button', {
+ name: /clear/i
+ })
+ await user.click(clearButton)
+ expect(spyClearLayer).toHaveBeenCalled()
+ expect(store.getState().mainSlice.searchGeojsonBoundary).toBeNull()
+ expect(store.getState().mainSlice.showAdvancedSearchOptions).toBeFalsy()
+ })
+ })
+ describe('when upload geojson button clicked', () => {
+ it('should not call dispatch functions if geom already exists', async () => {
+ store.dispatch(
+ setsearchGeojsonBoundary({
+ type: 'Polygon',
+ coordinates: [[]]
+ })
+ )
+ setup()
+ const advancedButton = screen.getByText(/advanced/i)
+ await user.click(advancedButton)
+ const uploadGeojsonButton = screen.getByRole('button', {
+ name: /upload geojson/i
+ })
+ await user.click(uploadGeojsonButton)
+ expect(store.getState().mainSlice.showUploadGeojsonModal).toBeFalsy()
+ })
+ it('should call dispatch functions if geom does not exists', async () => {
+ store.dispatch(setshowAdvancedSearchOptions(true))
+ setup()
+ const advancedButton = screen.getByText(/advanced/i)
+ await user.click(advancedButton)
+ const uploadGeojsonButton = screen.getByRole('button', {
+ name: /upload geojson/i
+ })
+ await user.click(uploadGeojsonButton)
+ expect(store.getState().mainSlice.showAdvancedSearchOptions).toBeFalsy()
+ expect(store.getState().mainSlice.showUploadGeojsonModal).toBeTruthy()
+ })
+ })
+ describe('when drawing mode enabled', () => {
+ it('should render disabled search bar overlay div', async () => {
+ setup()
+ const advancedButton = screen.getByText(/advanced/i)
+ await user.click(advancedButton)
+ const drawBoundaryButton = screen.getByRole('button', {
+ name: /draw boundary/i
+ })
+ await user.click(drawBoundaryButton)
+ expect(
+ screen.queryByTestId('test_disableSearchOverlay')
+ ).toBeInTheDocument()
+ })
})
})
})
diff --git a/src/components/defaults.js b/src/components/defaults.js
index 33712032..f2a8bdee 100644
--- a/src/components/defaults.js
+++ b/src/components/defaults.js
@@ -1,20 +1,8 @@
-import {
- VITE_COLORMAP,
- VITE_API_MAX_ITEMS,
- VITE_MOSAIC_MAX_ITEMS,
- VITE_MOSAIC_MIN_ZOOM_LEVEL
-} from '../assets/config.js'
-
-export const MOSAIC_MIN_ZOOM = VITE_MOSAIC_MIN_ZOOM_LEVEL || 7
-export const APP_NAME = import.meta.env.VITE_APP_NAME || 'FilmDrop Console'
-export const MOSAIC_MAX_ITEMS = VITE_MOSAIC_MAX_ITEMS || 100
-export const API_MAX_ITEMS = VITE_API_MAX_ITEMS || 200
+export const DEFAULT_MOSAIC_MIN_ZOOM = 7
+export const DEFAULT_MOSAIC_MAX_ITEMS = 100
+export const DEFAULT_API_MAX_ITEMS = 200
export const DEFAULT_MED_ZOOM = 4
export const DEFAULT_HIGH_ZOOM = 7
-export const COLORMAP = VITE_COLORMAP || 'viridis'
-export const SearchTypes = Object.freeze({
- Scene: Symbol('scene'),
- GridCode: Symbol('gridCode'),
- GridCodeScenes: Symbol('gridCodeScene'),
- GeoHex: Symbol('geoHex')
-})
+export const DEFAULT_COLORMAP = 'viridis'
+export const DEFAULT_APP_NAME =
+ import.meta.env.VITE_APP_NAME || 'FilmDrop Console'
diff --git a/src/redux/slices/mainSlice.js b/src/redux/slices/mainSlice.js
index 2caafed7..01d28b9e 100644
--- a/src/redux/slices/mainSlice.js
+++ b/src/redux/slices/mainSlice.js
@@ -1,5 +1,4 @@
import { createSlice } from '@reduxjs/toolkit'
-import { VITE_DEFAULT_COLLECTION } from '../../assets/config.js'
// this is the initial state values for the redux store
// add to this for new state and set whatever default you want
@@ -8,7 +7,6 @@ const initialState = {
dateTime: [],
cloudCover: 0,
showCloudSlider: true,
- selectedCollection: VITE_DEFAULT_COLLECTION || null,
searchResults: null,
clickResults: [],
searchLoading: false,
@@ -35,7 +33,8 @@ const initialState = {
showUploadGeojsonModal: false,
showApplicationAlert: false,
applicationAlertMessage: 'System Error',
- applicationAlertSeverity: 'error'
+ applicationAlertSeverity: 'error',
+ appConfig: null
}
// next, for every key in the initialState
@@ -139,6 +138,9 @@ export const mainSlice = createSlice({
},
setapplicationAlertSeverity: (state, action) => {
state.applicationAlertSeverity = action.payload
+ },
+ setappConfig: (state, action) => {
+ state.appConfig = action.payload
}
}
})
@@ -177,5 +179,6 @@ export const { setshowUploadGeojsonModal } = mainSlice.actions
export const { setshowApplicationAlert } = mainSlice.actions
export const { setapplicationAlertMessage } = mainSlice.actions
export const { setapplicationAlertSeverity } = mainSlice.actions
+export const { setappConfig } = mainSlice.actions
export default mainSlice.reducer
diff --git a/src/services/get-aggregate-service.js b/src/services/get-aggregate-service.js
index 65b1bf75..7170d2f7 100644
--- a/src/services/get-aggregate-service.js
+++ b/src/services/get-aggregate-service.js
@@ -1,6 +1,5 @@
import { store } from '../redux/store'
import { setSearchLoading, setSearchResults } from '../redux/slices/mainSlice'
-import { VITE_STAC_API_URL } from '../assets/config'
import {
addDataToLayer,
buildHexGridLayerOptions,
@@ -9,9 +8,14 @@ import {
import { mapHexGridFromJson, mapGridCodeFromJson } from '../utils/searchHelper'
export async function AggregateSearchService(searchParams, gridType) {
- await fetch(`${VITE_STAC_API_URL}/aggregate?${searchParams}`, {
- method: 'GET'
- })
+ await fetch(
+ `${
+ store.getState().mainSlice.appConfig.STAC_API_URL
+ }/aggregate?${searchParams}`,
+ {
+ method: 'GET'
+ }
+ )
.then((response) => {
if (response.ok) {
return response.json()
diff --git a/src/services/get-aggregations-service.js b/src/services/get-aggregations-service.js
index 9c3498cd..59b5cd1f 100644
--- a/src/services/get-aggregations-service.js
+++ b/src/services/get-aggregations-service.js
@@ -1,8 +1,10 @@
-import { VITE_STAC_API_URL } from '../assets/config'
+import { store } from '../redux/store'
export async function GetCollectionAggregationsService(collectionId) {
return fetch(
- `${VITE_STAC_API_URL}/collections/${collectionId}/aggregations`,
+ `${
+ store.getState().mainSlice.appConfig.STAC_API_URL
+ }/collections/${collectionId}/aggregations`,
{
method: 'GET'
}
diff --git a/src/services/get-collections-service.js b/src/services/get-collections-service.js
index 9f3b5132..632d4e83 100644
--- a/src/services/get-collections-service.js
+++ b/src/services/get-collections-service.js
@@ -3,13 +3,15 @@ import {
setCollectionsData,
setShowAppLoading
} from '../redux/slices/mainSlice'
-import { VITE_STAC_API_URL } from '../assets/config'
import { buildCollectionsData, loadLocalGridData } from '../utils/dataHelper'
export async function GetCollectionsService(searchParams) {
- await fetch(`${VITE_STAC_API_URL}/collections`, {
- method: 'GET'
- })
+ await fetch(
+ `${store.getState().mainSlice.appConfig.STAC_API_URL}/collections`,
+ {
+ method: 'GET'
+ }
+ )
.then((response) => {
if (response.ok) {
return response.json()
diff --git a/src/services/get-config-service.js b/src/services/get-config-service.js
new file mode 100644
index 00000000..b9c4d5bf
--- /dev/null
+++ b/src/services/get-config-service.js
@@ -0,0 +1,24 @@
+import { store } from '../redux/store'
+import { setappConfig } from '../redux/slices/mainSlice'
+import { showApplicationAlert } from '../utils/alertHelper'
+
+export async function LoadConfigIntoStateService() {
+ await fetch(`/config/config.json`, {
+ method: 'GET'
+ })
+ .then((response) => {
+ if (response.ok) {
+ return response.json()
+ }
+ throw new Error()
+ })
+ .then((json) => {
+ store.dispatch(setappConfig(json))
+ })
+ .catch((error) => {
+ const message = 'Error Fetching Config File'
+ // log full error for diagnosing client side errors if needed
+ console.error(message, error)
+ showApplicationAlert('error', message, null)
+ })
+}
diff --git a/src/services/get-queryables-service.js b/src/services/get-queryables-service.js
index ca6d3129..c4fd1e3f 100644
--- a/src/services/get-queryables-service.js
+++ b/src/services/get-queryables-service.js
@@ -1,9 +1,14 @@
-import { VITE_STAC_API_URL } from '../assets/config'
+import { store } from '../redux/store'
export function GetCollectionQueryablesService(collectionId) {
- return fetch(`${VITE_STAC_API_URL}/collections/${collectionId}/queryables`, {
- method: 'GET'
- })
+ return fetch(
+ `${
+ store.getState().mainSlice.appConfig.STAC_API_URL
+ }/collections/${collectionId}/queryables`,
+ {
+ method: 'GET'
+ }
+ )
.then((response) => {
if (response.ok) {
return response.json()
diff --git a/src/services/get-search-service.js b/src/services/get-search-service.js
index c0dde87f..2c51e996 100644
--- a/src/services/get-search-service.js
+++ b/src/services/get-search-service.js
@@ -5,13 +5,17 @@ import {
setSearchResults,
setShowPopupModal
} from '../redux/slices/mainSlice'
-import { VITE_STAC_API_URL } from '../assets/config'
import { addDataToLayer, footprintLayerStyle } from '../utils/mapHelper'
export async function SearchService(searchParams, typeOfSearch) {
- await fetch(`${VITE_STAC_API_URL}/search?${searchParams}`, {
- method: 'GET'
- })
+ await fetch(
+ `${
+ store.getState().mainSlice.appConfig.STAC_API_URL
+ }/search?${searchParams}`,
+ {
+ method: 'GET'
+ }
+ )
.then((response) => {
if (response.ok) {
return response.json()
diff --git a/src/services/post-mosaic-service.js b/src/services/post-mosaic-service.js
index 2e4dfbb2..f1e1f2ff 100644
--- a/src/services/post-mosaic-service.js
+++ b/src/services/post-mosaic-service.js
@@ -1,10 +1,9 @@
import { store } from '../redux/store'
import { setSearchLoading } from '../redux/slices/mainSlice'
-import { VITE_MOSAIC_TILER_URL } from '../assets/config'
import { addMosaicLayer } from '../utils/mapHelper'
export async function AddMosaicService(reqParams) {
- const mosaicTilerURL = VITE_MOSAIC_TILER_URL || ''
+ const mosaicTilerURL = store.getState().mainSlice.appConfig.MOSAIC_TILER_URL
await fetch(`${mosaicTilerURL}/mosaicjson/mosaics`, reqParams)
.then((response) => {
if (response.ok) {
diff --git a/src/testing/shared-mocks.js b/src/testing/shared-mocks.js
index 74f1e190..b5270f0a 100644
--- a/src/testing/shared-mocks.js
+++ b/src/testing/shared-mocks.js
@@ -3442,3 +3442,109 @@ export const mockSceneSearchResult = {
}
]
}
+
+export const mockAppConfig = {
+ PUBLIC_URL: 'http://example.com/',
+ LOGO_URL: './logo.png',
+ LOGO_ALT: 'Alt description for my custom logo',
+ SHOW_PUBLISH_BTN: false,
+ DEFAULT_COLLECTION: 'collection-name',
+ STAC_API_URL: 'https://api-endpoint.example.com',
+ API_MAX_ITEMS: 200,
+ SCENE_TILER_URL: 'https://titiler.example.com',
+ DASHBOARD_BTN_URL: 'https://dashboard.example.com',
+ ANALYZE_BTN_URL: 'https://dashboard.example.com',
+ CF_TEMPLATE_URL: 'https://cf-template.example.com',
+ SCENE_TILER_PARAMS: {
+ 'sentinel-2-l2a': {
+ assets: ['red', 'green', 'blue'],
+ color_formula: 'Gamma+RGB+3.2+Saturation+0.8+Sigmoidal+RGB+12+0.35'
+ },
+ 'landsat-c2-l2': {
+ assets: ['red', 'green', 'blue'],
+ color_formula: 'Gamma+RGB+1.7+Saturation+1.7+Sigmoidal+RGB+15+0.35'
+ },
+ naip: {
+ assets: ['image'],
+ bidx: '1,2,3'
+ },
+ 'cop-dem-glo-30': {
+ assets: ['data'],
+ colormap_name: 'terrain',
+ rescale: ['-1000,4000']
+ },
+ 'cop-dem-glo-90': {
+ assets: ['data'],
+ colormap_name: 'terrain',
+ rescale: ['-1000,4000']
+ },
+ 'sentinel-1-grd': {
+ assets: ['vv'],
+ rescale: ['0,250'],
+ colormap_name: 'plasma'
+ }
+ },
+ MOSAIC_TILER_URL: 'https://titiler-mosaic.example.com',
+ MOSAIC_TILER_PARAMS: {
+ 'sentinel-2-l2a': {
+ assets: ['visual']
+ },
+ 'landsat-c2-l2': {
+ assets: ['red'],
+ color_formula: 'Gamma+R+1.7+Sigmoidal+R+15+0.35'
+ },
+ naip: {
+ assets: ['image'],
+ bidx: '1,2,3'
+ },
+ 'cop-dem-glo-30': {
+ assets: ['data'],
+ colormap_name: 'terrain',
+ rescale: ['-1000,4000']
+ },
+ 'cop-dem-glo-90': {
+ assets: ['data'],
+ colormap_name: 'terrain',
+ rescale: ['-1000,4000']
+ },
+ 'sentinel-1-grd': {
+ assets: ['vv'],
+ rescale: ['0,250'],
+ colormap_name: 'plasma'
+ }
+ },
+ MOSAIC_MAX_ITEMS: 100,
+ MOSAIC_MIN_ZOOM_LEVEL: 7,
+ CONFIG_COLORMAP: 'viridis',
+ SEARCH_MIN_ZOOM_LEVELS: {
+ 'sentinel-2-l2a': {
+ medium: 4,
+ high: 7
+ },
+ 'landsat-c2-l2': {
+ medium: 4,
+ high: 7
+ },
+ naip: {
+ medium: 10,
+ high: 14
+ },
+ 'cop-dem-glo-30': {
+ medium: 6,
+ high: 8
+ },
+ 'cop-dem-glo-90': {
+ medium: 6,
+ high: 8
+ },
+ 'sentinel-1-grd': {
+ medium: 7,
+ high: 7
+ }
+ },
+ BASEMAP_URL: 'https://tile-provider.example.com/{z}/{x}/{y}.png',
+ BASEMAP_HTML_ATTRIBUTION:
+ '© TileProvider',
+ ADVANCED_SEARCH_ENABLED: false,
+ CART_ENABLED: false
+}
diff --git a/src/utils/colorMap.js b/src/utils/colorMap.js
index 5850198d..486387d5 100644
--- a/src/utils/colorMap.js
+++ b/src/utils/colorMap.js
@@ -1,9 +1,11 @@
-import { COLORMAP } from '../components/defaults'
+import { DEFAULT_COLORMAP } from '../components/defaults'
import colormap from 'colormap'
+import { store } from '../redux/store'
export const colorMap = (largestRatio) => {
return colormap({
- colormap: COLORMAP,
+ colormap:
+ store.getState().mainSlice.appConfig.CONFIG_COLORMAP || DEFAULT_COLORMAP,
nshades: Math.round(Math.max(9, largestRatio)),
format: 'hex'
})
diff --git a/src/utils/mapHelper.js b/src/utils/mapHelper.js
index 7f43bb2a..2e25b972 100644
--- a/src/utils/mapHelper.js
+++ b/src/utils/mapHelper.js
@@ -12,14 +12,9 @@ import {
} from '../redux/slices/mainSlice'
import { searchGridCodeScenes, debounceNewSearch } from './searchHelper'
import debounce from './debounce'
-import {
- VITE_SCENE_TILER_URL,
- VITE_SCENE_TILER_PARAMS,
- VITE_MOSAIC_MIN_ZOOM_LEVEL,
- VITE_MOSAIC_TILER_PARAMS
-} from '../assets/config'
import { GetMosaicBoundsService } from '../services/get-mosaic-bounds'
import GeoJSONValidation from './geojsonValidation'
+import { DEFAULT_MOSAIC_MIN_ZOOM } from '../components/defaults'
export const footprintLayerStyle = {
color: '#3183f5',
@@ -298,7 +293,8 @@ export function mapCallDebounceNewSearch() {
export const debounceTitilerOverlay = debounce(() => addImageOverlay(), 800)
function addImageOverlay() {
- const sceneTilerURL = VITE_SCENE_TILER_URL || ''
+ const sceneTilerURL =
+ store.getState().mainSlice.appConfig.SCENE_TILER_URL || ''
const _currentPopupResult = store.getState().mainSlice.currentPopupResult
const _selectedCollectionData =
store.getState().mainSlice.selectedCollectionData
@@ -346,7 +342,6 @@ function addImageOverlay() {
}
} else {
store.dispatch(setSearchLoading(false))
- console.log('VITE_SCENE_TILER_URL is not set in env variables.')
}
})
}
@@ -364,7 +359,8 @@ function setupBounds(bbox) {
}
const constructSceneTilerParams = (collection) => {
- const envSceneTilerParams = VITE_SCENE_TILER_PARAMS || ''
+ const envSceneTilerParams =
+ store.getState().mainSlice.appConfig.SCENE_TILER_PARAMS || ''
// retrieve mosaic tiler parameters from env variable
const tilerParams = getTilerParams(envSceneTilerParams)
@@ -448,7 +444,9 @@ const parameters = {
export function setMosaicZoomMessage() {
const map = store.getState().mainSlice.map
if (map && Object.keys(map).length > 0) {
- const MOSAIC_MIN_ZOOM = VITE_MOSAIC_MIN_ZOOM_LEVEL || 7
+ const MOSAIC_MIN_ZOOM =
+ store.getState().mainSlice.appConfig.MOSAIC_MIN_ZOOM_LEVEL ||
+ DEFAULT_MOSAIC_MIN_ZOOM
if (
map.getZoom() >= MOSAIC_MIN_ZOOM ||
store.getState().mainSlice.viewMode === 'scene'
@@ -461,7 +459,8 @@ export function setMosaicZoomMessage() {
}
export const constructMosaicTilerParams = (collection) => {
- const mosaicTilerParams = VITE_MOSAIC_TILER_PARAMS || ''
+ const mosaicTilerParams =
+ store.getState().mainSlice.appConfig.MOSAIC_TILER_PARAMS || ''
// retrieve mosaic tiler parameters from env variable
const tilerParams = getTilerParams(mosaicTilerParams)
diff --git a/src/utils/searchHelper.js b/src/utils/searchHelper.js
index 46da90d4..9cc2dc62 100644
--- a/src/utils/searchHelper.js
+++ b/src/utils/searchHelper.js
@@ -1,12 +1,10 @@
import { store } from '../redux/store'
import {
- VITE_SEARCH_MIN_ZOOM_LEVELS,
- VITE_API_MAX_ITEMS,
- VITE_STAC_API_URL,
- VITE_MOSAIC_MAX_ITEMS,
- VITE_MOSAIC_TILER_PARAMS
-} from '../assets/config'
-import { DEFAULT_MED_ZOOM, DEFAULT_HIGH_ZOOM } from '../components/defaults'
+ DEFAULT_MED_ZOOM,
+ DEFAULT_HIGH_ZOOM,
+ DEFAULT_API_MAX_ITEMS,
+ DEFAULT_MOSAIC_MAX_ITEMS
+} from '../components/defaults'
import {
getCurrentMapZoomLevel,
clearAllLayers,
@@ -38,12 +36,14 @@ export function newSearch() {
const _selectedCollection = store.getState().mainSlice.selectedCollectionData
const midZoomLevel =
- VITE_SEARCH_MIN_ZOOM_LEVELS[_selectedCollection.id]?.medium ||
- DEFAULT_MED_ZOOM
+ store.getState().mainSlice.appConfig.SEARCH_MIN_ZOOM_LEVELS[
+ _selectedCollection.id
+ ]?.medium || DEFAULT_MED_ZOOM
const highZoomLevel =
- VITE_SEARCH_MIN_ZOOM_LEVELS[_selectedCollection.id]?.high ||
- DEFAULT_HIGH_ZOOM
+ store.getState().mainSlice.appConfig.SEARCH_MIN_ZOOM_LEVELS[
+ _selectedCollection.id
+ ]?.high || DEFAULT_HIGH_ZOOM
const currentMapZoomLevel = getCurrentMapZoomLevel()
@@ -104,7 +104,8 @@ function buildSearchScenesParams(gridCodeToSearchIn) {
const _dateTimeRange = convertDateForURL(
store.getState().mainSlice.searchDateRangeValue
)
- const limit = VITE_API_MAX_ITEMS || 200
+ const limit =
+ store.getState().mainSlice.appConfig.API_MAX_ITEMS || DEFAULT_API_MAX_ITEMS
const collections = _selectedCollection.id
const _searchGeojsonBoundary =
store.getState().mainSlice.searchGeojsonBoundary
@@ -423,11 +424,13 @@ function newMosaicSearch() {
const bboxFromMap = bboxFromMapBounds()
const createMosaicBody = {
- stac_api_root: VITE_STAC_API_URL,
+ stac_api_root: store.getState().mainSlice.appConfig.STAC_API_URL,
asset_name: constructMosaicAssetVal(_selectedCollectionData.id),
collections: [_selectedCollectionData.id],
datetime,
- max_items: VITE_MOSAIC_MAX_ITEMS || 100
+ max_items:
+ store.getState().mainSlice.appConfig.MOSAIC_MAX_ITEMS ||
+ DEFAULT_MOSAIC_MAX_ITEMS
}
if (_searchGeojsonBoundary) {
createMosaicBody.intersects = _searchGeojsonBoundary.geometry
@@ -456,7 +459,8 @@ function newMosaicSearch() {
}
const constructMosaicAssetVal = (collection) => {
- const envMosaicTilerParams = VITE_MOSAIC_TILER_PARAMS || ''
+ const envMosaicTilerParams =
+ store.getState().mainSlice.appConfig.MOSAIC_TILER_PARAMS || ''
const asset = getTilerParams(envMosaicTilerParams)[collection]?.assets || ''
if (!asset) {
console.log(`Assets not defined for ${collection}`)
- {LOGO ? (
- 
+ {_appConfig.LOGO_URL ? (
+ 
) : (
)}
- {DASHBOARD_LINK && (
-
-
- )
-
- beforeEach(() => {
- vi.mock('../../utils/mapHelper')
- vi.mock('../../utils/searchHelper')
- vi.mock('../../assets/config', async () => {
- const actualConfig = await vi.importActual('../../assets/config')
- return {
- ...actualConfig,
- VITE_ADVANCED_SEARCH_ENABLED: true
- }
- })
- })
-
- afterEach(() => {
- vi.resetAllMocks()
- })
-
- describe('on render', () => {
- it('should not render auto search when VITE_ADVANCED_SEARCH_ENABLED is true', () => {
- setup()
- expect(
- screen.queryByText('test_autoSearchContainer')
- ).not.toBeInTheDocument()
- })
- it('should not render disabled search bar overlay div', async () => {
- setup()
- expect(
- screen.queryByTestId('test_disableSearchOverlay')
- ).not.toBeInTheDocument()
- })
- })
- describe('when search options changed', () => {
- it('should set showAdvancedSearchOptions to false in redux', () => {
- store.dispatch(setshowAdvancedSearchOptions(true))
- setup()
- store.dispatch(setCloudCover(5))
- expect(store.getState().mainSlice.showAdvancedSearchOptions).toBeFalsy()
- })
- })
- describe('when search button clicked', () => {
- it('should set showAdvancedSearchOptions to false in redux', async () => {
- store.dispatch(setshowAdvancedSearchOptions(true))
- setup()
- const searchButton = screen.getByRole('button', {
- name: /search/i
- })
- await user.click(searchButton)
- expect(store.getState().mainSlice.showAdvancedSearchOptions).toBeFalsy()
- })
- })
- describe('when advanced clicked', () => {
- it('should set showAdvancedSearchOptions be the opposite showAdvancedSearchOptions of in redux', async () => {
- setup()
- const advancedButton = screen.getByText(/advanced/i)
- await user.click(advancedButton)
- expect(store.getState().mainSlice.showAdvancedSearchOptions).toBeTruthy()
- await user.click(advancedButton)
- expect(store.getState().mainSlice.showAdvancedSearchOptions).toBeFalsy()
- })
- })
- describe('when draw boundary button clicked', () => {
- it('should not call functions if geom already exists', async () => {
- const spyEnableMapPolyDrawing = vi.spyOn(
- mapHelper,
- 'enableMapPolyDrawing'
- )
- store.dispatch(
- setsearchGeojsonBoundary({
- type: 'Polygon',
- coordinates: [[]]
- })
- )
- setup()
- const advancedButton = screen.getByText(/advanced/i)
- await user.click(advancedButton)
- const drawBoundaryButton = screen.getByRole('button', {
- name: /draw boundary/i
- })
- await user.click(drawBoundaryButton)
- expect(spyEnableMapPolyDrawing).not.toHaveBeenCalled()
- })
- it('should enter drawing state if geom does not exists', async () => {
- const spyEnableMapPolyDrawing = vi.spyOn(
- mapHelper,
- 'enableMapPolyDrawing'
- )
- store.dispatch(setshowAdvancedSearchOptions(true))
- setup()
- const advancedButton = screen.getByText(/advanced/i)
- await user.click(advancedButton)
- const drawBoundaryButton = screen.getByRole('button', {
- name: /draw boundary/i
- })
- await user.click(drawBoundaryButton)
- expect(spyEnableMapPolyDrawing).toHaveBeenCalled()
- expect(store.getState().mainSlice.showAdvancedSearchOptions).toBeFalsy()
- expect(store.getState().mainSlice.isDrawingEnabled).toBeTruthy()
- })
- })
- describe('when clear button clicked', () => {
- it('should not call functions if geom does not exists', async () => {
- const spyClearLayer = vi.spyOn(mapHelper, 'clearLayer')
- setup()
- const advancedButton = screen.getByText(/advanced/i)
- await user.click(advancedButton)
- const clearButton = screen.getByRole('button', {
- name: /clear/i
- })
- await user.click(clearButton)
- expect(spyClearLayer).not.toHaveBeenCalled()
- })
- it('should clear layer and close options if geom exists', async () => {
- const spyClearLayer = vi.spyOn(mapHelper, 'clearLayer')
- store.dispatch(
- setsearchGeojsonBoundary({
- type: 'Polygon',
- coordinates: [[]]
- })
- )
- setup()
- const advancedButton = screen.getByText(/advanced/i)
- await user.click(advancedButton)
- const clearButton = screen.getByRole('button', {
- name: /clear/i
- })
- await user.click(clearButton)
- expect(spyClearLayer).toHaveBeenCalled()
- expect(store.getState().mainSlice.searchGeojsonBoundary).toBeNull()
- expect(store.getState().mainSlice.showAdvancedSearchOptions).toBeFalsy()
- })
- })
- describe('when upload geojson button clicked', () => {
- it('should not call dispatch functions if geom already exists', async () => {
- store.dispatch(
- setsearchGeojsonBoundary({
- type: 'Polygon',
- coordinates: [[]]
- })
- )
- setup()
- const advancedButton = screen.getByText(/advanced/i)
- await user.click(advancedButton)
- const uploadGeojsonButton = screen.getByRole('button', {
- name: /upload geojson/i
- })
- await user.click(uploadGeojsonButton)
- expect(store.getState().mainSlice.showUploadGeojsonModal).toBeFalsy()
- })
- it('should call dispatch functions if geom does not exists', async () => {
- store.dispatch(setshowAdvancedSearchOptions(true))
- setup()
- const advancedButton = screen.getByText(/advanced/i)
- await user.click(advancedButton)
- const uploadGeojsonButton = screen.getByRole('button', {
- name: /upload geojson/i
- })
- await user.click(uploadGeojsonButton)
- expect(store.getState().mainSlice.showAdvancedSearchOptions).toBeFalsy()
- expect(store.getState().mainSlice.showUploadGeojsonModal).toBeTruthy()
- })
- })
- describe('when drawing mode enabled', () => {
- it('should render disabled search bar overlay div', async () => {
- setup()
- const advancedButton = screen.getByText(/advanced/i)
- await user.click(advancedButton)
- const drawBoundaryButton = screen.getByRole('button', {
- name: /draw boundary/i
- })
- await user.click(drawBoundaryButton)
- expect(
- screen.queryByTestId('test_disableSearchOverlay')
- ).toBeInTheDocument()
- })
- })
-})
diff --git a/src/components/Search/Search.jsx b/src/components/Search/Search.jsx
index 89471bc5..3339a315 100644
--- a/src/components/Search/Search.jsx
+++ b/src/components/Search/Search.jsx
@@ -14,10 +14,6 @@ import DateTimeRangeSelector from '../DateTimeRangeSelector/DateTimeRangeSelecto
import CloudSlider from '../CloudSlider/CloudSlider'
import CollectionDropdown from '../CollectionDropdown/CollectionDropdown'
import ViewSelector from '../ViewSelector/ViewSelector'
-import {
- VITE_MOSAIC_TILER_URL,
- VITE_ADVANCED_SEARCH_ENABLED
-} from '../../assets/config'
import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown'
import KeyboardArrowUpIcon from '@mui/icons-material/KeyboardArrowUp'
import { newSearch, debounceNewSearch } from '../../utils/searchHelper'
@@ -46,7 +42,8 @@ const Search = () => {
const _searchGeojsonBoundary = useSelector(
(state) => state.mainSlice.searchGeojsonBoundary
)
- const mosaicTilerURL = VITE_MOSAIC_TILER_URL || ''
+ const _appConfig = useSelector((state) => state.mainSlice.appConfig)
+ const mosaicTilerURL = _appConfig.MOSAIC_TILER_URL || ''
useEffect(() => {
dispatch(setshowAdvancedSearchOptions(false))
@@ -120,7 +117,7 @@ const Search = () => {
)}
- {VITE_ADVANCED_SEARCH_ENABLED ? (
+ {_appConfig.ADVANCED_SEARCH_ENABLED ? (
onDashboardClick()}>
+ {_appConfig.DASHBOARD_BTN_URL && (
+ onDashboardClick()}>
Dashboard
+
)}
{
const setup = () =>
@@ -11,6 +13,10 @@ describe('PageHeader', () => {