Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deploy #4699

Merged
merged 16 commits into from
Oct 3, 2023
Merged

Deploy #4699

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a75a79e
feat(viirs): update all viirs tables version
willian-viana Sep 15, 2023
0300653
feat(viirs): rollback #4678
willian-viana Sep 26, 2023
8683500
Merge pull request #4694 from wri/feat/update-VIIRS-FLAG-920
willian-viana Sep 29, 2023
ca16512
chore(cypress): update cypress and some dependencies
willian-viana Sep 12, 2023
89e635e
chore(cypress): update files to fit cypress new version
willian-viana Sep 13, 2023
26ce557
chore(cypress): add cucumber module and update cypress.config
willian-viana Sep 14, 2023
7174c52
chore(cypress): remove all out dated files
willian-viana Sep 14, 2023
9d66dd6
fix(cypress): change cypress.config to cjs format
willian-viana Sep 14, 2023
6fe18a6
chore(cypress): add example test
willian-viana Sep 14, 2023
c68755a
chore(cypress): add navigation API
willian-viana Sep 22, 2023
43286c0
chore(cypress): remove example test and add cypress data attr on widg…
willian-viana Sep 22, 2023
2f79f78
chore(cypress): add first Cypress real test
willian-viana Sep 22, 2023
86ec2d2
chore(cypress): remove ENV validation to use baseUrl instead the whol…
willian-viana Sep 22, 2023
086e6c8
chore(cypress): rename test to improve readability
willian-viana Sep 22, 2023
b0c2fb8
chore(cypress): rename feature and scenario to improve readability
willian-viana Sep 22, 2023
cd406c5
Merge pull request #4691 from wri/chore/e2e-tests-FLAG-769
willian-viana Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions components/widgets/fires/burned-area-cumulative/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ const defaultConfig = {
fires: 3,
},
settings: {
dataset: 'modis',
dataset: 'modis_burned_area',
firesThreshold: 0,
},
sentences: {
Expand Down Expand Up @@ -151,10 +151,12 @@ export default {
refetchKeys: ['dataset'],
getWidget: (widgetSettings) => {
// called when settings changes
if (widgetSettings?.dataset !== 'modis_burned_area') {
if (!widgetSettings || !widgetSettings.dataset) {
return defaultConfig;
}
if (widgetSettings.dataset !== 'modis_burned_area') {
return firesAlertsCumulative;
}

return defaultConfig;
},
};
8 changes: 5 additions & 3 deletions components/widgets/fires/burned-area-ranked/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ const defaultConfig = {
page: 0,
period: 'week',
weeks: 4,
dataset: 'modis',
dataset: 'modis_burned_area',
layerStartDate: null,
layerEndDate: null,
firesThreshold: 0,
Expand Down Expand Up @@ -163,10 +163,12 @@ export default {
refetchKeys: ['dataset'],
getWidget: (widgetSettings) => {
// called when settings changes
if (widgetSettings?.dataset !== 'modis_burned_area') {
if (!widgetSettings || !widgetSettings.dataset) {
return defaultConfig;
}
if (widgetSettings.dataset !== 'modis_burned_area') {
return firesRanked;
}

return defaultConfig;
},
};
2 changes: 1 addition & 1 deletion components/widgets/fires/burned-area/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export default {
fires: 1,
},
settings: {
dataset: 'modis',
dataset: 'modis_burned_area',
firesThreshold: 0,
},
sentences: {
Expand Down
2 changes: 1 addition & 1 deletion components/widgets/fires/fire-alerts-simple/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ export default {
},
// initial settings
settings: {
dataset: 'modis',
dataset: 'viirs',
},
getData: async (params) => {
const { VIIRS } = await handleGfwParamsMeta(params);
Expand Down
2 changes: 1 addition & 1 deletion components/widgets/fires/fires-alerts-cumulative/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export default {
fires: 2,
},
settings: {
dataset: 'modis',
dataset: 'viirs',
confidence: 'h',
},
sentences: {
Expand Down
2 changes: 1 addition & 1 deletion components/widgets/fires/fires-alerts-historical-daily/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default {
colors: 'fires',
metaKey: 'widget_fire_alert_location',
settings: {
dataset: 'modis',
dataset: 'viirs',
},
datasets: [
{
Expand Down
2 changes: 1 addition & 1 deletion components/widgets/fires/fires-alerts-historical-weekly/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export default {
colors: 'fires',
metaKey: 'widget_fire_alert_location',
settings: {
dataset: 'modis',
dataset: 'viirs',
minDate: '2000-01-01',
confidence: '',
},
Expand Down
2 changes: 1 addition & 1 deletion components/widgets/fires/fires-alerts-historical/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export default {
colors: 'fires',
metaKey: 'widget_fire_alert_location',
settings: {
dataset: 'modis',
dataset: 'viirs',
minDate: '2000-01-01',
confidence: '',
},
Expand Down
2 changes: 1 addition & 1 deletion components/widgets/fires/fires-alerts/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ const defaultConfig = {
fires: 1,
},
settings: {
dataset: 'modis',
dataset: 'viirs',
confidence: 'h',
},
sentences: {
Expand Down
2 changes: 1 addition & 1 deletion components/widgets/fires/fires-ranked/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export default {
page: 0,
period: 'week',
weeks: 4,
dataset: 'modis',
dataset: 'viirs',
layerStartDate: null,
layerEndDate: null,
},
Expand Down
2 changes: 1 addition & 1 deletion components/widgets/fires/fires-within/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export default {
settings: {
period: 'week',
weeks: 13,
dataset: 'modis',
dataset: 'viirs',
confidence: 'h',
},
settingsBtnConfig: {
Expand Down
30 changes: 15 additions & 15 deletions data/analysis-datasets-versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@
"ANNUAL_WDPA_SUMMARY": "v20230502",
"ANNUAL_WDPA_WHITELIST": "v20230502",

"VIIRS_ADM0_WHITELIST": "v20220726",
"VIIRS_ADM1_WHITELIST": "v20220726",
"VIIRS_ADM2_WHITELIST": "v20220726",
"VIIRS_ADM0_DAILY": "v20220726",
"VIIRS_ADM1_DAILY": "v20220726",
"VIIRS_ADM2_DAILY": "v20220726",
"VIIRS_ADM0_WEEKLY": "v20220726",
"VIIRS_ADM1_WEEKLY": "v20220726",
"VIIRS_ADM2_WEEKLY": "v20220726",
"VIIRS_GEOSTORE_WHITELIST": "v20220713",
"VIIRS_GEOSTORE_DAILY": "v20220713",
"VIIRS_GEOSTORE_WEEKLY": "v20220713",
"VIIRS_WDPA_DAILY": "v20220713",
"VIIRS_WDPA_WEEKLY": "v20220713",
"VIIRS_WDPA_WHITELIST": "v20220713",
"VIIRS_ADM0_WHITELIST": "v20230901",
"VIIRS_ADM1_WHITELIST": "v20230901",
"VIIRS_ADM2_WHITELIST": "v20230901",
"VIIRS_ADM0_DAILY": "v20230901",
"VIIRS_ADM1_DAILY": "v20230901",
"VIIRS_ADM2_DAILY": "v20230901",
"VIIRS_ADM0_WEEKLY": "v20230901",
"VIIRS_ADM1_WEEKLY": "v20230901",
"VIIRS_ADM2_WEEKLY": "v20230901",
"VIIRS_GEOSTORE_WHITELIST": "v20230901",
"VIIRS_GEOSTORE_DAILY": "v20230901",
"VIIRS_GEOSTORE_WEEKLY": "v20230901",
"VIIRS_WDPA_DAILY": "v20230901",
"VIIRS_WDPA_WEEKLY": "v20230901",
"VIIRS_WDPA_WHITELIST": "v20230901",

"MODIS_ADM0_WHITELIST": "v20221110",
"MODIS_ADM1_WHITELIST": "v20221110",
Expand Down
7 changes: 7 additions & 0 deletions data/fires-datasets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
[
{
"label": "VIIRS Alerts",
"value": "viirs",
"unit": "alerts",
"metaKey": null,
"infoText": "VIIRS alerts have a higher resolution, but are less performant in cloudy areas than MODIS alerts"
},
{
"label": "MODIS Alerts",
"value": "modis",
Expand Down