Merge pull request #3327 from hotosm/develop

v4.1.1 release

Author: willemarcel

backend/services/team_service.py

@@ -249,26 +249,22 @@ def get_all_teams(
             team_dto.organisation = team.organisation.name
             team_dto.organisation_id = team.organisation.id
             team_dto.members = []
-            team_members = TeamService._get_team_members(team.id)
-            is_team_manager = False
-            is_team_member = False
-            for member in team_members:
-                user = UserService.get_user_by_id(member.user_id)
-                member_function = TeamMemberFunctions(member.function).name
-                is_team_member = True if member.user_id == user_id else False
-                is_team_manager = True if member_function == "MANAGER" else False
-                # Skip if members are not included
-                if omit_members:
-                    continue
-                member_dto = TeamMembersDTO()
-                member_dto.username = user.username
-                member_dto.function = member_function
-                member_dto.picture_url = user.picture_url
-                member_dto.active = member.active
-                team_dto.members.append(member_dto)
+            is_team_member = TeamService.is_user_an_active_team_member(team.id, user_id)
+            # Skip if members are not included
+            if not omit_members:
+                team_members = TeamService._get_team_members(team.id)
+                for member in team_members:
+                    user = UserService.get_user_by_id(member.user_id)
+                    member_function = TeamMemberFunctions(member.function).name
+                    member_dto = TeamMembersDTO()
+                    member_dto.username = user.username
+                    member_dto.function = member_function
+                    member_dto.picture_url = user.picture_url
+                    member_dto.active = member.active
+                    team_dto.members.append(member_dto)
 
             if team_dto.visibility == "PRIVATE" and not is_admin:
-                if is_team_manager or is_team_member:
+                if is_team_member:
                     teams_list_dto.teams.append(team_dto)
             else:
                 teams_list_dto.teams.append(team_dto)

frontend/src/store/actions/auth.js

@@ -129,10 +129,7 @@ export const setUserDetails = (username, encodedToken, update = false) => (dispa
           dispatch(updateOrgsInfo(orgs.organisations.map((org) => org.organisationId))),
         )
         .catch((error) => dispatch(updateOrgsInfo([])));
-      fetchLocalJSONAPI(
-        `teams/?omitMemberList=true&team_role=PROJECT_MANAGER&member=${userDetails.id}`,
-        encodedToken,
-      )
+      fetchLocalJSONAPI(`teams/?omitMemberList=true&team_role=PROJECT_MANAGER&member=${userDetails.id}`, encodedToken)
         .then((teams) => dispatch(updatePMsTeams(teams.teams.map((team) => team.teamId))))
         .catch((error) => dispatch(updatePMsTeams([])));
       dispatch(setLoader(false));

requirements.txt

@@ -19,7 +19,7 @@ Flask-Migrate==2.5.3
 Flask-OAuthlib==0.9.4
 Flask-RESTful==0.3.8
 Flask-Script==2.0.6
-Flask-SQLAlchemy==2.4.3
+Flask-SQLAlchemy==2.4.4
 flask-swagger==0.2.14
 gevent==20.6.2
 GeoAlchemy2==0.8.4

scripts/aws/cloudformation/tasking-manager.template.js

@@ -132,8 +132,8 @@ const Resources = {
     Properties: {
       AutoScalingGroupName: cf.stackName,
       Cooldown: 300,
-      MinSize: cf.if('IsTaskingManagerProduction', 3, 1),
-      DesiredCapacity: cf.if('IsTaskingManagerProduction', 3, 1),
+      MinSize: cf.if('IsTaskingManagerProduction', 2, 1),
+      DesiredCapacity: cf.if('IsTaskingManagerProduction', 2, 1),
       MaxSize: cf.if('IsTaskingManagerProduction', 9, cf.if('IsTaskingManagerDemo', 3, 1)),
       HealthCheckGracePeriod: 600,
       LaunchConfigurationName: cf.ref('TaskingManagerLaunchConfiguration'),
@@ -149,6 +149,7 @@ const Resources = {
     UpdatePolicy: {
       AutoScalingRollingUpdate: {
         PauseTime: 'PT60M',
+        MaxBatchSize: 2,
         WaitOnResourceSignals: true
       }
     }