Merge pull request #6919 from hotosm/develop

Bring latest changes to staging

Author: ramyaragupathy

.circleci/config.yml

@@ -6,6 +6,6 @@ jobs:
   add_release:
     runs-on: ubuntu-latest
     steps:
-    - name: Add release version to db
-      run: |
-        curl -X POST "https://tasking-manager-tm4-production-api.hotosm.org/api/v2/system/release/"
+      - name: Add release version to db
+        run: |
+          curl -X POST "https://tasking-manager-production-api.hotosm.org/api/v2/system/release/"

.circleci/rdsid.sh

@@ -26,51 +26,11 @@ env:
 
 jobs:
   image-build-and-push:
-    name: Build Container Images
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    outputs:
-      image_tags: ${{ steps.meta.outputs.tags }}
-
-    steps:
-      - uses: docker/setup-qemu-action@v3
-      - uses: docker/setup-buildx-action@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set container image metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: |
-            type=raw,value=${{ github.ref_name }}
-            type=raw,value=${{ github.sha }}
-
-      - name: Build and push container image
-        id: build-push-image
-        uses: docker/build-push-action@v5
-        with:
-          context: "{{defaultContext}}"
-          target: prod
-          platforms: linux/amd64,linux/arm64
-          file: scripts/docker/Dockerfile
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: |
-            type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache-${{ github.ref_name }}
-            type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache-main
-            type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache-staging
-            type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache-develop
-          cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache-${{ github.ref_name }},mode=max
+    uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.5.1
+    with:
+      image_name: ghcr.io/${{ github.repository }}/backend
+      build_target: prod
+      dockerfile: scripts/docker/Dockerfile
 
   deploy-service:
     name: Deploy ${{ matrix.service }} to ECS

.github/workflows/add-version-to-db.yml

@@ -0,0 +1,54 @@
+name: 🧪 PR Test Backend
+
+on:
+  pull_request:
+    branches:
+      - main
+      - staging
+      - develop
+    paths:
+      - "backend/**"
+  workflow_dispatch:
+
+jobs:
+  code-check-PEP8:
+    name: Run PEP8 code style checks
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install flake8
+          pip install black==25.1.0
+
+      - name: Run PEP8 checks
+        run: |
+          flake8 manage.py backend tests migrations
+          black --check manage.py backend tests migrations
+
+  pytest:
+    uses: hotosm/gh-workflows/.github/workflows/test_compose.yml@3.2.0
+    with:
+      image_name: ghcr.io/${{ github.repository }}/backend
+      build_context: .
+      build_dockerfile: ./scripts/docker/Dockerfile
+      pre_command: |
+        cp example.env tasking-manager.env
+        docker compose up -d tm-db tm-backend tm-migration tm-cron-jobs traefik
+        docker compose exec tm-db bash -c "PGPASSWORD=tm psql -U tm -d tasking-manager <<EOF
+        CREATE DATABASE taskingmanagertest;
+        EOF"
+      compose_file: "docker-compose.yml"
+      compose_service: tm-backend
+      compose_command: pytest tests/api/unit/ -p no:warnings
+      cache_extra_imgs: |
+        "postgis/postgis:14-3.3"
+    secrets: inherit

.github/workflows/backend-build-deploy.yml

@@ -1,20 +1,14 @@
-name: Build & publish TM frontend static files
+name: 🧪 PR Test Frontend
 
 on:
-  push:
-    branches:
-      - deployment/hot-tasking-manager
-      - deployment/demo-tasking-manager
-      - deployment/container-tasking-manager
-
   pull_request:
     branches:
       - main
       - staging
       - develop
-      - deployment/hot-tasking-manager
-      - deployment/demo-tasking-manager
-      - deployment/container-tasking-manager
+    paths:
+      - "frontend/**"
+  workflow_dispatch:
 
 jobs:
   build:
@@ -62,6 +56,10 @@ jobs:
         working-directory: ./frontend
         run: yarn install
 
+      - name: Run Yarn test
+        working-directory: ./frontend
+        run: yarn test
+
       - name: Generate build
         working-directory: ./frontend
         run: |

.github/workflows/backend-build.yml

@@ -774,14 +774,29 @@ async def _parse_message_for_bulk_mentions(
             )
             usernames.extend([member["username"] for member in team_members])
 
