Skip to content

Commit

Permalink
Merge pull request #1136 from cedardevs/prep_tag_2_4_0
Browse files Browse the repository at this point in the history
Prep tag 2.4.0
  • Loading branch information
zebdelk authored Jan 24, 2020
2 parents 4192267 + 2765e12 commit eb15c93
Show file tree
Hide file tree
Showing 29 changed files with 73 additions and 46 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ dependencyCheck {
subprojects {

project.ext {
schemasVersion = '0.5.0'
schemasVersion = '0.5.3'
esVersion = '6.8.4'
spockVersion = '1.2-groovy-2.5'
testContainersVersion = '1.12.2'
Expand Down
5 changes: 0 additions & 5 deletions client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"esri-leaflet": "^2.2.3",
"esri-loader": "^2.6.0",
"file-saver": "^2.0.0",
"geometry-polyfill": "^1.0.6",
"history": "^4.7.2",
"isomorphic-fetch": "^2.2.1",
"leaflet": "^1.4.0",
Expand Down
6 changes: 1 addition & 5 deletions client/src/components/about/About.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,7 @@ export default class About extends React.Component {
amended in 1998.
</p>
<p>
We have completed a 3rd party review that confirms the site meets
all WCAG 2.1 Level A accessibility requirements, we expect all of
our features to meet Level AA standards by our next release, and
we will continue to make improvements across our entire site
aiming for AAA compliance where possible.
We have completed a 3rd party review that confirms the site meets all WCAG 2.1 Level A accessibility requirements. In addition we have recently implemented changes to meet all Level AA standards, and we will continue to make improvements across our entire site aiming for AAA compliance where possible.
</p>
<p>
If you experience any challenges while accessing parts of our
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/common/ui/Proxy.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, {useEffect, useRef, useState} from 'react'
import ResizeObserver from 'resize-observer-polyfill' // handle browsers not supporting ResizeObserver
import 'geometry-polyfill' // handle browsers not supporting DOMRect
import '../../../utils/polyfillDOMRect'

const ANIMATION_DURATION = 200

Expand Down
37 changes: 37 additions & 0 deletions client/src/utils/polyfillDOMRect.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/*
This version of DOMRect polyfill came from https://github.com/jarek-foksa/geometry-polyfill/blob/master/geometry-polyfill.js
For some reason, importing geometry-polyfill was giving us problems in IE11 due to other classes we aren't using in this project.
*/
{
class DOMRect {
constructor(x = 0, y = 0, width = 0, height = 0) {
this.x = x;
this.y = y;
this.width = width;
this.height = height;
}

static fromRect(otherRect) {
return new DOMRect(otherRect.x, otherRect.y, otherRect.width, otherRect.height);
}

get top() {
return this.y;
}

get left() {
return this.x;
}

get right() {
return this.x + this.width;
}

get bottom() {
return this.y + this.height;
}
}

window.DOMRect = window.DOMRect || DOMRect;
}
Binary file modified docs/images/ui-id/datetime-errors.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ui-id/expanded-data-theme.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ui-id/filter-tags.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ui-id/geo-date-interval.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ui-id/grid-toggle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ui-id/invalid-coordinates.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ui-id/list-toggle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ui-id/location-in-sync.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ui-id/multi-theme-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ui-id/multi-theme-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ui-id/one-theme-results.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ui-id/results-multi-category.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ui-id/results-without-theme-keywords.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ui-id/selected-expanded-data-theme.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ui-qs/cart-page.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ui-qs/cart-update.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ui-qs/collection-details.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ui-qs/collection-filter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ui-qs/collection-results.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ui-qs/granule-filter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ui-qs/granule-results.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 21 additions & 21 deletions docs/public-user/ui/features-in-depth.md

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions docs/public-user/ui/quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
**Estimated Reading Time: 5 minutes**

# User Interface Quick Start Guide
The OneStop UI is designed to be useful and intuitive for a large cross-section of end-users: scientists, researchers, students, and the average person in general. It's a great starting point when trying to discover and download scientific data, and is designed to help users find more specific services of interest as well.
The OneStop UI is designed to be useful and intuitive for a large cross-section of end-users: scientists, researchers, students, and the average person in general. It's a great starting point when trying to discover and download scientific data, and is designed to help users find more specific services of interest as well.

The UI leverages a modern build process and features, the output of which has been tested and determined compatible with the most recent versions of the following browsers (as of November 2019):
* Chrome
Expand All @@ -20,8 +20,8 @@ This quick start guide is meant for a true beginner to the website's functionali
In terms of the UI, the best way to get started is really just to dive right in! You can follow along with the steps on the official [NOAA deployment site](https://data.noaa.gov/onestop/) or our [development deployment](https://sciapps.colorado.edu/onestop). Keep in mind that result ordering and counts may not match exactly to what is shown in the guide images.

### Step One: The Initial Search Query
From the landing page, there are 3 ways to populate the initial text query:
1. Enter your query in the text bar, followed by `Enter` or clicking the magnifying glass button.
From the landing page, there are 3 ways to populate the initial text query:
1. Enter your query in the text bar, followed by `Enter` or clicking the magnifying glass button.
1. Click one of the options under the `Explore Popular Topics` header.
1. Click one of the options on the `Featured Data Sets` carousel.

Expand All @@ -32,21 +32,21 @@ We'll use the query text field and search for the term `water level`.
**Note**: Check out that dashed line around the `Weather` icon. The UI fully supports keyboard navigation, and the current focus is frequently denoted by a dashed line (other visual focus cues are sometimes used when the dashed line is otherwise more difficult to discern). A later guide in this series covers keyboard navigation in depth.

### Step Two: Assessing Initial Collection Results
You've started exploring the data at last! The first results you encounter are collection results. Collections are a high level grouping of similar data files -- they can represent all the data gathered by a single instrument on a satellite to a poster about a hurricane, and everything in between. Depending on the specificity of your query, the number of collection results returned can vary widely.
You've started exploring the data at last! The first results you encounter are collection results. Collections are a high level grouping of similar data files -- they can represent all the data gathered by a single instrument on a satellite to a poster about a hurricane, and everything in between. Depending on the specificity of your query, the number of collection results returned can vary widely.

As you can see below, we found 482 collections matching our search term, and they seem to all be quite different...
As you can see below, we found 485 collections matching our search term, and they seem to all be quite different...

![Collection results page for "water level" query](../../images/ui-qs/collection-results.png)

### Step Three: Filtering Collection Results
On the left hand side of the page you'll notice the `Collection Filters` panel. There are three general types of filters available to narrow your results:
* `Location` -- Spatial parameters that should match the results
* `Location` -- Spatial parameters that should match the results
* `Date` -- Temporal parameters that should match the results
* `Attributes` -- Keywords, access types, and file formats that should match the results

A deeper dive into every feature of the UI can be found on the next page in this documentation series.
A deeper dive into every feature of the UI can be found on the next page in this documentation series.

In the meantime, let's narrow our results by applying a `Data Theme` keyword to our search. These keywords in particular are hierarchically organized, and any level of the hierarchy can be selected. We'll drill down to `Atmosphere > Atmospheric Winds > Surface Winds`, which will narrow our result set size down to 30.
In the meantime, let's narrow our results by applying a `Data Theme` keyword to our search. These keywords in particular are hierarchically organized, and any level of the hierarchy can be selected. We'll drill down to `Atmosphere > Atmospheric Winds > Surface Winds`, which will narrow our result set size down to 30.

![Collection results page with applied Data Theme keyword filter](../../images/ui-qs/collection-filter.png)

Expand All @@ -58,12 +58,12 @@ Results on OneStop are returned in relevance order. Click the tile for the first
The collection detail page summarizes several key details about a given collection. The title and description are fully presented, along with it's temporal and spatial bounds. Some high level collection access details are given, if available, on the `Access` tab view. If a collection has granules and they are indexed within OneStop, the top right of the detail page provides a link to all of them.

### Step Five: Exploring A Collection's Granules
Click on the `Show all 24 files in collection` link to start narrowing down specific granules (data files). The granule results page looks similar to the collection results page, but an additional filter is available and the tiles are now more detailed.
Click on the `Show all 22 files in collection` link to start narrowing down specific granules (data files). The granule results page looks similar to the collection results page, but an additional filter is available and the tiles are now more detailed.

![Granule results page showing all searchable files for the collection](../../images/ui-qs/granule-results.png)

### Step Six: Filtering Granule Results
At this point, 24 matching files is a pretty small quantity that in reality is a quite reasonable number to download directly all at once. However, many of NOAA's OneStop holdings are collections with granule counts in the millions. For a case like that, taking advantage of `File Filters` can save you a lot of time and effort getting to the data you need.
At this point, 22 matching files is a pretty small quantity that in reality is a quite reasonable number to download directly all at once. However, many of NOAA's OneStop holdings are collections with granule counts in the millions. For a case like that, taking advantage of `File Filters` can save you a lot of time and effort getting to the data you need.

For this guide, we'll narrow down our results to just the ones intersecting any date in the year 2017.

Expand All @@ -72,7 +72,7 @@ For this guide, we'll narrow down our results to just the ones intersecting any
### Step Seven: Downloading Granules
Having applied a time filter to our search, we now have 10 matching files! It's time to download some data.

From this view, you can add files individually to your cart using the checkbox on the bottom left corner of a granule tile. Alternatively, use the `Add Matching to Cart` button at the top of the results to select everything. We'll add all of our matches.
From this view, you can add files individually to your cart using the checkbox on the bottom left corner of a granule tile. Alternatively, use the `Add Matching to Cart` button (icon of a cart with a plus symbol) at the top of the results to select everything. We'll add all of our matches.

The shopping cart icon in the page header will now update to reflect the number of items in the cart.

Expand All @@ -83,4 +83,4 @@ Clicking that icon will take you to the cart page, where you can generate a list
![Cart page showing 10 files ready to generate a URL list for](../../images/ui-qs/cart-page.png)

<hr>
<div align="center"><a href="/onestop/public-user">Previous</a> | <a href="#">Top of Page</a> | <a href="/onestop/public-user/ui/features-in-depth">Next</a></div>
<div align="center"><a href="/onestop/public-user">Previous</a> | <a href="#">Top of Page</a> | <a href="/onestop/public-user/ui/features-in-depth">Next</a></div>

0 comments on commit eb15c93

Please sign in to comment.