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

Merge Dev into Feature Branch #441

Merged
merged 48 commits into from
Oct 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
637f97a
Merge pull request #49 from NASA-AMMOS/MMGIS-2.3.1
fcalef Apr 22, 2021
d0ef1d5
Merge pull request #94 from NASA-AMMOS/MMGIS-2.4.0
fcalef Aug 7, 2021
375a6aa
Merge pull request #125 from NASA-AMMOS/MMGIS-2.5.0
fcalef Jan 19, 2022
58fc382
MMGIS 2.6.0 (#160)
tariqksoliman Mar 16, 2022
d92cb85
Description should be updated to match example code (#189)
davetsay May 26, 2022
20c0cdd
Merge
tariqksoliman Nov 15, 2022
2396a9a
ci: build docker image and push to GitHub Container Registry (#316)
jamesmontalvo3 Jan 26, 2023
3d33ea0
Update docker-build workflow to trigger on deve branch and releases
tariqksoliman Feb 2, 2023
dc4d7ff
#336 Add GitHub Templates (#338)
tariqksoliman Feb 22, 2023
fec9c89
#399 Crashes if Layers are valid JSON but not valid GeoJSON (#400)
tariqksoliman Jul 24, 2023
2ea99c3
#401 Extend CSSO timeout check to main client (#402)
tariqksoliman Jul 24, 2023
3fcdd7e
#403 rightClickMenuActions - Polygons and WKT (#404)
tariqksoliman Jul 25, 2023
dc149c3
#405 DrawTool - Template - Incrementer - Move to backend (#406)
tariqksoliman Jul 31, 2023
3d007b1
Mini fix to allow [] as empty geojson layer data
tariqksoliman Jul 31, 2023
8910424
Fix DrawTool Incrementer self collision bug
tariqksoliman Jul 31, 2023
9be2eba
Convert layer data [<FeatureCollection>] to geojson
tariqksoliman Aug 1, 2023
1984777
#407 Click intersects on Query and Draw layers (#408)
tariqksoliman Aug 4, 2023
0be76c0
Allow the legend tool to be right justified on the screen
jtroberts Aug 7, 2023
ba30c8d
#409 Added example config in description for LegendTool
jtroberts Aug 8, 2023
6b881cb
Merge pull request #409 from NASA-AMMOS/jr-legend-justify
jtroberts Aug 8, 2023
526c454
#410 Draw Tool - Time Integration (#411)
tariqksoliman Aug 14, 2023
2e91145
#412 Add Configuration Option to set TimeUI Extent (#413)
tariqksoliman Aug 21, 2023
d8d6350
#414 IdentifierTool works again with human layer names (#415)
tariqksoliman Sep 5, 2023
2f421aa
#422 Removed event blocking popup functions (#423)
tariqksoliman Sep 5, 2023
5a0e51f
Bump to 2.9.0
tariqksoliman Sep 6, 2023
d7dfce4
2.9.0 merge
tariqksoliman Sep 6, 2023
50472e1
#425 Description Item fixes (#426)
tariqksoliman Sep 8, 2023
a2a7e59
Remove odd duplicate triggerWebhookds
tariqksoliman Sep 20, 2023
406c152
Fix draw upload webhook not populating geojson field
tariqksoliman Sep 20, 2023
340f6c0
Remove extra log
tariqksoliman Sep 20, 2023
0d2b839
Fix DrawTool deleting tag closing modal bug
tariqksoliman Sep 21, 2023
2402e04
DrawTool - Remove timetoggle when tool closes
tariqksoliman Sep 26, 2023
3bc3e94
DrawTool - Deselect file when turning off
tariqksoliman Sep 26, 2023
8de8b08
#427 Expandable Tools (#428)
tariqksoliman Sep 27, 2023
ba2d8bc
#427 Allow DrawTool names to expand too
tariqksoliman Sep 27, 2023
440ea15
#429 Hotkeys (#430)
tariqksoliman Oct 3, 2023
2de964c
shortcutSuffix and raw variables for tile layers
tariqksoliman Oct 3, 2023
b7d08e9
Update Dependencies (#431)
tariqksoliman Oct 3, 2023
d6b2bdc
docker build workflow - add no-cache param
tariqksoliman Oct 4, 2023
9467d04
Merge branch 'development' of https://github.com/NASA-AMMOS/MMGIS int…
tariqksoliman Oct 4, 2023
f5bc3f9
Update ModuleScopePlugin
tariqksoliman Oct 4, 2023
44ed04f
#432 Image Overlay Fixes (#433)
tariqksoliman Oct 4, 2023
d4a61ac
#435 DrawTool - Reorder Template fields (#436)
tariqksoliman Oct 5, 2023
b311701
#437 Add CONTRIBUTING.md (#438)
tariqksoliman Oct 6, 2023
73b84d8
Update README.md
tariqksoliman Oct 6, 2023
c52bdfc
#439 DrawTool - Add Advanced Search and Filter UI to Shapes Tab (#440)
tariqksoliman Oct 13, 2023
11e0653
Support booleans in LocalFilterer
tariqksoliman Oct 16, 2023
0ec2a2c
Merge branch 'ts-398-shade' into ts-temp-branch-delete-me
tariqksoliman Oct 23, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 59 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: Bug Report Form
description: Report a bug to help us improve
title: "[Bug]: "
labels: "bug"
body:
- type: markdown
attributes:
value: |
> _Thanks for filing a bug ticket. We appreciate your time and effort. Please answer a few questions._
- type: dropdown
id: checked-for-duplicates
attributes:
label: Checked for duplicates
description: Have you checked for duplicate issue tickets?
multiple: false
options:
- "Yes - I've already checked"
- "No - I haven't checked"
validations:
required: yes
- type: textarea
id: description
attributes:
label: Describe the bug
description: A clear and concise description of what the bug is. Plain-text snippets preferred but screenshots welcome.
placeholder: Tell us what you saw
value: "When I did [...] action, I noticed [...]"
validations:
required: true
- type: textarea
id: expected-behavior
attributes:
label: What did you expect?
description: A clear and concise description of what you expect to happen
placeholder: Tell us what you expected
value: "I expected [...]"
validations:
required: true
- type: textarea
id: reproduction
attributes:
label: Reproducible steps
description: "How would we reproduce this bug? Please walk us through it step by step. Plain-text snippets preferred but screenshots welcome."
value: |
1.
2.
3.
...
render: bash
- type: textarea
id: environment
attributes:
label: Environment
description: "What is your environment? Include any computer hardware, operating system, framework, browser, time-of-day or other contextual information related to your issue"
value: |
- Version of this software [e.g. vX.Y.Z]
- Operating System: [e.g. MacOSX with Docker Desktop vX.Y]
...
render: bash
48 changes: 48 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: New Feature Form
description: Suggest a new feature for us to implement
title: "[New Feature]: "
labels: "enhancement"
body:
- type: markdown
attributes:
value: |
> _Thanks for filing a new feature request. We appreciate your time and effort. Please answer a few questions._
- type: dropdown
id: checked-for-duplicates
attributes:
label: Checked for duplicates
description: Have you checked for duplicate issue tickets?
multiple: false
options:
- "Yes - I've already checked"
- "No - I haven't checked"
validations:
required: yes
- type: dropdown
id: checked-alternatives
attributes:
label: Alternatives considered
description: Have you considered alternative solutions to your feature request?
options:
- "Yes - and alternatives don't suffice"
- "No - I haven't considered"
validations:
required: yes
- type: textarea
id: related-problems
attributes:
label: Related problems
description: Is your feature request related to any problems? Please help us understand if so, including linking to any other issue tickets.
placeholder: Tell us the problems
value: "I'm frustrated when [...] happens as documented in issue-XYZ"
validations:
required: false
- type: textarea
id: description
attributes:
label: Describe the feature request
description: A clear and concise description of your request.
placeholder: Tell us what you want
value: "I need or want [...]"
validations:
required: true
13 changes: 13 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
## Purpose
- Clear, easy-to-understand sentences outlining the purpose of the PR
## Proposed Changes
- [ADD] ...
- [CHANGE] ...
- [FIX] ...
## Issues
- Links to relevant issues
- Example: issue-XYZ
## Testing
- Provide some proof you've tested your changes
- Example: test results available at ...
- Example: tested on operating system ...
2 changes: 1 addition & 1 deletion .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ jobs:
run: echo ${{ secrets.GITHUB_TOKEN }} | docker login -u ${{ github.actor }} --password-stdin ghcr.io

- name: Docker build
run: docker build ${{ steps.generate.outputs.REGISTRY_TAGS }} .
run: docker build --no-cache ${{ steps.generate.outputs.REGISTRY_TAGS }} .

- name: Docker push
run: docker push ${{ steps.generate.outputs.IMAGE_ID }} --all-tags
2 changes: 1 addition & 1 deletion API/Backend/Config/routes/configs.js
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ router.get("/missions", function (req, res, next) {
.query(
"SELECT DISTINCT ON (mission) mission, version, config FROM configs ORDER BY mission ASC"
)
.spread((results) => {
.then(([results]) => {
res.send({ status: "success", missions: results });
return null;
})
Expand Down
2 changes: 1 addition & 1 deletion API/Backend/Datasets/models/datasets.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ function makeNewDatasetTable(name, columns, success, failure) {
} else {
sequelize
.query("SELECT COUNT(*) FROM datasets")
.spread((results) => {
.then(([results]) => {
let newTable = "d" + (parseInt(results[0].count) + 1) + "_datasets";
Datasets.create({
name: name,
Expand Down
4 changes: 2 additions & 2 deletions API/Backend/Datasets/routes/datasets.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function get(req, res, next) {
},
}
)
.spread((r) => {
.then(([r]) => {
results.push({
...queries[i],
table: result.dataValues.table,
Expand Down Expand Up @@ -130,7 +130,7 @@ router.post("/search", function (req, res, next) {
},
}
)
.spread((results) => {
.then(([results]) => {
let r = [];
for (let i = 0; i < results.length; i++) {
let feature = JSON.parse(results[i].st_asgeojson);
Expand Down
2 changes: 1 addition & 1 deletion API/Backend/Draw/models/userfiles.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ const makeMasterFiles = (intents) => {
public: "1",
hidden: "0",
},
}).spread(function (userResult, created) {
}).then(function ([userResult, created]) {
// userResult is the user instance

if (created) {
Expand Down
Loading