Skip to content

Commit

Permalink
Release v3.0.1 (#620)
Browse files Browse the repository at this point in the history
_The PR name should be the version to be deployed (ex: v1.0.1)_

- [x] Bump the version in the package.json or equivalent.

---

- # Changelog
- ## 🎉 Features
	- 🦗
- ## 🚀 Improvements
- Update veda-ui to
[v5.8.0](https://github.com/NASA-IMPACT/veda-ui/releases/tag/v5.8.0)
  - Add new event and announcement to  "News & Events" #613
  - Add playwright QA scenarios #480 
- ## 📊 Dataset Updates
  - Rescale values changed for `gra2pes-ghg-monthgrid-v1` #616 
  - Minor Content changes  #615 #613
- ## 📝 Stories Updates
- Update embedded custom interface for urban dashboard and NIST
interface US-GHG-Center/custom-interfaces#119
- ## 🐛 Fixes
  - Fix text and video over lap when zoomed in #618
  • Loading branch information
paridhi-parajuli authored Oct 8, 2024
2 parents c3cb878 + 615fa71 commit 3a4c93a
Show file tree
Hide file tree
Showing 48 changed files with 708 additions and 163 deletions.
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,4 @@ CUSTOM_SCRIPT_SRC=https://dap.digitalgov.gov/Universal-Federated-Analytics-Min.j
CUSTOM_SCRIPT_ID=_fed_an_ua_tag

FEATURE_NEW_EXPLORATION = 'TRUE'
SHOW_CONFIGURABLE_COLOR_MAP = 'TRUE'
61 changes: 35 additions & 26 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,29 +82,38 @@ jobs:
- name: Unit Test
run: yarn test

# playwright_test:
# timeout-minutes: 60
# runs-on: ubuntu-latest
# steps:
# - name: Checkout
# uses: actions/checkout@v3
# with:
# submodules: recursive
# - name: Use Node.js ${{ env.NODE }}
# uses: actions/setup-node@v4
# with:
# node-version: ${{ env.NODE }}
# - name: Install dependencies
# run: yarn
# - name: Install UI
# run: ./.veda/setup
# - name: Install Playwright Browsers
# run: npx playwright install --with-deps
# - name: Run Playwright tests
# run: MAPBOX_TOKEN="${{secrets.MAPBOX_TOKEN}}" yarn test:e2e
# - uses: actions/upload-artifact@v4
# if: always()
# with:
# name: playwright-report
# path: playwright-report/
# retention-days: 30
playwright_test:
timeout-minutes: 60
needs: prep
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
submodules: recursive
- name: Use Node.js ${{ env.NODE }}
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE }}
- name: Cache node_modules
uses: actions/cache@v2
id: cache-node-modules
with:
path: |
node_modules
.veda/ui/node_modules
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }}
- name: Install dependencies
run: yarn
- name: Install UI
run: ./.veda/setup
- name: Install Playwright Browsers
run: npx playwright install --with-deps
- name: Run Playwright tests
run: MAPBOX_TOKEN="${{secrets.MAPBOX_TOKEN}}" yarn test:e2e
- uses: actions/upload-artifact@v4
if: always()
with:
name: playwright-report
path: playwright-report/
retention-days: 30
2 changes: 1 addition & 1 deletion .veda/ui
Submodule ui updated 105 files
2 changes: 1 addition & 1 deletion custom-pages/news-and-events/component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ const StyledContinuum = styled(Continuum)`
`;


