resolve merge conflicts

naxa-developers · Mar 29, 2024 · a2600f9 · a2600f9
2 parents 50bf94f + e8f542f
commit a2600f9
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 25 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,7 +5,7 @@ updates:
   schedule:
     interval: daily
     time: "13:00"
-  open-pull-requests-limit: 10
+  open-pull-requests-limit: 0
   ignore:
   - dependency-name: python-dotenv
     versions:
@@ -31,7 +31,7 @@ updates:
   schedule:
     interval: daily
     time: "13:00"
-  open-pull-requests-limit: 10
+  open-pull-requests-limit: 0
   ignore:
   - dependency-name: "@testing-library/user-event"
     versions:
@@ -275,7 +275,7 @@ updates:
   schedule:
     interval: daily
     time: "13:00"
-  open-pull-requests-limit: 10
+  open-pull-requests-limit: 0
   ignore:
   - dependency-name: python-dotenv
     versions:

diff --git a/backend/models/postgis/project.py b/backend/models/postgis/project.py
@@ -266,8 +266,15 @@ def set_country_info(self):
         url = "{0}/reverse?format=jsonv2&lat={1}&lon={2}&accept-language=en".format(
             current_app.config["OSM_NOMINATIM_SERVER_URL"], lat, lng
         )
+        headers = {
+            "User-Agent": (
+                "Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
+                "AppleWebKit/537.36 (KHTML, like Gecko) "
+                "Chrome/58.0.3029.110 Safari/537.3"
+            )
+        }
         try:
-            response = requests.get(url)
+            response = requests.get(url, headers=headers)
             response.raise_for_status()
             country_info = response.json()  # returns a dict
             if country_info["address"].get("country") is not None:

diff --git a/frontend/src/components/comments/commentInput.js b/frontend/src/components/comments/commentInput.js
@@ -49,9 +49,10 @@ export const CommentInputField = ({
       try {
         if (!query) return cb(contributors.map((username) => ({ username })));
 
-        // do not fetch data if the value comes from suggestions popup click
-        const isValueFromSuggestion = /^\[.*?\]\s$/.test(query);
-        if (isValueFromSuggestion) return;
+        // address trigger js allowSpaces=true issue
+        // which triggers this function every keystroke
+        const isUsernameAlreadyFetched = /^\[.*?\]\s/.test(query);
+        if (isUsernameAlreadyFetched) return;
 
         const res = await fetchLocalJSONAPI(`users/queries/filter/${query}/`, token);
         cb(res.usernames.map((username) => ({ username })));

diff --git a/frontend/src/components/projectStats/tests/edits.test.js b/frontend/src/components/projectStats/tests/edits.test.js
@@ -5,6 +5,7 @@ import '@testing-library/jest-dom';
 
 import { EditsStats } from '../edits';
 import { ConnectedIntl } from '../../../utils/internationalization';
+import { QueryClientProviders } from '../../../utils/testWithIntl';
 import { store } from '../../../store';
 
 describe('EditsStats component', () => {
@@ -17,11 +18,13 @@ describe('EditsStats component', () => {
 
   it('render contents', () => {
     const { getByText } = render(
-      <Provider store={store}>
-        <ConnectedIntl>
-          <EditsStats data={data} />
-        </ConnectedIntl>
-      </Provider>,
+      <QueryClientProviders>
+        <Provider store={store}>
+          <ConnectedIntl>
+            <EditsStats data={data} />
+          </ConnectedIntl>
+        </Provider>
+      </QueryClientProviders>,
     );
 
     expect(getByText('Changesets')).toBeInTheDocument();

diff --git a/frontend/src/components/statsCard.js b/frontend/src/components/statsCard.js
@@ -47,7 +47,7 @@ export const DetailedStatsCard = ({
   return (
     <div
       className="cf pa3 br1 flex bg-white red shadow-6 flex-column justify-between"
-      style={{ height: '10.5rem', cursor: 'default' }}
+      style={{ cursor: 'default' }}
     >
       <div className="flex items-center mb-auto">
         <div className="w-25 fl ml2">{icon}</div>

diff --git a/frontend/src/components/teamsAndOrgs/tests/featureStats.test.js b/frontend/src/components/teamsAndOrgs/tests/featureStats.test.js
@@ -3,7 +3,7 @@ import { render, screen, waitFor } from '@testing-library/react';
 import axios from 'axios';
 import '@testing-library/jest-dom';
 
-import { ReduxIntlProviders } from '../../../utils/testWithIntl';
+import { ReduxIntlProviders, QueryClientProviders } from '../../../utils/testWithIntl';
 import { FeatureStats } from '../featureStats';
 import { homepageStats } from '../../../network/tests/mockData/homepageStats';
 
@@ -13,9 +13,11 @@ test('FeatureStats renders the correct values and labels', async () => {
   axios.get.mockResolvedValue({ data: homepageStats });
 
   render(
-    <ReduxIntlProviders>
-      <FeatureStats />
-    </ReduxIntlProviders>,
+    <QueryClientProviders>
+      <ReduxIntlProviders>
+        <FeatureStats />
+      </ReduxIntlProviders>
+    </QueryClientProviders>,
   );
   expect(screen.getByText('Km road mapped')).toBeInTheDocument();
   expect(screen.getByText('Buildings mapped')).toBeInTheDocument();

diff --git a/frontend/src/components/userDetail/tests/elementsMapped.test.js b/frontend/src/components/userDetail/tests/elementsMapped.test.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { render } from '@testing-library/react';
 import '@testing-library/jest-dom';
 
-import { ReduxIntlProviders } from '../../../utils/testWithIntl';
+import { ReduxIntlProviders, QueryClientProviders } from '../../../utils/testWithIntl';
 import { TaskStats, ElementsMapped } from '../elementsMapped';
 
 describe('ElementsMapped & TaskStats components', () => {
@@ -45,9 +45,11 @@ describe('ElementsMapped & TaskStats components', () => {
       },
     };
     const { getByText } = render(
-      <ReduxIntlProviders>
-        <ElementsMapped userStats={userStats} osmStats={osmStats} />
-      </ReduxIntlProviders>,
+      <QueryClientProviders>
+        <ReduxIntlProviders>
+          <ElementsMapped userStats={userStats} osmStats={osmStats} />
+        </ReduxIntlProviders>
+      </QueryClientProviders>,
     );
 
     expect(getByText('Time spent mapping')).toBeInTheDocument();

diff --git a/frontend/src/views/tests/stats.test.js b/frontend/src/views/tests/stats.test.js
@@ -3,7 +3,11 @@ import { screen, waitFor, act } from '@testing-library/react';
 import { QueryParamProvider } from 'use-query-params';
 import { ReactRouter6Adapter } from 'use-query-params/adapters/react-router-6';
 
-import { ReduxIntlProviders, renderWithRouter } from '../../utils/testWithIntl';
+import {
+  ReduxIntlProviders,
+  renderWithRouter,
+  QueryClientProviders,
+} from '../../utils/testWithIntl';
 import { store } from '../../store';
 
 import { Stats } from '../stats';
@@ -15,9 +19,11 @@ describe('Overall styats page', () => {
     });
     renderWithRouter(
       <QueryParamProvider adapter={ReactRouter6Adapter}>
-        <ReduxIntlProviders>
-          <Stats />
-        </ReduxIntlProviders>
+        <QueryClientProviders>
+          <ReduxIntlProviders>
+            <Stats />
+          </ReduxIntlProviders>
+        </QueryClientProviders>
       </QueryParamProvider>,
     );
     waitFor(() => expect(screen.getByText('101367027')).toBeInTheDocument());