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.

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

Task/DES-1900 route support #46

Merged
merged 13 commits into from
Mar 26, 2021
Merged

Conversation

nathanfranklin
Copy link
Collaborator

@nathanfranklin nathanfranklin commented Mar 25, 2021

Overview:

Support going directly to map route

PR Status:

  • Ready.

Related Jira tickets:

Summary of Changes:

  • Set active project to null when starting to request new project
  • Remove projects listing in toolbar and restyled the toolbar

Testing Steps:

  1. Navigate to a map
  2. Refresh a map
  3. Change the url so that the UID is wrong and then confirm that there is an error message

UI Photos:

refresh_example
error_example

Notes:

https://jira.tacc.utexas.edu/browse/DES-1906 is opened for follow up work related to project switching/selecting.

Copy link
Contributor

@duckonomy duckonomy left a comment

Choose a reason for hiding this comment

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

Cool! Everything regarding the routes work fantastic!

I think there might be a race condition when creating a project. When the routing happens faster than the project is created in the backend, the component's call to setActiveProjectUUID results in a 500 and the "Unable to access this map" error.

@duckonomy duckonomy self-requested a review March 26, 2021 17:34
Copy link
Contributor

@duckonomy duckonomy left a comment

Choose a reason for hiding this comment

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

💯

@nathanfranklin nathanfranklin merged commit 5cb39d3 into master Mar 26, 2021
nathanfranklin added a commit that referenced this pull request Mar 31, 2021
…ct-switching:

commit b087951
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Mon Mar 29 21:15:40 2021 -0500

    Add fix/note about updating dirty flag when all layers are deleted

commit e69ead9
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Mon Mar 29 20:39:27 2021 -0500

    Fix linting

commit 9882183
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Mon Mar 29 20:39:18 2021 -0500

    Unsubscribe from observables in layers-panel

commit c9ba418
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Mon Mar 29 20:01:04 2021 -0500

    Removed unused function

commit 4e7215c
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Mon Mar 29 19:58:11 2021 -0500

    Fix some linting warnings

commit 98a3f57
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Mon Mar 29 19:57:49 2021 -0500

    Remove old code

commit b3d424f
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Mon Mar 29 19:56:41 2021 -0500

    Refactor handling of deleted tile servers

    Ensure TileLayer are removed from our data structure

commit ec6e0d7
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Mon Mar 29 15:04:24 2021 -0500

    Unsubscribe from rxjs observables in map on destroy

commit b48c498
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Fri Mar 26 21:18:29 2021 -0500

    Ensure we unsubscribe to our rxjs observables

    This was causing multiple requests as we kept creating new subscriptions.  We should
    consider moving these high-level subscriptions from  control-bar.component to AppComponent
    as will be instantiated only once during the application)

commit 8bbf774
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Fri Mar 26 20:59:36 2021 -0500

    Fix deprecated use of combineLatest

commit e3d87bf
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Fri Mar 26 19:57:55 2021 -0500

    Stop switching to active project in ProjectServce.create()

    Handled somewhere else and we react by redirecting to the new projects
    uuid route

commit 66f4fa6
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Fri Mar 26 17:02:11 2021 -0500

    Disable toasts for creation of default tiles for new maps

