TM v4.4.14 (Hotfix)

.circleci/config.yml

@@ -39,7 +39,6 @@ jobs:
         command: |
           cd ${CIRCLE_WORKING_DIRECTORY}
           mkdir ${CIRCLE_WORKING_DIRECTORY}/tests/backend/lint
-          # . ${CIRCLE_WORKING_DIRECTORY}/env/bin/activate
           black --check manage.py backend tests migrations
           flake8 manage.py backend tests migrations
     - run:
@@ -211,7 +210,8 @@ jobs:
           export TM_ENVIRONMENT=<< parameters.stack_name >>
           yarn
           CI=true GENERATE_SOURCEMAP=false yarn build
-          aws s3 sync build/ s3://tasking-manager-<< parameters.stack_name >>-react-app --delete
+          aws s3 sync build/ s3://tasking-manager-<< parameters.stack_name >>-react-app --delete --cache-control max-age=31536000
+          aws s3 cp s3://tasking-manager-<< parameters.stack_name >>-react-app s3://tasking-manager-<< parameters.stack_name >>-react-app --recursive --exclude "*" --include "*.html" --metadata-directive REPLACE --cache-control no-cache --content-type text/html
           export DISTRIBUTION_ID=`aws cloudformation list-exports --output=text --query "Exports[?Name=='tasking-manager-<< parameters.stack_name >>-cloudfront-id-${AWS_REGION}'].Value"`
           aws cloudfront create-invalidation --distribution-id $DISTRIBUTION_ID --paths "/*"
 workflows:
@@ -252,7 +252,7 @@ workflows:
         filters:
           branches:
             only:
-            - fix/sentry-environments
+            - fix/cfn-init-codedeploy
         requires:
           - build
         stack_name: "test"
@@ -263,7 +263,7 @@ workflows:
         filters:
           branches:
             only:
-            - fix/sentry-environments
+            - fix/cfn-init-codedeploy
         requires:
           - build
         context: tasking-manager-staging
@@ -334,4 +334,4 @@ workflows:
         context: tasking-manager-tm4-production
 notify:
   webhooks:
-    -url: https://api.opsgenie.com/v1/json/circleci?apiKey=$OPSGENIE_API
+    - url: https://api.opsgenie.com/v1/json/circleci?apiKey=$OPSGENIE_API

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[BUG]"
+labels: 'Type: Bug'
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/dependabot.yml

@@ -4,7 +4,7 @@ updates:
   directory: "/"
   schedule:
     interval: daily
-    time: "11:00"
+    time: "13:00"
   open-pull-requests-limit: 10
   ignore:
   - dependency-name: python-dotenv
@@ -30,7 +30,7 @@ updates:
   directory: "/frontend"
   schedule:
     interval: daily
-    time: "11:00"
+    time: "13:00"
   open-pull-requests-limit: 10
   ignore:
   - dependency-name: "@testing-library/user-event"
@@ -141,6 +141,16 @@ updates:
     - 2.4.21
     - 2.4.22
     - 2.4.23
+
+  - dependency-name: react-datepicker
+    versions:
+    - 3.7.0
+  - dependency-name: reactjs-popup
+    versions:
+    - 2.0.4
+  - dependency-name: ini
+    versions:
+    - 1.3.8
   - dependency-name: "@formatjs/intl-relativetimeformat"
     versions:
     - 8.0.4
@@ -260,3 +270,53 @@ updates:
   - dependency-name: react-placeholder
     versions:
     - 4.1.0
+- package-ecosystem: pip
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "13:00"
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: python-dotenv
+    versions:
+    - 0.15.0
+    - 0.16.0
+    - 0.17.0
+  - dependency-name: alembic
+    versions:
+    - 1.5.5
+    - 1.5.6
+    - 1.5.7
+  - dependency-name: sentry-sdk[flask]
+    versions:
+    - 0.20.3
+  - dependency-name: greenlet
+    versions:
+    - 1.0.0
+  - dependency-name: gevent
+    versions:
+    - 21.1.2
+  - dependency-name: oauthlib
+    versions:
+    - 3.1.0
+  - dependency-name: bleach
+    versions:
+    - 3.3.0
+  - dependency-name: flask-oauthlib
+    versions:
+    - 0.9.6
+  - dependency-name: flask-cors
+    versions:
+    - 3.0.10
+  - dependency-name: attrs
+    versions:
+    - 20.3.0
+  - dependency-name: werkzeug
+    versions:
+    - 1.0.1
+  - dependency-name: black
+    versions:
+    - 20.8b1
+  - dependency-name: geojson
+    versions:
+    - 2.5.0

