forked from bcgov/nr-bcws-wfnews
-
Notifications
You must be signed in to change notification settings - Fork 0
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
Fix/wfnews 504 #1
Open
gpineiro-vivid
wants to merge
2
commits into
yzlucas:main
Choose a base branch
from
gpineiro-vivid:fix/WFNEWS-504
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dhlevi
added a commit
that referenced
this pull request
Oct 6, 2022
* Lint update (bcgov#16) * Update CheckHealthEndpointsTest.java * Update Spring to 5.3.18 * Merge from Main (#1) * Spring/Postgres update, fix failing stub unit test (bcgov#6) * Update CheckHealthEndpointsTest.java * Update Spring to 5.3.18 * update server test to use mvn test * Bump postgresql from 42.2.25 to 42.3.3 in /server (bcgov#7) Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.25 to 42.3.3. - [Release notes](https://github.com/pgjdbc/pgjdbc/releases) - [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md) - [Commits](pgjdbc/pgjdbc@REL42.2.25...REL42.3.3) --- updated-dependencies: - dependency-name: org.postgresql:postgresql dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Angular Project Set up (bcgov#8) * first commit * use incident manager as a kick off template * update angular core to 12 * update angular material to 12 * manually address the lightGallery update * angular 12 to 13 * angular 13 material update * log4j2 update * take out lightGallery * delete unused stuff part 1 * delete unused stuff part 2 * delete unused stuff part 3 * delete unused stuff part 4 * delete unused stuff part 5, skip the tokenService * rename to wfnews * clean out unused asset files * clean out unused layer configs * more clean up Co-authored-by: Dylan <[email protected]> * Feature/wfnews 272 (bcgov#9) * Initial commit - set up project * WFNEWS-265 Fix deploy, build issues and project structure * Update package name to wfnews * Clean up java code in angular project * Remove unused dependencies and upgrade dependency versions * Update dependencies * Update dependencies * Add codehaus plexus dependency * Remove codehaus dependency Co-authored-by: Dylan <[email protected]> * Remove codeql Removed codeql check for now, until we get the rest of the pipeline updated * Remove codeql Removed codeql and snyc scans for now, until rest of pipeline is in place * WFNEWS-323 - Add incidents API functionality (bcgov#10) * WFNEWS-323 - Add incidents API functionality * Remove wfone-common-model explicit dependency version * Remove unused maven plugin dependency and update postgresql dependency * WFNEWS-323 Revert filtering to AGOL service and fix tests Co-authored-by: Dylan <[email protected]> * adapt new UI common components (bcgov#11) * first commit * use incident manager as a kick off template * update angular core to 12 * update angular material to 12 * manually address the lightGallery update * angular 12 to 13 * angular 13 material update * log4j2 update * take out lightGallery * delete unused stuff part 1 * delete unused stuff part 2 * delete unused stuff part 3 * delete unused stuff part 4 * delete unused stuff part 5, skip the tokenService * rename to wfnews * clean out unused asset files * clean out unused layer configs * more clean up * sync with main * fix the useless merge differences * use wfcc new components * hide side menu * click footer navigate to related bcgov website * change spring security core to 5.5.7 * change spring-security-web and spring-security-config to 5.5.7.Release * change spring-security stuff form 5.5.7.Release to 5.5.7 * update spring-security-config in server pom Co-authored-by: Dylan <[email protected]> * Feature/wfnews 255 (bcgov#12) * WFNEWS-255 Add Active Wildfires count display * WFNEWS-255 Add Active Wildfires count display * WFNEWS-255 add test for Active Fire count and fix up project to allow ng test command to run * add package-lock.json Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Lucas Li <[email protected]> Co-authored-by: ssylver93 <[email protected]> * Update linter Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Lucas Li <[email protected]> Co-authored-by: ssylver93 <[email protected]> * Feature/wfnews 255 (bcgov#15) * WFNEWS-255 Add Active Wildfires count display * WFNEWS-255 Add Active Wildfires count display * WFNEWS-255 add test for Active Fire count and fix up project to allow ng test command to run * add package-lock.json Co-authored-by: Dylan <[email protected]> * active wildfires page (bcgov#14) * first commit * use incident manager as a kick off template * update angular core to 12 * update angular material to 12 * manually address the lightGallery update * angular 12 to 13 * angular 13 material update * log4j2 update * take out lightGallery * delete unused stuff part 1 * delete unused stuff part 2 * delete unused stuff part 3 * delete unused stuff part 4 * delete unused stuff part 5, skip the tokenService * rename to wfnews * clean out unused asset files * clean out unused layer configs * more clean up * sync with main * fix the useless merge differences * use wfcc new components * hide side menu * click footer navigate to related bcgov website * change spring security core to 5.5.7 * change spring-security-web and spring-security-config to 5.5.7.Release * change spring-security stuff form 5.5.7.Release to 5.5.7 * update spring-security-config in server pom * initial commit of hooking up localhost api * commit some state managements * save ongoing work * display active fire cournts * map layers icon * get rid of incidents store * clean up * left panel * left panel * Revert "left panel" This reverts commit dd996ae. * cancel the revert of last commit- left panel Co-authored-by: Dylan <[email protected]> * restructure active wildfire map (bcgov#20) * wfnews-314 refactor .components app and wf-map-container, add active-wildfire-map * styling fixes to active-wildfires-map * remove unused components, much improved active-wildfire-map, accordion panels refactored into components * fix map sizing * evac orders panel * update styling of map tools, cleanup map config * fix Co-authored-by: Benjamin Jubb <[email protected]> * Lint update, strip java components (bcgov#22) * Lint update, strip java components * Add updated package json Couldn't build Owl without adding jayjs and ng-pick-datetime. If this isn't needed please remove Co-authored-by: Dylan <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Lucas Li <[email protected]> Co-authored-by: ssylver93 <[email protected]> Co-authored-by: Benjamin Jubb <[email protected]> Co-authored-by: Benjamin Jubb <[email protected]>
dhlevi
added a commit
that referenced
this pull request
Oct 6, 2022
* Lint update (bcgov#16) * Update CheckHealthEndpointsTest.java * Update Spring to 5.3.18 * Merge from Main (#1) * Spring/Postgres update, fix failing stub unit test (bcgov#6) * Update CheckHealthEndpointsTest.java * Update Spring to 5.3.18 * update server test to use mvn test * Bump postgresql from 42.2.25 to 42.3.3 in /server (bcgov#7) Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.25 to 42.3.3. - [Release notes](https://github.com/pgjdbc/pgjdbc/releases) - [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md) - [Commits](pgjdbc/pgjdbc@REL42.2.25...REL42.3.3) --- updated-dependencies: - dependency-name: org.postgresql:postgresql dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Angular Project Set up (bcgov#8) * first commit * use incident manager as a kick off template * update angular core to 12 * update angular material to 12 * manually address the lightGallery update * angular 12 to 13 * angular 13 material update * log4j2 update * take out lightGallery * delete unused stuff part 1 * delete unused stuff part 2 * delete unused stuff part 3 * delete unused stuff part 4 * delete unused stuff part 5, skip the tokenService * rename to wfnews * clean out unused asset files * clean out unused layer configs * more clean up Co-authored-by: Dylan <[email protected]> * Feature/wfnews 272 (bcgov#9) * Initial commit - set up project * WFNEWS-265 Fix deploy, build issues and project structure * Update package name to wfnews * Clean up java code in angular project * Remove unused dependencies and upgrade dependency versions * Update dependencies * Update dependencies * Add codehaus plexus dependency * Remove codehaus dependency Co-authored-by: Dylan <[email protected]> * Remove codeql Removed codeql check for now, until we get the rest of the pipeline updated * Remove codeql Removed codeql and snyc scans for now, until rest of pipeline is in place * WFNEWS-323 - Add incidents API functionality (bcgov#10) * WFNEWS-323 - Add incidents API functionality * Remove wfone-common-model explicit dependency version * Remove unused maven plugin dependency and update postgresql dependency * WFNEWS-323 Revert filtering to AGOL service and fix tests Co-authored-by: Dylan <[email protected]> * adapt new UI common components (bcgov#11) * first commit * use incident manager as a kick off template * update angular core to 12 * update angular material to 12 * manually address the lightGallery update * angular 12 to 13 * angular 13 material update * log4j2 update * take out lightGallery * delete unused stuff part 1 * delete unused stuff part 2 * delete unused stuff part 3 * delete unused stuff part 4 * delete unused stuff part 5, skip the tokenService * rename to wfnews * clean out unused asset files * clean out unused layer configs * more clean up * sync with main * fix the useless merge differences * use wfcc new components * hide side menu * click footer navigate to related bcgov website * change spring security core to 5.5.7 * change spring-security-web and spring-security-config to 5.5.7.Release * change spring-security stuff form 5.5.7.Release to 5.5.7 * update spring-security-config in server pom Co-authored-by: Dylan <[email protected]> * Feature/wfnews 255 (bcgov#12) * WFNEWS-255 Add Active Wildfires count display * WFNEWS-255 Add Active Wildfires count display * WFNEWS-255 add test for Active Fire count and fix up project to allow ng test command to run * add package-lock.json Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Lucas Li <[email protected]> Co-authored-by: ssylver93 <[email protected]> * Update linter Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Lucas Li <[email protected]> Co-authored-by: ssylver93 <[email protected]> * Feature/wfnews 255 (bcgov#15) * WFNEWS-255 Add Active Wildfires count display * WFNEWS-255 Add Active Wildfires count display * WFNEWS-255 add test for Active Fire count and fix up project to allow ng test command to run * add package-lock.json Co-authored-by: Dylan <[email protected]> * active wildfires page (bcgov#14) * first commit * use incident manager as a kick off template * update angular core to 12 * update angular material to 12 * manually address the lightGallery update * angular 12 to 13 * angular 13 material update * log4j2 update * take out lightGallery * delete unused stuff part 1 * delete unused stuff part 2 * delete unused stuff part 3 * delete unused stuff part 4 * delete unused stuff part 5, skip the tokenService * rename to wfnews * clean out unused asset files * clean out unused layer configs * more clean up * sync with main * fix the useless merge differences * use wfcc new components * hide side menu * click footer navigate to related bcgov website * change spring security core to 5.5.7 * change spring-security-web and spring-security-config to 5.5.7.Release * change spring-security stuff form 5.5.7.Release to 5.5.7 * update spring-security-config in server pom * initial commit of hooking up localhost api * commit some state managements * save ongoing work * display active fire cournts * map layers icon * get rid of incidents store * clean up * left panel * left panel * Revert "left panel" This reverts commit dd996ae. * cancel the revert of last commit- left panel Co-authored-by: Dylan <[email protected]> * restructure active wildfire map (bcgov#20) * wfnews-314 refactor .components app and wf-map-container, add active-wildfire-map * styling fixes to active-wildfires-map * remove unused components, much improved active-wildfire-map, accordion panels refactored into components * fix map sizing * evac orders panel * update styling of map tools, cleanup map config * fix Co-authored-by: Benjamin Jubb <[email protected]> * Lint update, strip java components (bcgov#22) * Lint update, strip java components * Add updated package json Couldn't build Owl without adding jayjs and ng-pick-datetime. If this isn't needed please remove Co-authored-by: Dylan <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Lucas Li <[email protected]> Co-authored-by: ssylver93 <[email protected]> Co-authored-by: Benjamin Jubb <[email protected]> Co-authored-by: Benjamin Jubb <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.