Merge branch 'master' of github.com:swp-berlin/webmonitor into staging

Author: o-zander

docs/usage/search.md

@@ -6,26 +6,26 @@ The search interface uses the ElasticSearch index to search through all publicat
 
 The following fields are indexed:
 
-| Field             | Type            |
-|-------------------|-----------------|
-| id                | Integer         |
-| thinktank_id      | Integer         |
-| title             | String          |
-| subtitle          | String          |
-| ris_type          | String          |
-| authors           | List[String]    |
-| abstract          | String          |
-| publication_date  | Date            |
-| last_access       | String/Datetime |
-| url               | String          |
-| pdf_url           | String          |
-| pdf_pages         | Integer         |
-| doi               | String          |
-| isbn              | String          |
-| tags              | List[String]    |
-| categories        | List[String]    |
-| created           | String/Datetime |
-| thinktank.name    | String          |
+| Field            | Type            |
+|------------------|-----------------|
+| id               | Integer         |
+| thinktank.id     | Integer         |
+| title            | String          |
+| subtitle         | String          |
+| ris_type         | String          |
+| authors          | List[String]    |
+| abstract         | String          |
+| publication_date | Date            |
+| last_access      | String/Datetime |
+| url              | String          |
+| pdf_url          | String          |
+| pdf_pages        | Integer         |
+| doi              | String          |
+| isbn             | String          |
+| tags             | List[String]    |
+| categories       | List[String]    |
+| created          | String/Datetime |
+| thinktank.name   | String          |
 
 Any word without a field qualifier is searched in the fields 'title', 'subtitle', 'abstract', 'authors', 'isbn' and 'tags'.
 

swp/api/serializers/monitor.py

@@ -11,7 +11,7 @@
 class PoolField(PrimaryKeyRelatedField):
 
     def get_queryset(self):
-        return Pool.objects.can_manage(self.context.get('request').user)
+        return Pool.objects.annotate_can_manage(self.context.get('request').user)
 
     def use_pk_only_optimization(self):
         return False

swp/api/viewsets/monitor.py

@@ -43,7 +43,7 @@ class MonitorViewSet(ModelViewSet):
 
     def get_queryset(self):
         return ModelViewSet.get_queryset(self).prefetch_related(
-            Prefetch('pool', Pool.objects.can_manage(self.request.user)),
+            Prefetch('pool', Pool.objects.annotate_can_manage(self.request.user)),
         )
 
     def get_serializer_class(self):

swp/assets/scripts/components/Fetch/index.js

@@ -3,9 +3,20 @@ import Query from './Query';
 import Result from './Result';
 import Loading from './Loading';
 import ChoicesQuery from './ChoicesQuery';
+import ClientError from './ClientError';
 import NetworkError from './NetworkError';
 
-export {Form, Query, Result, Loading, ChoicesQuery, NetworkError, useMutationForm, useMutationResult};
+export {
+    Form,
+    Query,
+    Result,
+    Loading,
+    ChoicesQuery,
+    ClientError,
+    NetworkError,
+    useMutationForm,
+    useMutationResult,
+};
 
 export default {
     Form,

swp/assets/scripts/components/monitor/MonitorEdit.js

@@ -4,13 +4,14 @@ import _ from 'utils/i18n';
 
 import {useQuery} from 'hooks/query';
 
-import Page from 'components/Page';
 import {Result} from 'components/Fetch';
 
-import MonitorForm from './MonitorForm';
 import {useMonitorsBreadcrumb} from './MonitorList';
 import {useMonitorBreadcrumb} from './MonitorDetail';
 
+import MonitorEditPage from './MonitorEditPage';
+import MonitorForm from './MonitorForm';
+
 const Title = _('Edit Monitor');
 const SubmitLabel = _('Save');
 const SuccessMessage = _('Successfully changed monitor');
@@ -26,7 +27,7 @@ const MonitorEdit = props => {
     return (
         <Result result={result}>
             {monitor => (
-                <Page title={Title}>
+                <MonitorEditPage pool={monitor.pool} title={Title}>
                     <MonitorForm
                         endpoint={endpoint}
                         method="PATCH"
@@ -36,7 +37,7 @@ const MonitorEdit = props => {
                         data={monitor}
                         {...props}
                     />
-                </Page>
+                </MonitorEditPage>
             )}
         </Result>
     );

swp/assets/scripts/components/monitor/MonitorEditPage.js

@@ -0,0 +1,10 @@
+import {ClientError} from 'components/Fetch';
+import Page from 'components/Page';
+
+const MonitorEditPage = ({pool: {can_edit: canEdit}, children, ...props}) => (
+    <Page {...props}>
+        {canEdit ? children : <ClientError status={403} />}
+    </Page>
+);
+
+export default MonitorEditPage;

swp/assets/scripts/components/monitor/MonitorQueryEdit/index.js

@@ -5,11 +5,11 @@ import _ from 'utils/i18n';
 import {useQuery} from 'hooks/query';
 
 import {Result} from 'components/Fetch';
-import Page from 'components/Page';
 
 import {useMonitorsBreadcrumb} from '../MonitorList';
 import {useMonitorBreadcrumb} from '../MonitorDetail';
 
+import MonitorEditPage from '../MonitorEditPage';
 import MonitorQueryEditForm from './MonitorQueryEditForm';
 
 const Title = _('Edit Query');
@@ -25,9 +25,9 @@ const MonitorQueryEdit = () => {
     return (
         <Result result={result}>
             {monitor => (
-                <Page title={Title}>
+                <MonitorEditPage pool={monitor.pool} title={Title}>
                     <MonitorQueryEditForm endpoint={endpoint} monitor={monitor} />
-                </Page>
+                </MonitorEditPage>
             )}
         </Result>
     );

swp/utils/scraping/browser.py

@@ -20,7 +20,7 @@
 
 
 @contextmanager
-def tempoary_user_dir():
+def temporary_user_dir():
     with maketempdir() as temp_dir:
         pref_file_path = temp_dir / 'Default' / 'Preferences'
 
@@ -42,7 +42,7 @@ async def open_browser(*args, **kwargs) -> ContextManager[Browser]:
         kwargs.setdefault('devtools', True)
 
     async with async_playwright() as playwright:
-        with tempoary_user_dir() as user_dir:
+        with temporary_user_dir() as user_dir:
             browser = await playwright.chromium.launch_persistent_context(
                 user_dir,
                 *args,