README.md

@@ -3,22 +3,20 @@
 [![TM Backend on Quay](https://quay.io/repository/hotosm/tasking-manager/status "Tasking Manager Backend Build")](https://quay.io/repository/hotosm/tasking-manager)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=hotosm_tasking-manager&metric=alert_status)](https://sonarcloud.io/dashboard?id=hotosm_tasking-manager)
 
-The most popular tool for teams to coordinate mapping on OpenStreetMap.
-
 [<img src="screenshot.jpg" />](./screenshot.jpg)
 
-With this web application an area of interest can be defined and divided up into smaller tasks that can be completed rapidly. It shows which areas need to be mapped and which areas need a review for quality assurance. You can see the tool in action: log into the widely used [HOT Tasking Manager](https://tasks.hotosm.org/) and start mapping.
+The most popular tool for teams to coordinate mapping on OpenStreetMap. With this web application an area of interest can be defined and divided up into smaller tasks that can be completed rapidly. It shows which areas need to be mapped and which areas need a review for quality assurance. You can see the tool in action: log into the widely used [HOT Tasking Manager](https://tasks.hotosm.org/) and start mapping.
 
 [<img src="./docs/assets/project-view.gif" />](./docs/assets/project-view.gif)
 
 This is Free and Open Source Software. You are welcome to use the code and set up your own instance. The Tasking Manager has been initially designed and built by and for the [Humanitarian OpenStreetMap Team](https://www.hotosm.org/), and is nowadays used by many communities and organizations.
 
 ## Get involved!
 
-* Check our [Code of conduct](./docs/code_of_conduct.md)
-* Get familiar with our [contributor guidelines](./docs/contributing.md)
-* Join the [working groups](./docs/working-groups.md)
-* Help us to [translate the user interface](./docs/contributing-translation.md)
+* Start by reading our [Code of conduct](./docs/code_of_conduct.md)
+* Get familiar with our [contributor guidelines](./docs/contributing.md) explaining the different ways in which you can support this project! We need your help!
+* Join the Tasking Manager Collective Meet up- an opportunity to meet other Tasking Manager contributors- details coming shortly!
+
 
 ## Developers
 

backend/api/annotations/resources.py

@@ -39,7 +39,7 @@ def get(self, project_id: int, annotation_type: str = None):
             ProjectService.exists(project_id)
         except NotFound as e:
             current_app.logger.error(f"Error validating project: {str(e)}")
-            return {"Error": "Project not found"}, 404
+            return {"Error": "Project not found", "SubCode": "NotFound"}, 404
 
         try:
             if annotation_type:
@@ -52,7 +52,7 @@ def get(self, project_id: int, annotation_type: str = None):
                 )
             return annotations.to_primitive(), 200
         except NotFound:
-            return {"Error": "Annotations not found"}, 404
+            return {"Error": "Annotations not found", "SubCode": "NotFound"}, 404
 
     def post(self, project_id: int, annotation_type: str):
         """
@@ -128,10 +128,10 @@ def post(self, project_id: int, annotation_type: str):
                 )
             except NotFound:
                 current_app.logger.error("Invalid token")
-                return {"Error": "Invalid token"}, 500
+                return {"Error": "Invalid token", "SubCode": "NotFound"}, 500
         else:
             current_app.logger.error("No token supplied")
-            return {"Error": "No token supplied"}, 500
+            return {"Error": "No token supplied", "SubCode": "NotFound"}, 500
 
         try:
             annotations = request.get_json() or {}
@@ -142,7 +142,7 @@ def post(self, project_id: int, annotation_type: str):
             ProjectService.exists(project_id)
         except NotFound as e:
             current_app.logger.error(f"Error validating project: {str(e)}")
-            return {"Error": "Project not found"}, 404
+            return {"Error": "Project not found", "SubCode": "NotFound"}, 404
 
         task_ids = [t["taskId"] for t in annotations["tasks"]]
 
@@ -159,7 +159,10 @@ def post(self, project_id: int, annotation_type: str):
                 )
             except DataError as e:
                 current_app.logger.error(f"Error creating annotations: {str(e)}")
-                return {"Error": "Error creating annotations"}, 500
+                return {
+                    "Error": "Error creating annotations",
+                    "SubCode": "InvalidData",
+                }, 400
 
         return project_id, 200
 

backend/api/campaigns/resources.py

@@ -53,11 +53,11 @@ def get(self, campaign_id):
                 campaign = CampaignService.get_campaign_as_dto(campaign_id, 0)
             return campaign.to_primitive(), 200
         except NotFound:
-            return {"Error": "No campaign found"}, 404
+            return {"Error": "No campaign found", "SubCode": "NotFound"}, 404
         except Exception as e:
             error_msg = f"Campaign GET - unhandled error: {str(e)}"
             current_app.logger.critical(error_msg)
-            return {"Error": error_msg}, 500
+            return {"Error": error_msg, "SubCode": "InternalServerError"}, 500
 
     @token_auth.login_required
     def patch(self, campaign_id):
@@ -129,27 +129,27 @@ def patch(self, campaign_id):
                 raise ValueError("User not a Org Manager")
         except ValueError as e:
             error_msg = f"CampaignsRestAPI PATCH: {str(e)}"
-            return {"Error": error_msg}, 403
+            return {"Error": error_msg, "SubCode": "UserNotPermitted"}, 403
 
         try:
             campaign_dto = CampaignDTO(request.get_json())
             campaign_dto.validate()
         except DataError as e:
             current_app.logger.error(f"error validating request: {str(e)}")
-            return str(e), 400
+            return {"Error": str(e), "SubCode": "InvalidData"}, 400
 
         try:
             campaign = CampaignService.update_campaign(campaign_dto, campaign_id)
             return {"Success": "Campaign {} updated".format(campaign.id)}, 200
         except NotFound:
-            return {"Error": "Campaign not found"}, 404
+            return {"Error": "Campaign not found", "SubCode": "NotFound"}, 404
         except ValueError:
             error_msg = "Campaign PATCH - name already exists"
-            return {"Error": error_msg}, 409
+            return {"Error": error_msg, "SubCode": "NameExists"}, 409
         except Exception as e:
             error_msg = f"Campaign PATCH - unhandled error: {str(e)}"
             current_app.logger.critical(error_msg)
-            return {"Error": error_msg}, 500
+            return {"Error": error_msg, "SubCode": "InternalServerError"}, 500
 
     @token_auth.login_required
     def delete(self, campaign_id):
@@ -197,18 +197,18 @@ def delete(self, campaign_id):
                 raise ValueError("User not a Org Manager")
         except ValueError as e:
             error_msg = f"CampaignsRestAPI DELETE: {str(e)}"
-            return {"Error": error_msg}, 403
+            return {"Error": error_msg, "SubCode": "UserNotPermitted"}, 403
 
         try:
             campaign = CampaignService.get_campaign(campaign_id)
             CampaignService.delete_campaign(campaign.id)
             return {"Success": "Campaign deleted"}, 200
         except NotFound:
-            return {"Error": "Campaign not found"}, 404
+            return {"Error": "Campaign not found", "SubCode": "NotFound"}, 404
         except Exception as e:
             error_msg = f"Campaign DELETE - unhandled error: {str(e)}"
             current_app.logger.critical(error_msg)
-            return {"Error": error_msg}, 500
+            return {"Error": error_msg, "SubCode": "InternalServerError"}, 500
 
 
 class CampaignsAllAPI(Resource):
@@ -232,7 +232,7 @@ def get(self):
         except Exception as e:
             error_msg = f"User GET - unhandled error: {str(e)}"
             current_app.logger.critical(error_msg)
-            return {"Error": error_msg}, 500
+            return {"Error": error_msg, "SubCode": "InternalServerError"}, 500
 
     @token_auth.login_required
     def post(self):
@@ -298,22 +298,21 @@ def post(self):
                 raise ValueError("User not a Org Manager")
         except ValueError as e:
             error_msg = f"CampaignsAllAPI POST: {str(e)}"
-            return {"Error": error_msg}, 403
+            return {"Error": error_msg, "SubCode": "UserNotPermitted"}, 403
 
         try:
             campaign_dto = NewCampaignDTO(request.get_json())
             campaign_dto.validate()
         except DataError as e:
             current_app.logger.error(f"error validating request: {str(e)}")
-            return str(e), 400
+            return {"Error": str(e), "SubCode": "InvalidData"}, 400
 
         try:
             campaign = CampaignService.create_campaign(campaign_dto)
             return {"campaignId": campaign.id}, 200
         except ValueError as e:
-            error_msg = f"Campaign POST - {str(e)}"
-            return {"Error": error_msg}, 409
+            return {"Error": str(e).split("-")[1], "SubCode": str(e).split("-")[0]}, 409
         except Exception as e:
             error_msg = f"Campaign POST - unhandled error: {str(e)}"
             current_app.logger.critical(error_msg)
-            return {"Error": error_msg}, 500
+            return {"Error": error_msg, "SubCode": "InternalServerError"}, 500