function getEventTemporalState(startDate, endDate) {
export function getEventTemporalState(startDate, endDate) {
// Convert start and end dates to Date objects
const startDateTime = new Date(startDate + 'T00:00:00-05:00'); // Assuming EST (UTC-5)
const endDateTime = new Date(endDate + 'T23:59:59-05:00'); // Assuming EST (UTC-5)
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added custom-pages/news-and-events/media/news/epa.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
66 changes: 64 additions & 2 deletions custom-pages/news-and-events/news-page-content.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { getEventTemporalState } from './component'
function sortByDateDesc(items) {
return items.sort((a, b) => {
const dateA = new Date(a.endDate || a.date || a.startDate);
Expand All @@ -11,6 +12,30 @@ function sortByDateDesc(items) {
});
}

function sortByDateCustom(items) {
// Categorize the events
const { pastEvents, notPastEvents } = items.reduce((acc, item) => {
const temporalState = getEventTemporalState(item.startDate, item.endDate);
acc[temporalState === 'Past' ? 'pastEvents' : 'notPastEvents'].push(item);
return acc;
}, { pastEvents: [], notPastEvents: [] });

// Sort upcoming events: first by start date, then by end date descending
notPastEvents.sort((a, b) => {
const startDiff = new Date(a.startDate) - new Date(b.startDate);
return startDiff === 0
? new Date(b.endDate) - new Date(a.endDate) // If start dates are the same, sort by end date descending
: startDiff; // Otherwise, sort by start date ascending
});

// Sort past events in descending order by end date
pastEvents.sort((a, b) => new Date(b.endDate) - new Date(a.endDate));

// Combine the events: upcoming past events first, then past events
return [...notPastEvents, ...pastEvents];
}


export const NEWSLETTER_ITEMS = sortByDateDesc([
{
name: 'May 2024 - US GHG Center Newsletter',
Expand Down Expand Up @@ -52,6 +77,17 @@ export const NEWSLETTER_ITEMS = sortByDateDesc([
])

export const NEWS_ITEMS = [
{
name: 'EPA RFI on Methane Emission Technology',
asLink : {
url: 'https://www.regulations.gov/document/EPA-HQ-OAR-2024-0350-0001'
},
media: {
src: new URL('./media/news/epa.png', import.meta.url).href,
alt: 'EPA RFI'
},
description: 'The U.S. Environmental Protection Agency (EPA) is inviting public comment on the potential for expanded use of advanced and emerging technologies for methane emissions quantification in the Agency’s Greenhouse Gas Reporting Program (GHGRP). Responses to the request for information (RFI) are due by November 27, 2024.'
},
{
name: 'Submit your proposal to NASA ROSES A.58 due June 10th!',
asLink : {
Expand Down Expand Up @@ -98,9 +134,35 @@ export const NEWS_ITEMS = [
}
]

export const EVENT_ITEMS = sortByDateDesc([
export const EVENT_ITEMS = sortByDateCustom([
{
name: 'New ARSET Training on Methane Observations',
asLink : {
url: 'https://appliedsciences.nasa.gov/get-involved/training/english/arset-methane-observations-large-emission-event-detection-and'
},
media: {
src: new URL('./media/events/arset_logo.png', import.meta.url).href,
alt: 'ARSET Logo'
},
description: "Registration for the “Methane Observations for Large Emission Event Detection and Monitoring” training is now available on ARSET, NASA’s remote sensing training platform. The training introduces participants to using data gathered by the Earth surface Mineral dust Source Investigation (EMIT) mission. Training will occur November 19-21, 2024.",
startDate: '2024-11-19',
endDate: '2024-11-21'
},
{
name: ' AGU Pre-conference Workshop',
asLink : {
url: 'https://www.agu.org/annual-meeting/attend#register'
},
media: {
src: new URL('./media/events/agu_logo.png', import.meta.url).href,
alt: 'AGU Logo'
},
description: "On Sunday, December 8 (1:00 - 4:30PM EST), US GHG Center team members will host a workshop at the 2024 American Geophysical Union annual conference. Join us at Advancing Open Science: Greenhouse Gas Emission Data Analysis using the U.S. Greenhouse Gas Center’s JupyterHub. Early bird registration ends on November 6.",
startDate: '2024-12-04',
endDate: '2024-12-05'
},
{
name: 'Join the 2nd Annual Stakeholder Forum; Dec 4-5, 2024',
name: 'Join the 2nd Annual Stakeholder Forum; Dec 4-5, 2024',
asLink : {
url: 'https://drive.google.com/file/d/1Mkz43d3iP4CfTuBeZXsoO1-fxBRGmmVq/view?usp=sharing'
},
Expand Down
9 changes: 5 additions & 4 deletions datasets/emit-ch4plume-v1.data.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ layers:
<Prose>
<div style={{ border: '2px solid red', padding: '10px', display: 'inline-block', color: '#1b2631' }}>
<span style={{ color: 'red', fontWeight: 'bold' }}>Attention!</span>
The location of the markers in the visualization environment below represent the location of maximum enhancement within a plume and does not indicate a source location.
A marker location in the visualization environment below represents the area of maximum enhancement within the plume. The marker does not indicate the plume source.
</div>
</Prose>
</Block>
Expand Down Expand Up @@ -154,10 +154,11 @@ layers:
## Learn More
- EMIT data are available through the NASA LP DAAC and [additional information is available](https://lpdaac.usgs.gov/data/get-started-data/collection-overview/missions/emit-overview/#emit-metadata)
- The Jet Propulsion Lab (JPL) contains [VISIONS - The EMIT open data portal](https://earth.jpl.nasa.gov/emit/data/data-portal/coverage-and-forecasts/)
- See how EMIT contributes to new technologies to detect and quantify large methane release events in the <Link to={"/stories/discovering-large-methane-emissions"}>Discovering Large Methane Emission Events with Remote Measurement Data Insight</Link>

- See how EMIT contributes to new technologies to detect and quantify large methane release events in the <Link to={"/stories/discovering-large-methane-emissions"}>Discovering Large Methane Emission Events with Remote Measurement story</Link>
- Learn how EMIT and data collected by aircraft can be used together to better understand methane super emitter events in the [Tracking Methane Plumes from Space and Sky story](https://earth.gov/ghgcenter/stories/emit-and-aviris-3)

## Acknowledgment
We would like to acknowledge the contributions of the entire EMIT engineering and science teams and the ISS team for enabling the EMIT mission. We thank NASA’s Earth Science Division with special thanks to Dr. Jack Kaye for continued support of the greenhouse gas application.
Thanks to contributions of the entire EMIT engineering and science teams and the ISS team for enabling the EMIT mission. Thanks to NASA’s Earth Science Division with special thanks to Dr. Jack Kaye for continued support of the EMIT greenhouse gas application. Thanks to NASA LP DAAC for working with the US GHG Center to coordinate expedited data access.

## License
[Creative Commons Attribution 1.0 International](https://creativecommons.org/licenses/by/1.0/legalcode) (CC BY 1.0)
Expand Down
4 changes: 2 additions & 2 deletions datasets/gra2pes-co2-monthgrid-v1.data.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ layers:
colormap_name: spectral_r
rescale:
- 0
- 100
- 2000
compare:
datasetId: gra2pes-ghg-monthgrid-v1
layerId: nox
Expand All @@ -80,7 +80,7 @@ layers:
label: tonne CO₂/km²/month
type: gradient
min: 0
max: 100
max: 2000
stops:
- '#5e4fa2'
- '#388eba'
Expand Down
Loading

0 comments on commit 3a4c93a

Please sign in to comment.