facebook/chore/update rapid

.circleci/config.yml

@@ -1,9 +1,11 @@
 version: 2.1
 
 orbs:
-  aws-cli: circleci/[email protected]
+  aws-cli: circleci/[email protected]
+  aws-ecs: circleci/[email protected]
   opsgenie: opsgenie/[email protected]
 
+
 jobs:
   frontend-code-test:
     resource_class: large
@@ -68,7 +70,7 @@ jobs:
           TM_ORG_CODE: "CICode"
           TM_ORG_NAME: "CircleCI Test Organisation"
 
-      - image: cimg/postgres:14.2-postgis
+      - image: cimg/postgres:14.9-postgis
         environment:
           POSTGRES_USER: taskingmanager
           POSTGRES_DB: test_tm
@@ -79,12 +81,6 @@ jobs:
       - run: sudo apt-get update
       - run: sudo apt-get -y install libgeos-dev # Required for shapely
       - run: sudo apt-get -y install proj-bin libproj-dev
-      - run:
-          name: Configure Postgresql Test database
-          command: |
-            psql \
-            -d $SQLALCHEMY_DATABASE_URI \
-            -c "CREATE EXTENSION postgis;"
       - run: pip install --upgrade pip pdm
       - run: pdm config --global python.use_venv False
       - run: pdm export --dev --without-hashes > requirements.txt
@@ -113,13 +109,13 @@ jobs:
         description: "Cloudformation stack name"
         type: string
     docker:
-      - image: cimg/postgres:15.1-postgis
+      - image: cimg/postgres:15.4-postgis
     steps:
       - aws-cli/setup:
-          role-arn: "arn:aws:iam::$ORG_AWS_ACCOUNT_ID:role/CircleCI-OIDC-Connect"
-          profile-name: "OIDC-Profile"
-          role-session-name: "database-snapshot"
-          session-duration: "2700"
+          role_arn: "arn:aws:iam::$ORG_AWS_ACCOUNT_ID:role/CircleCI-OIDC-Connect"
+          profile_name: "OIDC-Profile"
+          role_session_name: "database-snapshot"
+          session_duration: "2700"
       - run:
           name: Find the instance ID of the database in the stack to backup
           command: |
@@ -193,10 +189,10 @@ jobs:
     steps:
       - checkout
       - aws-cli/setup:
-          role-arn: "arn:aws:iam::$ORG_AWS_ACCOUNT_ID:role/CircleCI-OIDC-Connect"
-          profile-name: "OIDC-Profile"
-          role-session-name: "backend-deploy"
-          session-duration: "2700"
+          role_arn: "arn:aws:iam::$ORG_AWS_ACCOUNT_ID:role/CircleCI-OIDC-Connect"
+          profile_name: "OIDC-Profile"
+          role_session_name: "backend-deploy"
+          session_duration: "2700"
       - run: sudo apt-get update
       - run: sudo apt-get -y install libgeos-dev jq
       - run: sudo yarn global add @mapbox/cfn-config @mapbox/cloudfriend
@@ -222,6 +218,21 @@ jobs:
             export JSON_CONFIG="$(< $CIRCLE_WORKING_DIRECTORY/cfn-config-<< parameters.stack_name >>.json)"
             cfn-config update << parameters.stack_name >> $CIRCLE_WORKING_DIRECTORY/scripts/aws/cloudformation/tasking-manager.template.js -f -c hot-cfn-config -t hot-cfn-config -r $AWS_REGION -p "$JSON_CONFIG"
 
+  backend_deploy_containers:
+    working_directory: /home/circleci/tasking-manager
+    docker:
+      - image: cimg/python:3.10.7
+    steps:
+      - checkout
+      - aws-cli/setup:
+          role_arn: "arn:aws:iam::$ORG_AWS_ACCOUNT_ID:role/CircleCI-OIDC-Connect"
+          profile_name: "OIDC-Profile"
+          role_session_name: "backend-deploy-containers"
+          session_duration: "2700"
+      - run: sudo apt-get update
+      - run: sudo apt-get -y install curl
+      - run: echo "Run AWS Fargate"
+
   frontend_deploy:
     working_directory: /home/circleci/tasking-manager
     resource_class: large
