Skip to content

Commit

Permalink
pulled in changes from develop so branch can be merged without conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Jordanafoster6 committed Sep 29, 2024
2 parents 68c09d2 + d4901e8 commit 001c5ff
Show file tree
Hide file tree
Showing 905 changed files with 317,457 additions and 6,527 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_test.web-app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: pack
run: |
npm pack ./web-app/dist/core-lib
npm pack ./web-app/dist/app
npm pack ./web-app/dist
- name: upload packages
uses: actions/upload-artifact@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ npm run build
After building the core packages, install them as dependencies in the `instance` package.
```bash
cd instance
npm i --omit dev ../service ../web-app/dist/app ../plugins/nga-msi
npm i --omit dev ../service ../web-app/dist ../plugins/nga-msi
```
The project's root [`package.json`](./package.json) provides some convenience script entries to install, build, and run
the MAGE server components, however, those are deprecated and will likely go away after migrating to NPM 7+'s
Expand Down
2 changes: 1 addition & 1 deletion instance/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
"@ngageoint/mage.nga-msi": "../plugins/nga-msi",
"@ngageoint/mage.random": "../plugins/random",
"@ngageoint/mage.service": "../service",
"@ngageoint/mage.web-app": "../web-app/dist/app"
"@ngageoint/mage.web-app": "../web-app/dist"
}
}
191 changes: 189 additions & 2 deletions plugins/arcgis/service/package-lock.json

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

2 changes: 2 additions & 0 deletions plugins/arcgis/service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
},
"homepage": "https://github.com/ngageoint/mage-server#readme",
"dependencies": {
"@esri/arcgis-rest-feature-service": "^4.0.6",
"@esri/arcgis-rest-request": "^4.2.3",
"@terraformer/arcgis": "2.1.2",
"form-data": "^4.0.0"
},
Expand Down
21 changes: 21 additions & 0 deletions plugins/arcgis/service/src/ArcGISConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ export interface FeatureServiceConfig {
*/
token?: string

/**
* Username and password for ArcGIS authentication
*/
auth?: ArcGISAuthConfig

/**
* Create layers that don't exist
*/
Expand Down Expand Up @@ -72,6 +77,22 @@ export interface FeatureLayerConfig {

}

/**
* Contains username and password for ArcGIS server authentication.
*/
export interface ArcGISAuthConfig {

/**
* The username for authentication.
*/
username: string

/**
* The password for authentication.
*/
password: string
}

/**
* Attribute configurations
*/
Expand Down
Loading

0 comments on commit 001c5ff

Please sign in to comment.