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

Jump to bottom

fix(map): Map view - Infinite loading for places, when user is redire… #213

Merged
merged 3 commits into from
Oct 7, 2020
Merged

fix(map): Map view - Infinite loading for places, when user is redire… #213

merged 3 commits into from
Oct 7, 2020

Conversation

corinacioloca
Copy link
Contributor

@corinacioloca corinacioloca commented Oct 7, 2020 •
edited by jira bot
Loading

…cted from 404 page EP-3033

By submitting a PR to this repository, you agree to the terms within the Code of Conduct. Please see the contributing guidelines for how to create and submit a high-quality PR for this repo.

Description

Describe the purpose of this PR along with any background information and the impacts of the proposed change. For the benefit of the community, please do not assume prior context.

Provide details that support your chosen implementation, including: breaking changes, alternatives considered, changes to the API, etc.

References

Include any links supporting this change such as a:

  • GitHub Issue/PR number addressed or fixed
  • StackOverflow post
  • Support forum thread
  • Related pull requests/issues from other repos

If there are no references, simply delete this section.

Testing

Describe how this can be tested by reviewers. Be specific about anything not tested and reasons why. If this library has unit and/or integration testing, tests should be added for new functionality and existing tests should complete without errors.

Please include any manual steps for testing end-to-end or functionality not covered by unit/integration tests.

Also include details of the environment this PR was developed in (language/platform/browser version).

  • This change adds test coverage for new/changed/fixed functionality

Checklist

  • I have added documentation for new/changed functionality in this PR or in /docs
  • All active GitHub checks for tests, formatting, and security are passing
  • The correct base branch is being used, if not master

ancashoria
ancashoria approved these changes Oct 7, 2020
View reviewed changes
packages/earth-map/src/pages/verify-email/component.tsx Outdated
replace('/earth');
}}
>
<button className="ng-button ng-button-primary" onClick={() => logout()}>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<button className="ng-button ng-button-primary" onClick={() => logout()}>
<button className="ng-button ng-button-primary" onClick={logout}>

packages/earth-map/src/pages/not-found/component.tsx Outdated

import { Button, ErrorTemplate } from '@marapp/earth-shared';