commit 5cb39d3
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Fri Mar 26 14:35:19 2021 -0500

    Task/DES-1900 route support (#46)

    * Support going directly to map route

    Also, remove selection of map projects in control bar

    * Set active project to null when starting to request new project

    * Remove unneeded projects listing

    * Rename observables related to active project

    * Rework/style control bar component

    Increase font size

    * Remove unused code

    * Simplify setting of loadingOverlay

    * Improve grid layout of control bar

    * Rout to uuid after project creation

    * Add issue to FIXME

    * Fix merge mistake

    * Update test

commit 3e51a7a
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Tue Mar 23 15:02:11 2021 -0500

    Task/DES-1713 support staging client (#44)

    * Refactor environment settings based on where running

    Inspired by first solution proposed here: https://www.mokkapps.de/blog/how-to-build-an-angular-app-once-and-deploy-it-to-multiple-environments/

    * Remove other base ref work

    * Make kube deployments customizable for staging

    * Deploy to dockerhub regadless of branch (temporarily)

    * Fix unit tests

    * Revert "Deploy to dockerhub regadless of branch (temporarily)"

    This reverts commit 72e013a.

    * Fix deploy target in Makefile

    * Fix kub configuration

    * Define APP_BASE_HREF using EnvService

    * Fix hostname/pathname conditional for staging

    * Make the base href relative

    * Improve local condition and expand comment

    * Change warning to error

    * Make minor changes to general README

    * Add kube README

    * Add geoapi backend info to README

commit 0668037
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Wed Mar 10 09:57:59 2021 -0600

    Task/DES-1713 - push images to dockerhub (#41)

    * Deploy to dockerhub

    * Remove build-on-master condition

    * Deploy on all branches (for testing purposes)

    * Move steps to Makefile

    * Revert back to only deploying on master

commit 816f34b
Author: Ian Park <contact@duckonomy.com>
Date:   Wed Mar 3 15:12:32 2021 -0600

    DES-1838: UUID routes and splash page. (#42)

    * Make welcome page and routes.

    * Polish frontend and change routing to UUID.

    * Center logo and add NSF icon.

    * Refactoring and visual changes for splash page.

    * Change control bar so that it routes to map UUID instead of ID.

    * Change naming

commit d1d8348
Author: Ian Park <contact@duckonomy.com>
Date:   Mon Feb 1 09:32:19 2021 -0600

    Task/DES-1760 External Tile Servers and QMS search (#39)

    * Tile layer list interface

    * Add tile layer interface with QMS integration.

    * Handle text overflows.

    * Upstream stuff.

    * Upstream stuff.

    * Upstream stuff.

    * Upstream stuff.

    * Merge master.

    * Better attribution input.

    * Remove logs.

    * Geoapi for tile servers.

    * More backend updates and UI adjustments.

    * Edit layers interface.

    * Improve tile server listing.

    * Refactor and add WMS configuration options.

    * Refactor and polish.

    * Default Tile Suggestions.

    * Resolve layer option update problem, add notifications, and add apply fixes.

    * Quick fix.

    * Modal for confirming deletion and disabled save button on dirty options.

    * Fix branching for saveTileServers.

    * Reverse layer order.

    * Reduce padding on tile list and allow larger items to work properly.

commit 6b53c45
Author: Ian Park <contact@duckonomy.com>
Date:   Tue Jan 19 14:37:55 2021 -0600

    TASK/DES-1845 - Add mouse multi-select. (#40)

    * TASK/DES-1845 - Add mouse multi-select.

    * Refactoring and fix quirks.

commit 2417a3a
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Thu Dec 3 12:03:44 2020 -0600

    Update client id (#37)
nathanfranklin added a commit that referenced this pull request Apr 7, 2021
* Fix linting

* Add initial public map

* Hide things in dock when viewing as public

* Disable asset adding when in public view

* Add a panel to show info for public maps

* Add ability to make maps maps public

* Refactor ability to make maps public

* Make some changes for linting reasons

* Merged (squashed) commit task/DES-1906-tileserver-issues-during-project-switching:

commit b087951
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Mon Mar 29 21:15:40 2021 -0500

    Add fix/note about updating dirty flag when all layers are deleted

commit e69ead9
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Mon Mar 29 20:39:27 2021 -0500

    Fix linting

commit 9882183
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Mon Mar 29 20:39:18 2021 -0500

    Unsubscribe from observables in layers-panel

commit c9ba418
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Mon Mar 29 20:01:04 2021 -0500

    Removed unused function

commit 4e7215c
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Mon Mar 29 19:58:11 2021 -0500

    Fix some linting warnings

commit 98a3f57
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Mon Mar 29 19:57:49 2021 -0500

    Remove old code

commit b3d424f
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Mon Mar 29 19:56:41 2021 -0500

    Refactor handling of deleted tile servers

    Ensure TileLayer are removed from our data structure

commit ec6e0d7
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Mon Mar 29 15:04:24 2021 -0500

    Unsubscribe from rxjs observables in map on destroy

commit b48c498
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Fri Mar 26 21:18:29 2021 -0500

    Ensure we unsubscribe to our rxjs observables

    This was causing multiple requests as we kept creating new subscriptions.  We should
    consider moving these high-level subscriptions from  control-bar.component to AppComponent
    as will be instantiated only once during the application)

commit 8bbf774
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Fri Mar 26 20:59:36 2021 -0500

    Fix deprecated use of combineLatest

commit e3d87bf
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Fri Mar 26 19:57:55 2021 -0500

    Stop switching to active project in ProjectServce.create()

    Handled somewhere else and we react by redirecting to the new projects
    uuid route

commit 66f4fa6
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Fri Mar 26 17:02:11 2021 -0500

    Disable toasts for creation of default tiles for new maps

commit 5cb39d3
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Fri Mar 26 14:35:19 2021 -0500

    Task/DES-1900 route support (#46)

    * Support going directly to map route

    Also, remove selection of map projects in control bar

    * Set active project to null when starting to request new project

    * Remove unneeded projects listing

    * Rename observables related to active project

    * Rework/style control bar component

    Increase font size

    * Remove unused code

    * Simplify setting of loadingOverlay

    * Improve grid layout of control bar

    * Rout to uuid after project creation

    * Add issue to FIXME

    * Fix merge mistake

    * Update test

commit 3e51a7a
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Tue Mar 23 15:02:11 2021 -0500

    Task/DES-1713 support staging client (#44)

    * Refactor environment settings based on where running

    Inspired by first solution proposed here: https://www.mokkapps.de/blog/how-to-build-an-angular-app-once-and-deploy-it-to-multiple-environments/

    * Remove other base ref work

    * Make kube deployments customizable for staging

    * Deploy to dockerhub regadless of branch (temporarily)

    * Fix unit tests

    * Revert "Deploy to dockerhub regadless of branch (temporarily)"

    This reverts commit 72e013a.

    * Fix deploy target in Makefile

    * Fix kub configuration

    * Define APP_BASE_HREF using EnvService

    * Fix hostname/pathname conditional for staging

    * Make the base href relative

    * Improve local condition and expand comment

    * Change warning to error

    * Make minor changes to general README

    * Add kube README

    * Add geoapi backend info to README

commit 0668037
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Wed Mar 10 09:57:59 2021 -0600

    Task/DES-1713 - push images to dockerhub (#41)

    * Deploy to dockerhub

    * Remove build-on-master condition

    * Deploy on all branches (for testing purposes)

    * Move steps to Makefile

    * Revert back to only deploying on master

commit 816f34b
Author: Ian Park <contact@duckonomy.com>
Date:   Wed Mar 3 15:12:32 2021 -0600

    DES-1838: UUID routes and splash page. (#42)

    * Make welcome page and routes.

    * Polish frontend and change routing to UUID.

    * Center logo and add NSF icon.

    * Refactoring and visual changes for splash page.

    * Change control bar so that it routes to map UUID instead of ID.

    * Change naming

commit d1d8348
Author: Ian Park <contact@duckonomy.com>
Date:   Mon Feb 1 09:32:19 2021 -0600

    Task/DES-1760 External Tile Servers and QMS search (#39)

    * Tile layer list interface

    * Add tile layer interface with QMS integration.

    * Handle text overflows.

    * Upstream stuff.

    * Upstream stuff.

    * Upstream stuff.

    * Upstream stuff.

    * Merge master.

    * Better attribution input.

    * Remove logs.

    * Geoapi for tile servers.

    * More backend updates and UI adjustments.

    * Edit layers interface.

    * Improve tile server listing.

    * Refactor and add WMS configuration options.

    * Refactor and polish.

    * Default Tile Suggestions.

    * Resolve layer option update problem, add notifications, and add apply fixes.

    * Quick fix.

    * Modal for confirming deletion and disabled save button on dirty options.

    * Fix branching for saveTileServers.

    * Reverse layer order.

    * Reduce padding on tile list and allow larger items to work properly.

commit 6b53c45
Author: Ian Park <contact@duckonomy.com>
Date:   Tue Jan 19 14:37:55 2021 -0600

    TASK/DES-1845 - Add mouse multi-select. (#40)

    * TASK/DES-1845 - Add mouse multi-select.

    * Refactoring and fix quirks.

commit 2417a3a
Author: Nathan Franklin <nathan.franklin@gmail.com>
Date:   Thu Dec 3 12:03:44 2020 -0600

    Update client id (#37)

* Refactor to match updated routing

* Removed unused code

* Add JWT to request only if user logged in

* Update main-project to use isPublicView

* Remove unused code

* Fix routing and login/logout process

Support user being redirected to desired route after login
and stop the double login.

* Update use of getUserInfo

* Style logged-out component

* Show 'Public Map' when viewing public map

* Update user on logout

* Add login button

* Remove tracing of routes

* Avoid getting notications or users if not logged in

* Fix ExpressionChangedAfterItHasBeenCheckedError going from logged in to /logout

* Remove unused code

* Revert "Fix ExpressionChangedAfterItHasBeenCheckedError going from logged in to /logout"

This reverts commit 8a3641e.

* Add note for additional required fix

* Use setTimeout to avoid ExpressionChangedAfterItHasBeenCheckedError during /logout
@taoteg taoteg deleted the task/DES-1900-route-support branch July 6, 2023 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants