Skip to content

Commit c7195f2

Browse files
ryanslattengillandkrestjohnkimura-developerjimcheng256
authored
Release 6.3.0 (#285)
* ci: Cleaning dist dir in web-app * [web-app] wip: updating deps for node 16 build * [web-app] wip: build on node 16: use packaged md-date-time-picker dependency instead of nested source tree so npm does not pull outdated dev dependencies of md-date-time-picker which cause build errors on node 16 * [web-app] use published md-date-time-picker so npm does not pull its dev dependencies which break the build * [web-app] use md-date-time-picker from npm registry * [ci] use latest node to build web-app * bump package versions * [ci] publish to npm registry * [ci] publish npm packages with public access so publish command does not fail * [plugins] typo in readme * [service] cve: upgrade jsonwebtoken lib * [service] add todo comment to address * bump beta version * [service] fix old mongodb-migrations reference * [service] fix timestamp bug in test * [service] remove unnecessary string wrapping * [ci] remove node 14 and add 18 * [service] update geopackage version so mage runs in node 18+ * bump beta version * bump engine requirements for mage service; update plugins to use core version 6.2.x or 6.3 beta * [docker] fix typo in comment * [service] properly transform populated role in user transform * [web-app] update dms changes from merge for angular 14 * [plugins/image] bump service patch version from merged master version * About page display node version (#170) * Update target property from localhost to 127.0.0.1 * System section, node version on about page * about component node version included * back to localhost * About page mongodb version (#172) * mongodb version added to appLayer, repos * bit of refactor to make system info elements follow conventions * mongodbversion display on about page, add enviromentInfo * systemInfo tests, authApiAppender moved into /api endpoint * PR fixes * mongodbversion typo * typo * config.js versions * [service] add semantic version components to system info and test stub * WIP - tests,app.systemInfo,webController * version assertion change, string to obj * tests for app.impl.systemInfo, and adapters.systemInfo webcontroller * WIP - skip test append * DI refactor of CreateReadSystemInfo,test passing * remove .skip * two URL obj icon db test * system info tests, revert back icon test urls --------- Co-authored-by: Robert St. John <[email protected]> * [service] work around node issue nodejs/node#48886 that causes tests to fail using deep equals assertion on url objects (#176) * [service] fresh npm install and shrinkwrap * [service] remove dependency mongoose-beautiful-unique-validation because the name is too long (also it was causing a recursive stack overflow with mongoose 6.12) * [plugins/image] resolve typescript build errors due to type version mismatches with service * [plugins/nga-msi] package-lock update * [ci] trigger service build when plugins change * WIP - auth on systeminfo * system info entities updated * removed redundant entities code * remove unused imports * SystemInfoPermission included in allPermissions, formatting change * rolebased sysinfo now sysinfo permission service * only exclude the environment info if no permission * read system info in create-admin-role migration * update Pending on Develop in changlog * migration 030-add-read-system-info-permissions * fixed 003-create-admin migration * removed extra comma migration 003 migration file * test fix * [service] update better-sqlite3 dependency for node 20 compatibility (#179) * [service] updated/resolved shrinkwrap dependency versions * [plugins/nga-msi] sync package-lock to service; package-lock v3 * [plugins/image] update service package-lock to v3 and sync to mage.service * [plugins/arcgis] update service package-lock to v3 and sync to mage.service * [web-app] fix view child annotation on map search component * [service] add missing settings model typedefs * Conditional access to System Info (#192) * handleSearchFunction * WIP - auth /api * WIP * WIP - proxy config * remove artifact from stash pop * WIP - customAuth app.ts * Revert "WIP - customAuth app.ts" This reverts commit 3c850f3fbc5b68cc9738f962c0172a6e502da818. * working auth * Conditionally display system version info in About component * Include version data in SystemInfo API response regardless of user authentication * Refactor SystemInfo response to handle ExoSystemInfo types" * add auth strategy * fix mongodb typo, config param removal for CreateReadSystemInfo test. * api version with dependency injection * Add mockApiVersion to system info tests * remove comment * [service] fix types and tests after merge from master * [plugins/image] fix types after merge from master * [plugins/image] attempt to fix sharp install problem related to npm/cli#4828 * Bugfix: /api initial flag regression (#201) * bugfix: replace missing initial parameter on /api endpoint to support initial user setup This temporarily fixes a regression on the develop branch from the TS migration that blocked first-run initial admin setup. Robert is planning to replace how this will work with a secret-based approach rather than racing to create an admin user on the first run when zero users exist. * fix: update test schema to reflect the initial property being added back. * [web-app] package-lock * Angular 14 web plugins (#208) * [web-app] remove deprecated/eol protractor elements * [web-app] initial components for angular cli integration for building mage plugins * [web-app] restructure moving cli integration under core-lib * Revert "[web-app] restructure moving cli integration under core-lib" This reverts commit ccc2d78. * [web-app] package-lock update * [web-app] add prototype builder to devkit * [web-app] manage devkit dependencies from root workspace file * [web-app] fix example project references in devkit builder * [web-app] devkit back under core-lib to make dependency management easier * [web-app] move devkit code up to core-lib top level * [web-app] add devkit dependencies to core-lib * [web-app] add notes on dependencies to core-lib readme * [web-app] move core-lib builder and schematics under single parent to make typescript build easier * [web-app] move angular cli descriptors to common root * [web-app] fix angular-cli tsconfig * [web-app] add build scripts for core-lib angular cli * [web-app] change pack scripts to run from root directory * [web-app] fix angular-cli entries in core-lib package.json * [web-app] mod core-lib build script to copy resources * [web-app] fix paths and typos in core-lib angular cli descriptors and generated code * [web-app] remove references to deprecated angular apis for loading plugin modules * [web-app] add module import for plugin hooks to core-lib schematic * [web-app] package-lock * [web-app] plugin-library schematic adds a peer dependency on the host mage web app, and clears other dependencies, so the dist package dependencies are correct * [web-app] plugin builder sets main package entry to amd bundle * readme updates for web plugins * [web-app] fix plugin service test compile error * add explicit docs on installing plugin packages * [web-app] add readme on web plugin angular cli tools * [plugins/nga-msi] npm i for new package-lock and hopefully fix ci build error * [plugins/nga-msi] try again to fix fsevents dependency * [service] upgrade mocha to version 8 * [plugins/nga-msi] sync tsconfig lib and target entries to es2016 * [plugins/nga-msi] install missing types deps * [ci] use linked local mage.service to build service plugins * [ci] wip: test linking service to plugin build * [plugins/nga-msi] wip: test linking service to plugin build * [ci] remove debug commands so build does not fail * [service] upgrade mocha to 10 * arcgis plugin angular 14 (#209) * [plugins/arcgis] web angular 14: allow dep for core-lib version 6.3 beta * [plugins/arcgis] web angular 14: begin update to angular 10 - `npx @angular/cli@10 update @angular/core@10 @angular/cli@10 --force` * [plugins/arcgis] web angular 14: update to material 10 - `npx @angular/cli@10 update @angular/material@10 --force` * [plugins/arcgis] web angular 14: per angular upgrade guide, `number` input elements should now listen to `input` events instead of `change` * [plugins/arcgis] web angular 14: update to angular 11 - `ng update @angular/core@11 @angular/cli@11 --force` * [plugins/arcgis] web angular 14: update to angular 11 - force install to update package-lock - `npm 1 --force` * [plugins/arcgis] web angular 14: update to angular material 11 - ng update @angular/material@11 --force * [plugins/arcgis] web angular 14: force install to update package-lock with angular material 11 and core-lib 6.3 - npm i --force * [plugins/arcgis] web angular 14: update to angular 12 - `ng update @angular/core@12 @angular/cli@12 --force` * [plugins/arcgis] web angular 14: update to angular material 12 - `ng update @angular/material@12 --force` * [plugins/arcgis] web angular 14: update to angular 13 - `ng update @angular/core@13 @angular/cli@13` * [plugins/arcgis] web angular 14: update to angular material 13 - `ng update @angular/material@13 --force` * [plugins/arcgis] web angular 14: update to angular 14 - `ng update @angular/core@14 @angular/cli@14 --force` * [plugins/arcgis] web angular 14: update to angular material 14 - `ng update @angular/material@14 --force` * [plugins/arcgis] web angular 14: remove unused ng-select dependency * [plugins/arcgis] web angular 14: remove unused codelyzer dependency and upgrade jasmine * [plugins/arcgis] web angular 14: set builder to mage amd builder * [web-app] remove @types/geojson from dependencies block - already in devDependencies * [web-app] share ng-select package to web plugins * [web-app] fix type error in core-lib paging * [web-app] move some libraries necessary for core-lib angular cli from peerDependencies to dependencies to ensure npm always installs them * bump core versions to 6.3.0-beta.4 * [web-app] add ng-select to plugin service shared libraries test * [plugins/arcgis] move core-lib dependency to dependencies block and bump explicit rxjs dep version temporarily until upgrade to angular 16 * [web-app] package-lock with @types/geojson in dependencies block * [plugins/arcgis] update lib names in web-app tsconfig * Plugin actions (#210) * [ci] remove obsolete workflows * [ci] remove unused pre-latest node versions list; enforce ordering on the list; create an explicit LTS version to use for packaging * [ci] wip: separate plugin builds * [service] upgrade better-sqlite3 dep to build with node 22 * [ci] fix triggering repo paths in workflows * [ci] fix typos in workflow files * [ci] add arcgis service plugin workflow * [plugins/image] exclude spec dir with large test images from package * bump core beta version to 6.3.0-beta.5 * [ci] remove plugin publishing from core release workflow * [ci] fix artifact name typos [skip ci] * [plugins/arcgis] update mage.service dep in package-lock * [service] brand new shrinkwrap to attempt to correct os-specific fsevents dep erroneous installation in plugin projects; upgrade typescript to 4.9 to accommodate @types/lodash upgrade * bump core packages versions to 6.3.0-beta.6 * [plugins/arcgis] move @types/geojson dep to dev dependencies * [plugins/arcgis] manually add optional and dev flags to fsevents dep in package-lock to work around npm issue npm/cli#7622 * [service] minor shrinkwrap update on qs dep * [plugins/arcgis] add a test file to get the ball rolling and make ci pass running the test command * [plugins/arcgis] wip: plugin naming: rename service package * [plugins/arcgis] wip: plugin naming: move web artifacts to consistent project structure * [plugins/arcgis] wip: plugin naming: fix references to old project structure names * [plugins/arcgis] remove unused index file in web-app * [plugins/arcgis] add test config to web-app * [plugins/arcgis] add actions ci workflow for web-app * [plugins/arcgis] add a dummy test in web-app to pass build * [plugins/image] constrain mage core dep to 6.3.0-beta+ * [plugins/image] manually add dev and optional flags to fsevents in service package-lock so build does not fail on non-darwin platforms * [ci] add image service plugin release workflow * [plugins/image] update typescript and mongoose deps to match core mage * [ci] rename image plugin release workflow * [ci] rename arcgis web-app artifacts for consistency * [ci] remove obsolete env var * [ci] add arcgis plugin release workflow * [ci] add nga-msi plugin release workflow * [instance] fix references to renamed arcgis packages * [ci] use node lts version for main release workflow * [ci] fix missing lts node version output from config workflow * add mongodb and nodejs desired version (#211) * add mongodb and nodejs desired version * update nodejs min version to 18.x * initialize event search with empty string (#212) * docs: add readme sections for gotchas running plugins locally [skip ci] * Correct arcgis.web-app dependency path and README typos (#213) * Correct arcgis.web-app dependency path and README typos * Fix argis plugin configuration * Fix path mage.arcgis > mage.arcgis.service & mage.arc-web > mage.arcgis.web-app --------- Co-authored-by: Rick Saccoccia <[email protected]> * Web split (#214) * Update webapp path * Update webapp path creation * Redesign authentication error UI/UX * Swagger module * Fix null check on api * Fix null check settings * Refactor authentication dialog error UI/UX * Update README.md Update web application dist location * Plugin hooks for public and protected web routes (#215) * arcgis username and password authentication (#216) * arcgis username and password authentication * onAddLayerUrl includes layerToken --------- Co-authored-by: Rick Saccoccia <[email protected]> * Add OAuth to ArcGIS service plugin (#218) * Add support for user OAuth (#219) * 1226 create showcase app (#217) * Authentication types abstraction (#220) Co-authored-by: Rick Saccoccia <[email protected]> * Initial web auth (#221) * Parse feature service after validation * use fromToken() for oauth * Fix observation delete * Clean up prefences UI/UX * Add ArcGISIdentityManagerFactory (#222) * Add ArcGISIdentityManagerFactory * remove log with sensitive info --------- Co-authored-by: Rick Saccoccia <[email protected]> * moved auth settings to its own security tab (#224) * updated showcase to reflect recent changes (#226) Co-authored-by: Katherine Brown <[email protected]> * Arc admin attribute form (#227) * updated arc admin attributes html and added a reactive form for the data * binding fixes * updated tests * moved form def to constructor, populated form with config, on cancel form re-populates with config * replaced the frozen default config with a hardcoded mock in showcase --------- Co-authored-by: Katherine Brown <[email protected]> Co-authored-by: Katherine Brown <[email protected]> * [web] clean up ingress UI/UX * [web] clean up disclaimer UI/UX * Update OAuth flow for ArcGIS Plugin (#225) * initial commit * updates from pr comments * fix missing statements * move sanitize to web routes * Arc event material updates (#229) * updated the event layout * added layers to mock, display layers in events on one line seperated by commas * added open in new and edit icons, adjusted scss --------- Co-authored-by: Katherine Brown <[email protected]> * adds material UI facelift to the processing section of the arcGIS plugin admin component * Convert httpClient calls to @esri/arcgis-rest-request (#228) * Convert httpClient calls to @esri/arcgis-rest-request with ArcGISIdentityManager for authentication * Fix addFields and deleteFields * Fixed outFields and returnGeometry for query generation * [service] prepend form name to all event form fields for clarity and to avoid ESRI column name conflicts * [service] Fix check to determine if an observation sync to ESRI is a create or update * [service] OAuth refresh token flow in work * [service] Add IdentityManager to ObservationSender construction * [service] Remove httpClient * [service] fix FeatureQuerier response from request * [service] Refactor ArcGISIdentityManager management * draft changes * [service] ArcGIS field names are lowercase, account for this when adding/removing fields * Undo revert of FeatureQuerier * [service] Remove HttpClient.ts, no longer used * [service] updateConfig inner async methods await before we query * [server] Attribute sync fix upon adding feature server * [web/service] API update to include feature service authentication status * [service] fix regression in token, username/password validation req parameter parsing * [service] Clean up TODO comments * [service] form field mapping need to account for form name and field name to avoid conflicts * Reduce response logging that may cause confusion * [service] include event forms in detecting config changes * Merge develop --------- Co-authored-by: Rick Saccoccia <[email protected]> Co-authored-by: William Newman <[email protected]> Co-authored-by: Ryan Slatten <[email protected]> * added more explicit plugin directions (#232) * added more explicit plugin directions * moved changes to new arcgis README file --------- Co-authored-by: Katherine Brown <[email protected]> * update the instance dependency install instructions * fix config change issue * Fix cancel button * fix onSubmit save * fix for mongodb 5.0.1 compatibility * update read me to reflect mongo db support * update read me * initial commit * wip * this works * this works still * add arc and image plugin * revert server docker file and package.json changes * update readme * rearrange readme stuff * remove comments and add to docker ignore * update dockerignore * initial commit * run on feature * fix spelling * confirm vars * end my if statement * confirm vars * fix step name * confirm tag * test docker push * check docker build * check context * remove echo * add line to run * modify dockerignore * fix docker build * try deployment * rename files * update gitignore * initial fixes * pr comment fix * update github action version * fix more action stuff * Revert "fix more action stuff" This reverts commit 5b13a32. * Revert "update github action version" This reverts commit 409afda. * Update Github Actions (#246) Fix issues to the Github Actions tests so that they can be used for pr testing. * Fix observation sync issues (#236) * Convert httpClient calls to @esri/arcgis-rest-request with ArcGISIdentityManager for authentication * Fix addFields and deleteFields * Fixed outFields and returnGeometry for query generation * [service] prepend form name to all event form fields for clarity and to avoid ESRI column name conflicts * [service] Fix check to determine if an observation sync to ESRI is a create or update * [service] OAuth refresh token flow in work * [service] Add IdentityManager to ObservationSender construction * [service] Remove httpClient * [service] fix FeatureQuerier response from request * [service] Refactor ArcGISIdentityManager management * draft changes * [service] ArcGIS field names are lowercase, account for this when adding/removing fields * Undo revert of FeatureQuerier * [service] Remove HttpClient.ts, no longer used * [service] updateConfig inner async methods await before we query * [server] Attribute sync fix upon adding feature server * [web/service] API update to include feature service authentication status * [service] fix regression in token, username/password validation req parameter parsing * [service] Clean up TODO comments * [service] form field mapping need to account for form name and field name to avoid conflicts * Reduce response logging that may cause confusion * [service] include event forms in detecting config changes * Merge develop * [service] sync configured events instead of checking changes of all events. Store event ids instead of names * [server] Fix query syntax error * fix failing errors for observations * [service] fix event deletion and firstRun logic * fix issues with updates * fix deletion issue * fix required field issue * update arcgis read me --------- Co-authored-by: Rick Saccoccia <[email protected]> Co-authored-by: William Newman <[email protected]> Co-authored-by: Clinton Werth <[email protected]> * fix image service container build * wip * update image build * fix beta version * initial sftp workflows into main branch * Fix Save functionality for the Security settings on Admin page * Update package dependencies for mage server (#250) * store * update package jsons * update lock file * update msi * update service json * test update * test revert * reset * fix arcgis error * test * test * test revert * test * refresh shrinkwrap * update package files * update minor versions * update os support * fix errors with sqlite hope * revert --force change * remove sqlite3 * revert mage change * revert package * change * fix arcgis error * update package files to remove unneeded packages * update mage beta version * update package version to test * update core-lib * test * test again * revert test * remove whoami * update to beta 7 * test * test * revert change * Create Contact Us Section on Info Page (#253) * Create Contact Us Area on Information Page containing Email and Phone Number * Fix Budgeting Issue * Raise Budgets * more budgeting * SFTP plugin (#230) * SFTP plugin * update android and update plugin * add read me and update package.json files * initial actions for build test and release. dockerfile fix * fix build * remove mongoose * update package json for mage service * force npm ci * remove test to check build * remove test dependency * force npm ci * fix test * readd action tests * add test a dependency for package * basic jasmine config update * add generic test.ts file for web tests * disable web tests * update sftp plugin output to match other plugins --------- Co-authored-by: Clinton Werth <[email protected]> Co-authored-by: Ryan <[email protected]> * separate out package deployments to allow failures * 1396 - OAuth Spike (#252) * updated README for ArcGIS OAuth * using other readme instead * Fix sftp docker build (#255) * fix express dependency and docker build * remove extra lines from dockerfile * update package lock --------- Co-authored-by: Clinton Werth <[email protected]> * 1390 - SFTP Plugin Password Encryption (#258) * first attempt * working encryption * finished * removed unnecesary import * testing updating magerc * hard-coding version * salt not found fix * salt not found fix 2 * forgot about types version * Arcgis Features randomly not transferring properly (#257) * store * initial commit * fix event updates * update promises * init fix * Small changes * add comment * Add linting to Arcgis plugin - Service (#240) * Convert httpClient calls to @esri/arcgis-rest-request with ArcGISIdentityManager for authentication * Fix addFields and deleteFields * Fixed outFields and returnGeometry for query generation * [service] prepend form name to all event form fields for clarity and to avoid ESRI column name conflicts * [service] Fix check to determine if an observation sync to ESRI is a create or update * [service] OAuth refresh token flow in work * [service] Add IdentityManager to ObservationSender construction * [service] Remove httpClient * [service] fix FeatureQuerier response from request * [service] Refactor ArcGISIdentityManager management * draft changes * [service] ArcGIS field names are lowercase, account for this when adding/removing fields * Undo revert of FeatureQuerier * [service] Remove HttpClient.ts, no longer used * [service] updateConfig inner async methods await before we query * [server] Attribute sync fix upon adding feature server * [web/service] API update to include feature service authentication status * [service] fix regression in token, username/password validation req parameter parsing * [service] Clean up TODO comments * [service] form field mapping need to account for form name and field name to avoid conflicts * Reduce response logging that may cause confusion * [service] include event forms in detecting config changes * Merge develop * [service] sync configured events instead of checking changes of all events. Store event ids instead of names * [server] Fix query syntax error * fix failing errors for observations * [service] fix event deletion and firstRun logic * fix issues with updates * fix deletion issue * init * add lint to services * fix required field issue * update arcgis read me --------- Co-authored-by: Rick Saccoccia <[email protected]> Co-authored-by: William Newman <[email protected]> Co-authored-by: Clinton Werth <[email protected]> * ArcGIS duplicate features sent to the feature service (#259) * Fixes issue where deleted/archived observations were consistently 'deleted' from the feature layer. Other code clean up. * Updated github actions to build docker container on feature branches. Will still only deploy to dev/test on develop/test branch. --------- Co-authored-by: Clinton Werth <[email protected]> * Ensure enabled/disabled works after arc plugin is initialized (#260) * store * initial commit * fix event updates * update promises * init fix * Small changes * add comment * store * initial commit * update docker and aws build * fix processor error * fix config issue --------- Co-authored-by: Clinton Werth <[email protected]> * fix feature layer delete and error message after put (#256) Co-authored-by: Clinton Werth <[email protected]> * Release of 6.3.0-beta.8 for Server, Web and Core(#261) Co-authored-by: Clinton Werth <[email protected]> * Arc sftp beta release (#262) * Set beta release for SFTP and Arc plugins * fix arc web build --------- Co-authored-by: Clinton Werth <[email protected]> * fix sftp release yaml (#263) Co-authored-by: Clinton Werth <[email protected]> * Fix sftp release work flow (#264) * fix sftp release yaml * update package json files for proper package versions --------- Co-authored-by: Clinton Werth <[email protected]> * update docker files (#266) Co-authored-by: Clinton Werth <[email protected]> * working changes * removed all instances of previous project name * test * test again * init * switch to --production * add force * test * test * fix pack * fix pack command * space * fixed issue * update env variables for docker push command (#277) Co-authored-by: Clinton Werth <[email protected]> * Admin button should appear only for Admins (#275) * initial commit * fix role name * use better method of getting admin and route non admins * Upgrade container images (#272) * update docker files * upgrade docker compose to use bitnami containers --------- Co-authored-by: Clinton Werth <[email protected]> * Logging out of Admin page brings up modal. * initial commit * don't run sftp if not connected * Only Admin users should view plugins (#276) * initial commit * update permissions --------- Co-authored-by: Clinton Werth <[email protected]> * remove password and add back username * Improve the Mage Build and Run Process (#280) * Updated the npm scripts to install, build, and start the server. Updated the Readme instruct ions around building. Removed the msi and random plugins from the instance/config.js to remove errors on launch since we are not building with the npm run build commands. * Removes the image, nga-msi, and random dependencies from instance/package.json * Added .vscode/launch.json to share debug configurations * fix test * Update console errors if Avatar is missing * Add ability to select events for ArcGis * Update SFTP filename (#267) Updates the filename for Observations sent to SFTP server. Also refactors the database connections. --------- Co-authored-by: danielbenner <[email protected]> * fix test * initial commit * Release for 6.3.0 (#284) * update release number * update release number * update Changelog and mage release versions * revert plugin versions * revert dockerfile * revert mage server * package.lock * package lock sftp * update package lock file (#286) --------- Co-authored-by: Kevin Gilland <[email protected]> Co-authored-by: Robert St. John <[email protected]> Co-authored-by: kimura-developer <[email protected]> Co-authored-by: Jim Cheng <[email protected]> Co-authored-by: Mike Finnessy <[email protected]> Co-authored-by: Skosche3 <[email protected]> Co-authored-by: Rick Saccoccia <[email protected]> Co-authored-by: Billy Newman <[email protected]> Co-authored-by: William Newman <[email protected]> Co-authored-by: Jordanafoster6 <[email protected]> Co-authored-by: kbrownomni <[email protected]> Co-authored-by: Katherine Brown <[email protected]> Co-authored-by: Katherine Brown <[email protected]> Co-authored-by: Jordan Foster <[email protected]> Co-authored-by: cwerthomni <[email protected]> Co-authored-by: Clinton Werth <[email protected]> Co-authored-by: Ryan Carpenter <[email protected]> Co-authored-by: Dan Benner <[email protected]> Co-authored-by: James McDougall <[email protected]> Co-authored-by: jblunk <[email protected]> Co-authored-by: Paul Solt <[email protected]>
1 parent 62f11cd commit c7195f2

File tree

62 files changed

+15102
-817
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+15102
-817
lines changed

.github/workflows/aws_dev.deploy.yaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: AWS Dev Deployment
33
on:
44
push:
55
branches:
6-
- '**'
6+
- "**"
77
workflow_dispatch:
88

99
permissions:
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
- name: Checkout Repo
1818
uses: actions/checkout@v4
19-
19+
2020
- name: Set IMAGE_TAG
2121
run: |
2222
if [[ "${{ github.ref_name }}" == "test" ]]; then
@@ -31,7 +31,7 @@ jobs:
3131
role-to-assume: ${{ secrets.AWS_DEV_ROLE }}
3232
role-session-name: GithubNGAGeointSession
3333
aws-region: ${{ secrets.AWS_DEV_REGION }}
34-
34+
3535
- name: AWS ECR Login
3636
id: ecr-login
3737
uses: aws-actions/amazon-ecr-login@v2
@@ -48,6 +48,9 @@ jobs:
4848
if: github.ref =='refs/heads/test' || github.ref =='refs/heads/develop'
4949
env:
5050
SERVICE: "mage${{ env.IMAGE_TAG }}"
51+
REGISTRY: ${{ steps.ecr-login.outputs.registry }}
52+
REPOSITORY: "/mage/server"
53+
IMAGE_TAG: ${{ env.IMAGE_TAG }}
5154
run: |
5255
docker push $REGISTRY$REPOSITORY:$IMAGE_TAG
53-
aws ecs update-service --cluster magedev --service $SERVICE --force-new-deployment
56+
aws ecs update-service --cluster magedev --service $SERVICE --force-new-deployment

.github/workflows/build_test.arcgis.service.yaml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@ jobs:
3030
cache: npm
3131
cache-dependency-path: |
3232
plugins/arcgis/service/package-lock.json
33-
- name: build mage service
34-
run: |
35-
cd service
36-
npm ci
37-
npm run build
3833
- name: test with node ${{ matrix.node }}
3934
run: |
4035
cd plugins/arcgis/service
@@ -55,16 +50,12 @@ jobs:
5550
cache: npm
5651
cache-dependency-path: |
5752
plugins/arcgis/service/package-lock.json
58-
- name: build mage service
59-
run: |
60-
cd service
61-
npm ci
62-
npm run build
6353
- name: build service for plugin
6454
run: |
6555
cd plugins/arcgis/service
6656
npm ci --force
6757
npm run build
58+
npm ci --production --force
6859
- name: package for plugin
6960
run: npm pack ./plugins/arcgis/service
7061
- name: upload package

.github/workflows/build_test.service.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,12 @@ jobs:
2828
node-version: ${{ needs.config.outputs.node_versions-lts }}
2929
cache: npm
3030
cache-dependency-path: service/npm-shrinkwrap.json
31-
- name: build
31+
- name: build and test
3232
run: |
3333
cd service
3434
npm ci
35-
- name: run tests
36-
run: |
37-
cd service
3835
npm test
36+
npm ci --production
3937
- name: package
4038
run: npm pack ./service
4139
- name: upload package

.github/workflows/build_test.sftp.service.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,19 @@ name: test and package sftp service plugin
33
on:
44
workflow_dispatch:
55
workflow_call:
6-
push:
6+
pull_request:
77
paths:
88
- .github/workflows/build_test.sftp.service.yaml
99
- .github/workflows/config.yaml
1010
- plugins/sftp/service/**
1111

1212
jobs:
13-
1413
config:
1514
uses: ./.github/workflows/config.yaml
1615

1716
test:
1817
name: test plugin sftp.service
19-
needs: [ config ]
18+
needs: [config]
2019
runs-on: ubuntu-latest
2120
strategy:
2221
matrix:
@@ -35,12 +34,11 @@ jobs:
3534
run: |
3635
cd plugins/sftp/service
3736
npm ci --force
38-
rm -rf node_modules/@ngageoint/mage.service/node_modules/mongoose
3937
npm test
4038
4139
package:
4240
name: package plugin sftp.service
43-
needs: [ config, test ]
41+
needs: [config, test]
4442
runs-on: ubuntu-latest
4543
steps:
4644
- name: checkout
@@ -56,8 +54,8 @@ jobs:
5654
run: |
5755
cd plugins/sftp/service
5856
npm ci --force
59-
rm -rf node_modules/@ngageoint/mage.service/node_modules/mongoose
6057
npm run build
58+
npm ci --production --force
6159
- name: pack
6260
run: npm pack ./plugins/sftp/service
6361
- name: upload package

.github/workflows/config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ env:
2222
MAGE_NODE_VERSIONS: 20 18 22
2323

2424
jobs:
25-
2625
main:
2726
runs-on: ubuntu-latest
2827
outputs:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ node_modules
88
.test_run
99
.vscode/
1010
coverage/
11+
database/
1112
docker/database/
1213
docker/server/resources/
1314
server/resources

.vscode/launch.json

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
{
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
"name": "Launch WebApp",
6+
"type": "chrome",
7+
"request": "launch",
8+
"url": "http://localhost:4200",
9+
"webRoot": "${workspaceFolder}/web-app/src",
10+
"sourceMaps": true
11+
},
12+
{
13+
"name": "Launch AdminApp",
14+
"type": "chrome",
15+
"request": "launch",
16+
"url": "http://localhost:4201",
17+
"webRoot": "${workspaceFolder}/web-app/admin/src",
18+
"sourceMaps": true
19+
},
20+
{
21+
"type": "node",
22+
"request": "attach",
23+
"name": "Attach to MAGE Service",
24+
"port": 9229, // For Node.js inspect
25+
"restart": true,
26+
"skipFiles": [
27+
"<node_internals>/**"
28+
],
29+
"cwd": "${workspaceFolder}/service"
30+
},
31+
{
32+
"name": "mage server instance",
33+
"type": "node",
34+
"request": "launch",
35+
"runtimeExecutable": "npm",
36+
"runtimeArgs": [
37+
"run",
38+
"start:dev"
39+
],
40+
"trace": true,
41+
"env": {
42+
"NODE_PATH": "${workspaceFolder}/instance/node_modules",
43+
"MAGE_MONGO_URL": "mongodb://127.0.0.1/magedb"
44+
},
45+
"cwd": "${workspaceFolder}/instance",
46+
"console": "integratedTerminal",
47+
"preLaunchTask": "service:build",
48+
"sourceMaps": true,
49+
"outFiles": [
50+
"${workspaceFolder}/service/lib/**/*.js",
51+
"${workspaceFolder}/plugins/sftp/service/lib/**/*.js",
52+
"${workspaceFolder}/plugins/arcgis/service/lib/**/*.js"
53+
]
54+
}
55+
],
56+
"compounds": [
57+
{
58+
"name": "Debug Backend + WebApp",
59+
"configurations": [
60+
"Attach to MAGE Service",
61+
"Launch WebApp"
62+
],
63+
"stopAll": true
64+
},
65+
{
66+
"name": "Debug Backend + AdminApp",
67+
"configurations": [
68+
"Attach to MAGE Service",
69+
"Launch AdminApp"
70+
],
71+
"stopAll": true
72+
}
73+
]
74+
}

CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,24 @@ MAGE adheres to [Semantic Versioning](http://semver.org/).
2323
- Protect against disabling all authentications.
2424
- Problem with OAuth web login
2525

26+
## [6.3.0](https://github.com/ngageoint/mage-server/releases/tag/6.3.0)
27+
### Service
28+
#### Features
29+
* ArcGIS Plugin support
30+
* SFTP Plugin Support
31+
* Support for MongoDB 6.0
32+
* Dependency updates
33+
### Web App
34+
#### Features
35+
* ArcGIS Plugin support
36+
* SFTP Plugin Support
37+
* Moved authentication settings to own admin tab
38+
* Redirect host added for saml config
39+
* Fix for issue with arabic characters in filenames
40+
* Fix for observation filter options
41+
* Dependency updates
42+
* Map UI updates
43+
2644
## [6.2.13](https://github.com/ngageoint/mage-server/releases/tag/6.2.13)
2745
### Service
2846
#### Features

0 commit comments

Comments
 (0)