const NotFound = ({ resetStore }) => {
const NotFound = ({ returnToHome, resetStore }) => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could compose them in the connected (index.tsx) component and only pass one prop in. This guarantees you can't use them separately in the component

@corinacioloca corinacioloca merged commit f661642 into develop Oct 7, 2020
@corinacioloca corinacioloca deleted the EP-3033-404-redirect branch October 7, 2020 14:26
genodeploy pushed a commit that referenced this pull request Oct 8, 2020
@semantic-release-bot
chore(release): 1.8.0 [skip ci]
972ca7f 
# [1.8.0](v1.7.0...v1.8.0) (2020-10-08)

### Bug Fixes

* **auth:** Configure Auth0 SDK to use local storage and rotating refresh tokens ([7775c93](7775c93))
* searchbox minimum size [EP-3026] ([#215](#215)) ([992cf68](992cf68))
* update display of roles to not include org and to be capitalized [EP-3034] ([#216](#216)) ([93d26c8](93d26c8))
* **admin:** 404 pages [EP-797] ([21f2331](21f2331))
* **admin:** 404 pages [EP-797] ([4f8ea8b](4f8ea8b))
* **admin:** 404 pages [EP-797] ([#180](#180)) ([6634072](6634072))
* **admin:** allow placeholeder group for super admins [EP-2919] ([ed79ee4](ed79ee4))
* **admin:** highlight skipped users [EP-3024] ([#204](#204)) ([b1e14e2](b1e14e2))
* **admin:** Keep users list updated after add/delete user [EP-2930] ([16036b6](16036b6))
* **admin:** select cursor position [EP-3030] ([#212](#212)) ([e3d49ee](e3d49ee))
* **admin:** Special character validation from title [EP-2718] ([87533c0](87533c0))
* **admin:** Use cursor based pagination on all APIs that support it [EP-2971] ([49f4869](49f4869))
* **admin:** View and upload shape section cannot be opened [EP-3008],  Button text should be changed from "Save" to "Update shape" [EP-2637] ([e018ecb](e018ecb))
* **admin:** Widget/Layer config is displaying an error by default, on add new layer/widget page [EP-2918] ([#194](#194)) ([6d64b29](6d64b29))
* **map:** design qa [EP-2999] ([#193](#193)) ([33ba60c](33ba60c))
* **map:** design qa [EP-2999] ([#195](#195)) ([1306f8e](1306f8e))
* **map:** design qa [EP-2999] ([#196](#196)) ([22030b3](22030b3))
* **map:** legend layers order fixes [EP-2851, EP-2852] ([#170](#170)) ([bb76fde](bb76fde))
* **map:** Map view - Infinite loading for places, when user is redire… ([#213](#213)) ([f661642](f661642))
* **map:** metric download bugs [EP-2998, EP-2997] ([38d470b](38d470b))
* **map:** Refactor sidebar header to display scroll only in the content area ([e72dcd2](e72dcd2))
* **map:** Sort featured places by name [EP-3028] ([2c46c23](2c46c23))
* **map:** widget layer(s) api call & label [EP-3019] ([#210](#210)) ([3d50005](3d50005))
* **profile:** logo click area [EP-3010] ([#209](#209)) ([0db995b](0db995b))
* Add scroll when too many orgs are displayed in the dropdown [EP-2858] ([cef71a6](cef71a6))
* cancel button color / user list refresh [EP-2930] [EP-2931] ([b5a9c4b](b5a9c4b))
* encode query parameters ([3eed93c](3eed93c))
* Fixed AppContext when logged in with super admin ([#183](#183)) ([f7f2d14](f7f2d14))
* height size select user / role [EP-2216] ([776fccf](776fccf))
* Long name location is cut off [EP-1866], file upload not working on safari [EP-2715] ([#201](#201)) ([dc2cefc](dc2cefc))
* Multiple visual bugs on Org Switcher, Spinner ([5419b23](5419b23))
* Order widgets based on organization + name [EP-2929] ([f7a8898](f7a8898))
* Org switcher displays the correct selection [EP-3007] ([aa9e4d4](aa9e4d4))
* Spacing in the org switcher ([7c4337e](7c4337e))
* **map:** Show spinner while loading location [EP-1501] ([#182](#182)) ([ed09c19](ed09c19))
* **map:** Stop header refresh when clicking places/layers [EP-2987] ([5c81968](5c81968))
* remove empty validation object ([1c6f48b](1c6f48b))
* User menu refactor and fix for [EP-2853] ([3bf35d8](3bf35d8))

### Features

* **admin:** Display selected org as the org switcher label ([a855ea9](a855ea9))
* **admin:** update users screen [EP-2216] ([963eee4](963eee4))
* **map:** Display max 100 featured places instead of 30 [EP-3028] ([d16605f](d16605f))
* **map:** Home page CTA redirect to map view [EP-2758] ([c0176cf](c0176cf))
* **map:** metric download functionality [EP-1328] ([#187](#187)) ([505cb30](505cb30))
* **map:** Removed selected layers list [EP-2762] ([#190](#190)) ([e687b8c](e687b8c))
* **map:** tiles loading indicator [EP-2084] ([c2ac57a](c2ac57a))
* **shared:** typescript migration [EP-3031] ([#214](#214)) ([65bc856](65bc856))
* Add Universal Login pages backup [EP-2976] ([1f0fb70](1f0fb70))
* generic user profile [EP-2502] ([fda6bf3](fda6bf3))
* Redesigned Context Switcher [EP-2920] ([a0e8bba](a0e8bba))
* **map:** user menu button for sign-up [EP-2760] ([#172](#172)) ([bbd8132](bbd8132))
* users org progress [EP-2216] ([35de2c6](35de2c6))
@dan-qc
Copy link
Contributor

dan-qc commented Oct 8, 2020

🎉 This PR is included in version 1.8.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@dan-qc dan-qc added the released label Oct 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ancashoria ancashoria ancashoria approved these changes

Assignees
No one assigned
Labels
released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@corinacioloca @dan-qc @ancashoria