@@ -234,10 +245,10 @@ jobs:
     steps:
       - checkout
       - aws-cli/setup:
-          role-arn: "arn:aws:iam::$ORG_AWS_ACCOUNT_ID:role/CircleCI-OIDC-Connect"
-          profile-name: "OIDC-Profile"
-          role-session-name: "frontend-deploy"
-          session-duration: "1800"
+          role_arn: "arn:aws:iam::$ORG_AWS_ACCOUNT_ID:role/CircleCI-OIDC-Connect"
+          profile_name: "OIDC-Profile"
+          role_session_name: "frontend-deploy"
+          session_duration: "1800"
       - run:
           name: Deploy Frontend to S3
           command: |

.github/labeler.yml

@@ -1,12 +1,12 @@
-"Component: Frontend":
+"codebase: frontend":
   - frontend/**/*
-"Component: Backend":
+"codebase: backend":
   - backend/**/*
   - tests/**/*
   - migrations/**/*
   - ./manage.py
   - ./pyproject.toml
-"Component: Infrastructure":
+"infrastructure":
   - .circleci/*
   - .github/**/*
   - scripts/aws/**/*
@@ -20,5 +20,5 @@
   - frontend/yarn.lock
 "python":
   - ./pyproject.toml
-"Type: Translations":
+"type: translations":
   - frontend/src/locales/*

README.md

@@ -18,9 +18,7 @@ This is Free and Open Source Software. You are welcome to use the code and set u
 * Read the monthly update blogs on [OSM Discourse](https://community.openstreetmap.org/c/general/38/all).
 
 ## Product Roadmap
-We have included below a high level roadmap/plan [subject to change] that can be used as an overview.
-![image](https://user-images.githubusercontent.com/98902727/218763601-f08e3879-51f3-40a7-ae6e-bdf96f8a5979.png)
-
+We have included below a [high level roadmap/plan](https://github.com/orgs/hotosm/projects/28/) [subject to change] that can be used as an overview.
 
 
 ## Developers

backend/api/teams/resources.py

@@ -181,8 +181,7 @@ def delete(self, team_id):
                 "SubCode": "UserNotTeamManager",
             }, 401
 
-        TeamService.delete_team(team_id)
-        return {"Success": "Team deleted"}, 200
+        return TeamService.delete_team(team_id)
 
 
 class TeamsAllAPI(Resource):

backend/config.py

@@ -205,7 +205,7 @@ class EnvironmentConfig:
         """
         import json
 
-        _params = json.loads(os.getenv("OAUTH2_APP_CREDENTIALS"), None)
+        _params = json.loads(os.getenv("OAUTH2_APP_CREDENTIALS", None))
         OAUTH_CLIENT_ID = _params.get("CLIENT_ID", None)
         OAUTH_CLIENT_SECRET = _params.get("CLIENT_SECRET", None)
         OAUTH_REDIRECT_URI = _params.get("REDIRECT_URI", None)

backend/services/team_service.py

@@ -566,8 +566,12 @@ def delete_team(team_id: int):
 
         if team.can_be_deleted():
             team.delete()
+            return {"Success": "Team deleted"}, 200
         else:
-            raise TeamServiceError("Team has projects, cannot be deleted")
+            return {
+                "Error": "Team has projects, cannot be deleted",
+                "SubCode": "This team has projects associated. Before deleting team, unlink any associated projects.",
+            }, 400
 
     @staticmethod
     def check_team_membership(project_id: int, allowed_roles: list, user_id: int):

example.env

@@ -84,10 +84,10 @@ OSM_REGISTER_URL=https://www.openstreetmap.org/user/new
 # It's not required to set this tag. Case it isn't set, an image will be used as background.
 # TM_HOMEPAGE_VIDEO_URL=
 
-# Endpoint for the missing maps stats
+# API base URL and token(used to retrieve user stats only) for ohsomeNow Stats
 #
-TM_USER_STATS_API_URL=https://osm-stats-production-api.azurewebsites.net/users/
-TM_HOMEPAGE_STATS_API_URL=https://osmstats-api.hotosm.org/wildcard?key=hotosm-project-*
+OHSOME_STATS_BASE_URL=https://stats.now.ohsome.org/api
+OHSOME_STATS_TOKEN=testSuperSecretTestToken
 
 # Secret (required)
 #

frontend/.env.expand

@@ -29,8 +29,8 @@ REACT_APP_MAPBOX_TOKEN=$TM_MAPBOX_TOKEN
 REACT_APP_ENABLE_SERVICEWORKER=$TM_ENABLE_SERVICEWORKER
 REACT_APP_MAX_FILESIZE=$TM_IMPORT_MAX_FILESIZE
 REACT_APP_MAX_AOI_AREA=$TM_MAX_AOI_AREA
-REACT_APP_USER_STATS_API_URL=$TM_USER_STATS_API_URL
-REACT_APP_HOMEPAGE_STATS_API_URL=$TM_HOMEPAGE_STATS_API_URL
+REACT_APP_OHSOME_STATS_BASE_URL=$OHSOME_STATS_BASE_URL
+REACT_APP_OHSOME_STATS_TOKEN=$OHSOME_STATS_TOKEN
 REACT_APP_OSM_CLIENT_ID=$TM_CLIENT_ID
 REACT_APP_OSM_CLIENT_SECRET=$TM_CLIENT_SECRET
 REACT_APP_OSM_REDIRECT_URI=$TM_REDIRECT_URI

frontend/src/api/projects.js

@@ -37,8 +37,10 @@ export const useProjectsQuery = (fullProjectsQuery, action) => {
 };
 
 export const useProjectQuery = (projectId) => {
+  const token = useSelector((state) => state.auth.token);
+  const locale = useSelector((state) => state.preferences['locale']);
   const fetchProject = ({ signal }) => {
-    return api().get(`projects/${projectId}/`, {
+    return api(token, locale).get(`projects/${projectId}/`, {
       signal,
     });
   };

frontend/src/api/stats.js

@@ -1,7 +1,7 @@
 import { useQuery } from '@tanstack/react-query';
 
 import api from './apiClient';
-import { HOMEPAGE_STATS_API_URL } from '../config';
+import { OHSOME_STATS_BASE_URL } from '../config';
 
 export const useSystemStatisticsQuery = () => {
   const fetchSystemStats = ({ signal }) => {
@@ -33,7 +33,7 @@ export const useProjectStatisticsQuery = (projectId) => {
 
 export const useOsmStatsQuery = () => {
   const fetchOsmStats = ({ signal }) => {
-    return api().get(HOMEPAGE_STATS_API_URL, {
+    return api().get(`${OHSOME_STATS_BASE_URL}/stats/hotosm-project-%2A`, {
       signal,
     });
   };
@@ -42,27 +42,22 @@ export const useOsmStatsQuery = () => {
     queryKey: ['osm-stats'],
     queryFn: fetchOsmStats,
     useErrorBoundary: true,
+    select: (data) => data.data.result
   });
 };
 
 export const useOsmHashtagStatsQuery = (defaultComment) => {
   const fetchOsmStats = ({ signal }) => {
-    return api().get(
-      `https://osm-stats-production-api.azurewebsites.net/stats/${defaultComment[0].replace(
-        '#',
-        '',
-      )}`,
-      {
-        signal,
-      },
-    );
+    return api().get(`${OHSOME_STATS_BASE_URL}/stats/${defaultComment[0].replace('#', '')}`, {
+      signal,
+    });
   };
 
   return useQuery({
     queryKey: ['osm-hashtag-stats'],
     queryFn: fetchOsmStats,
     useErrorBoundary: true,
     enabled: Boolean(defaultComment?.[0]),
-    select: (data) => data.data,
+    select: (data) => data.data.result,
   });
 };

frontend/src/assets/styles/_extra.scss

@@ -616,3 +616,8 @@ a[href="https://www.mapbox.com/map-feedback/"]
 .link:focus {
   outline: revert;
 }
+
+// Override tachyons font-family for code tag
+.code {
+  font-family: inherit;
+}

frontend/src/components/homepage/stats.js

@@ -42,15 +42,15 @@ export const StatsSection = () => {
       <div className="pt5 pb2 ph6-l ph4 flex justify-around flex-wrap flex-nowrap-ns stats-container">
         <StatsColumn
           label={messages.buildingsStats}
-          value={hasStatsLoaded ? osmStatsData?.data.building_count_add : undefined}
+          value={hasStatsLoaded ? osmStatsData?.buildings : undefined}
         />
         <StatsColumn
           label={messages.roadsStats}
-          value={hasStatsLoaded ? osmStatsData?.data.road_km_add : undefined}
+          value={hasStatsLoaded ? osmStatsData?.roads : undefined}
         />
         <StatsColumn
           label={messages.editsStats}
-          value={hasStatsLoaded ? osmStatsData?.data.edits : undefined}
+          value={hasStatsLoaded ? osmStatsData?.edits : undefined}
         />
         <StatsColumn
           label={messages.communityStats}

frontend/src/components/homepage/styles.scss

@@ -358,3 +358,9 @@
     padding-bottom: 3.345rem;
   }
 }
+
+.info-ohsome-tooltip {
+  display: flex;
+  justify-content: flex-end;
+  padding-right: 0.875rem;
+}

frontend/src/components/projectDetail/questionsAndComments.js

@@ -46,7 +46,9 @@ export const PostProjectComment = ({ projectId, refetchComments, contributors })
           isShowUserPicture
           isShowFooter
           isShowTabNavs
-          contributors={contributors?.userContributions?.map((user) => user.username)}
+          contributors={
+            Array.isArray(contributors) ? contributors.map((user) => user.username) : undefined
+          }
         />
       </div>
 

frontend/src/components/projectStats/edits.js

@@ -1,29 +1,26 @@
 import React from 'react';
-import ReactTooltip from 'react-tooltip';
-import { FormattedMessage, useIntl } from 'react-intl';
+import { FormattedMessage } from 'react-intl';
 
 import projectMessages from './messages';
 import userDetailMessages from '../userDetail/messages';
-import { MappingIcon, HomeIcon, RoadIcon, EditIcon, InfoIcon } from '../svgIcons';
+import { MappingIcon, HomeIcon, RoadIcon, EditIcon } from '../svgIcons';
 import { StatsCard } from '../statsCard';
+import StatsTimestamp from '../statsTimestamp';
 
 export const EditsStats = ({ data }) => {
-  const intl = useIntl();
   const { changesets, buildings, roads, edits } = data;
 
   const iconClass = 'h-50 w-50';
   const iconStyle = { height: '45px' };
 
   return (
     <div className="cf w-100 pb4 ph2 ph4-ns blue-dark">
-      <h3 className="barlow-condensed ttu f3">
-        <FormattedMessage {...projectMessages.edits} />
-        <InfoIcon
-          data-tip={intl.formatMessage(projectMessages.editsStats)}
-          className="blue-grey h1 w1 v-mid pb1 ml2"
-        />
-      </h3>
-      <ReactTooltip place="top" className="mw6" effect="solid" />
+      <div className="flex items-center">
+        <h3 className="barlow-condensed ttu f3">
+          <FormattedMessage {...projectMessages.edits} />
+        </h3>
+        <StatsTimestamp messageType="project" />
+      </div>
       <div className="db pb2 project-edit-stats">
         <StatsCard
           field={'changesets'}

frontend/src/components/projectStats/messages.js

@@ -93,8 +93,4 @@ export default defineMessages({
     id: 'project.stats.edits',
     defaultMessage: 'Edits',
   },
-  editsStats: {
-    id: 'project.stats.edits.info',
-    defaultMessage: 'These stats are retrieved using the default changeset comment of the project',
-  },
 });

frontend/src/components/projects/projectCardPaginator.js

@@ -15,7 +15,8 @@ export const ProjectCardPaginator = ({ status, pagination, fullProjectsQuery, se
       );
   };
 
-  if (!apiIsFetched) {
+  // do not show pagination when the data is being fetched or it has zero results
+  if (!apiIsFetched || !pagination?.total) {
     return null;
   }
   const activePage = (apiIsFetched && pagination?.page) || 1;

frontend/src/components/projects/tests/projectCardPaginator.test.js

@@ -15,6 +15,7 @@ describe('ProjectCardPaginator Component', () => {
           hasPrev: false,
           page: 1,
           pages: 3,
+          total: 10,
         }}
       />,
     );
@@ -32,6 +33,7 @@ describe('ProjectCardPaginator Component', () => {
           hasPrev: false,
           page: 1,
           pages: 3,
+          total: 10,
         }}
       />,
     );