+            organisation_managers_query = """
+                SELECT DISTINCT u.username
+                FROM projects p
+                JOIN organisation_managers om ON p.organisation_id = om.organisation_id
+                JOIN users u ON u.id = om.user_id
+                WHERE p.id = :project_id
+            """
+
+            organisation_managers = await db.fetch_all(
+                organisation_managers_query, values={"project_id": project_id}
+            )
+            if organisation_managers:
+                usernames.extend(
+                    [manager["username"] for manager in organisation_managers]
+                )
+
         # Add contributors if task_id is provided and contributors are mentioned
         if task_id and "contributors" in parsed:
             contributors = await Message.get_all_tasks_contributors(
                 project_id, task_id, db
             )
             usernames.extend(contributors)
-
-        return usernames
+        return list(set(usernames))
 
     @staticmethod
     async def _parse_message_for_username(

.github/workflows/pr_test_backend.yml

@@ -134,16 +134,18 @@ describe('Right side action items', () => {
     expect(screen.getByLabelText('Sample avatar')).toBeInTheDocument();
   });
 
-  test("when the user isn't logged in", () => {
+  test("when the user isn't logged in", async () => {
     act(() => {
       store.dispatch({
         type: 'SET_USER_DETAILS',
         userDetails: {},
       });
     });
     setup();
-    expect(screen.getByRole('combobox')).toBeInTheDocument();
-    expect(screen.getByText('English')).toBeInTheDocument();
+    await waitFor(() => {
+      expect(screen.getByRole('combobox')).toBeInTheDocument();
+      expect(screen.getByText('English')).toBeInTheDocument();
+    });
     expect(
       screen.getByRole('button', {
         name: /log in/i,

.github/workflows/frontend-build.yml .github/workflows/pr_test_frontend.yml.github/workflows/frontend-build.yml renamed to .github/workflows/pr_test_frontend.yml

@@ -3,7 +3,7 @@ import { FormattedMessage } from 'react-intl';
 import Select from 'react-select';
 
 import messages from './messages';
-import { supportedLocales } from '../utils/internationalization';
+import { useFetch } from '../hooks/UseFetch';
 import { setLocale } from '../store/actions/userPreferences';
 
 function LocaleSelect({
@@ -13,22 +13,30 @@ function LocaleSelect({
   removeBorder = true,
   fullWidth = false,
 }) {
+  const [errorLanguages, loadingLanguages, languages] = useFetch('system/languages/');
+
+  const supportedLanguages =
+    !errorLanguages && !loadingLanguages ? languages.supportedLanguages : [];
+
   const onLocaleSelect = (arr) => {
-    setLocale(arr[0].value);
+    setLocale(arr[0].code);
   };
 
   const getActiveLanguageNames = () => {
     const locales = [userPreferences.locale, navigator.language, navigator.language.substr(0, 2)];
     let supportedLocaleNames = [];
     locales.forEach((locale) =>
-      supportedLocales
-        .filter((i) => i.value === locale)
+      supportedLanguages
+        .filter((i) => i.code === locale)
         .forEach((i) => supportedLocaleNames.push(i)),
     );
 
-    return supportedLocaleNames.length ? supportedLocaleNames[0].value : 'en';
+    return supportedLocaleNames.length ? supportedLocaleNames[0].code : 'en';
   };
 
+  // wait till supportedLanguages are fetched
+  if (!supportedLanguages.length) return <></>;
+
   return (
     <div className={`settings-width ml-auto ${className || ''}`}>
       <Select
@@ -37,19 +45,22 @@ function LocaleSelect({
           control: (baseStyles, state) => ({
             ...baseStyles,
             border: removeBorder ? 'none' : 'auto',
-            width: fullWidth ? '100%' : `${8 * state.getValue()[0].label.length + 60}px`,
+            width:
+              fullWidth || !supportedLanguages.length
+                ? '100%'
+                : `${8 * state.getValue()[0].language.length + 60}px`,
             marginLeft: 'auto',
           }),
           menu: (baseStyles) => ({
             ...baseStyles,
             zIndex: 6,
           }),
         }}
-        getOptionLabel={({ label }) => label}
+        getOptionLabel={({ language }) => language}
         onChange={(e) => onLocaleSelect([e])}
-        options={supportedLocales}
+        options={supportedLanguages}
         placeholder={<FormattedMessage {...messages.language} />}
-        value={supportedLocales.find((editor) => editor.value === getActiveLanguageNames())}
+        value={supportedLanguages.find((editor) => editor.code === getActiveLanguageNames())}
       />
     </div>
   );