Merge branch 'deployment/naxa' into meta-update-rapid-pr

.github/workflows/build_and_deploy_backend.yml

@@ -0,0 +1,32 @@
+name: Build and Deploy Tasking Manager Backend
+
+on:
+  push:
+    branches:
+      - deployment/naxa
+    paths:
+      - "backend/**"
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    name: Deploy to Server
+    runs-on: [ubuntu-latest]
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v3
+
+      - name: Recreate Services
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ vars.SERVER_IP }}
+          username: ${{ vars.SERVER_USERNAME }}
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          command_timeout: 20m
+          script: |
+            echo '==In Server=='
+            echo '==Building Backend=='
+            cd /home/ubuntu/Projects/tasking-manager
+            git pull naxa deployment/naxa
+            docker compose build --no-cache backend
+            docker compose up -d --force-recreate

.github/workflows/build_and_deploy_frontend.yml

@@ -0,0 +1,39 @@
+name: Build and Deploy Tasking Manager Frontend
+
+on:
+  push:
+    branches:
+      - deployment/naxa
+    paths:
+      - "frontend/**"
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    name: Deploy to Server
+    runs-on: [ubuntu-latest]
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v3
+
+      - name: SSH Run command
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ vars.SERVER_IP }}
+          username: ${{ vars.SERVER_USERNAME }}
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          command_timeout: 20m
+          script: |
+            #!/bin/bash -i
+            echo '==In Server=='
+            echo '==Building Frontend=='
+            export NVM_DIR=~/.nvm
+            source ~/.nvm/nvm.sh
+            cd /home/ubuntu/Projects/tasking-manager
+            git pull naxa deployment/naxa
+            cd /home/ubuntu/Projects/tasking-manager/frontend
+            nvm i 16
+            nvm use 16
+            npm i -g yarn
+            yarn install
+            npm run build

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/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 a team, unlink any associated projects."
+            }, 400
 
     @staticmethod
     def check_team_membership(project_id: int, allowed_roles: list, user_id: int):

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/projectDetail/questionsAndComments.js

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

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/rapidEditor.js

@@ -84,6 +84,7 @@ function generateStartingHash({ comment, presets, gpxUrl, powerUser, imagery })
   return hashParams;
 }
 
+
 /**
  * Resize rapid
  * @param {Context} rapidContext The rapid context to resize

frontend/src/components/taskSelection/actionSidebars.js

@@ -586,19 +586,12 @@ const TaskValidationSelector = ({
   // the contributors is filled only on the case of single task validation,
   // so we need to fetch the task history in the case of multiple task validation
   useEffect(() => {
-    if (showCommentInput && isValidatingMultipleTasks && !contributors.length) {
+    if (showCommentInput && isValidatingMultipleTasks) {
       fetchLocalJSONAPI(`projects/${projectId}/tasks/${id}/`).then((response) =>
         setContributorsList(getTaskContributors(response.taskHistory, userDetails.username)),
       );
     }
-  }, [
-    isValidatingMultipleTasks,
-    showCommentInput,
-    contributors,
-    id,
-    projectId,
-    userDetails.username,
-  ]);
+  }, [isValidatingMultipleTasks, showCommentInput, id, projectId, userDetails.username]);
 
   return (
     <div className="cf w-100 db pt1 pv2 blue-dark">
@@ -650,7 +643,7 @@ const TaskValidationSelector = ({
             <CommentInputField
               comment={comment}
               setComment={setComment}
-              contributors={contributors.length ? contributors : contributorsList}
+              contributors={isValidatingMultipleTasks ? contributorsList : contributors}
               enableHashtagPaste
               enableContributorsHashtag
               isShowTabNavs

frontend/src/views/contributions.js

@@ -46,7 +46,12 @@ export const ContributionsPage = () => {
     <section className="pb5 pt180 pull-center">
       <MyTasksNav />
       <TaskResults retryFn={forceUpdate} state={state} />
-      <ProjectCardPaginator projectAPIstate={state} setQueryParam={setContributionsQuery} />
+      <ProjectCardPaginator
+        projectAPIstate={state}
+        status={state.isLoading ? 'pending' : 'success'}
+        pagination={state?.pagination}
+        setQueryParam={setContributionsQuery}
+      />
     </section>
   );
 };

frontend/src/views/settings.js

@@ -34,7 +34,7 @@ export function Settings() {
         </div>
         <div className="fl w-100 w-40-l pb3 pl3-l">
           <PersonalInformationForm />
-          <OSMCard username={userDetails.username} />
+          {userDetails?.username && <OSMCard username={userDetails.username} />}
         </div>
       </div>
     </div>

frontend/src/views/teams.js

@@ -426,7 +426,7 @@ export function TeamDetail() {
   const [error, loading, team] = useFetch(`teams/${id}/`);
   // eslint-disable-next-line
   const [projectsError, projectsLoading, projects] = useFetch(
-    `projects/?teamId=${id}&omitMapResults=true`,
+    `projects/?teamId=${id}&omitMapResults=true&projectStatuses=PUBLISHED,DRAFT,ARCHIVED`,
     id,
   );
   const [isMember, setIsMember] = useState(false);

frontend/src/views/userDetail.js

@@ -12,7 +12,7 @@ import { CountriesMapped } from '../components/userDetail/countriesMapped';
 import { TopProjects } from '../components/userDetail/topProjects';
 import { ContributionTimeline } from '../components/userDetail/contributionTimeline';
 import { NotFound } from './notFound';
-import { OHSOME_STATS_BASE_URL } from '../config';
+import { OHSOME_STATS_BASE_URL, OSM_SERVER_URL } from '../config';
 import { fetchExternalJSONAPI } from '../network/genericJSONRequest';
 import { useFetch } from '../hooks/UseFetch';
 import { useSetTitleTag } from '../hooks/UseMetaTags';
@@ -33,6 +33,7 @@ export const UserDetail = ({ withHeader = true }) => {
   const token = useSelector((state) => state.auth.token);
   const currentUser = useSelector((state) => state.auth.userDetails);
   const [osmStats, setOsmStats] = useState({});
+  const [userOsmDetails, setUserOsmDetails] = useState({});
   const [errorDetails, loadingDetails, userDetails] = useFetch(
     `users/queries/${username}/`,
     username !== undefined,
@@ -54,6 +55,9 @@ export const UserDetail = ({ withHeader = true }) => {
 
   useEffect(() => {
     if (userDetails.id) {
+      fetchExternalJSONAPI(`${OSM_SERVER_URL}/api/0.6/user/${userDetails.id}.json`, false)
+        .then((res) => setUserOsmDetails(res?.user))
+        .catch((e) => console.log(e));
       fetchExternalJSONAPI(`${OHSOME_STATS_BASE_URL}/hot-tm-user?userId=${userDetails.id}`, true)
         .then((res) => setOsmStats(res.result))
         .catch((e) => console.log(e));
@@ -74,7 +78,7 @@ export const UserDetail = ({ withHeader = true }) => {
             rows={5}
             ready={!errorDetails && !loadingDetails}
           >
-            <HeaderProfile userDetails={userDetails} changesets={osmStats.changesets} />
+            <HeaderProfile userDetails={userDetails} changesets={userOsmDetails?.changesets?.count} />
           </ReactPlaceholder>
         </div>
       )}