Merge branch 'add-analysis-permission-endpoint' into 'dev'

fetch list analysis in fetch hook in order to not block page display while...

See merge request !97

client-nuxt/components/DataTableActions.vue

@@ -16,6 +16,7 @@
       :sort-desc="sortDesc"
       :search="search"
       :item-class="getRowClass"
+      :loading="loading"
       multi-sort
       @click:row="goToItemPage"
     >
@@ -105,6 +106,7 @@ export default {
     itemType: { type: String, required: true, default: 'object' },
     addRoute: { type: Object, default: () => null },
     selectedItem: { type: Number, default: null },
+    loading: { type: Boolean, default: false },
   },
   data() {
     return {

client-nuxt/pages/projects/_id/analysis/index.vue

@@ -9,6 +9,7 @@
         :headers="headers"
         :add-route="addAnalysisRoute"
         :selected-item="selectedItem"
+        :loading="$fetchState.pending"
         @delete="deleteAnalysis"
       ></data-table-actions>
       <ProgressBar :waiting="waiting" message="Deleting Analysis" />
@@ -21,18 +22,6 @@ import ProgressBar from '@/components/ProgressBar'
 import ErrorAlert from '@/components/ErrorAlert'
 import DataTableActions from '~/components/DataTableActions.vue'
 
-function fetchAnalysis($axios, params) {
-  try {
-    return $axios.$get(`/api/projects/${params.id}/analysis/`)
-  } catch (error) {
-    if (error.response.status === 403) {
-      return []
-    } else {
-      throw error
-    }
-  }
-}
-
 export default {
   components: {
     ErrorAlert,
@@ -42,8 +31,25 @@ export default {
   loading: {
     continuous: true,
   },
+  async fetch() {
+    try {
+      this.analysis = await this.$axios.$get(
+        `/api/projects/${this.$route.params.id}/analysis/`
+      )
+    } catch (error) {
+      if (error.response.status === 403) {
+        return []
+      } else {
+        throw error
+      }
+    }
+  },
   async asyncData({ params, $axios }) {
-    return { analysis: await fetchAnalysis($axios, params) }
+    return {
+      permissions: await $axios.$get(
+        `/api/projects/${params.id}/analysis/permissions/`
+      ),
+    }
   },
   data() {
     return {
@@ -72,10 +78,17 @@ export default {
     }
   },
   computed: {
+    permissionsSet() {
+      return new Set(this.permissions)
+    },
     addAnalysisRoute() {
-      return {
-        name: 'projects-id-analysis-add',
-        params: this.$route.params,
+      if (this.permissionsSet.has('add')) {
+        return {
+          name: 'projects-id-analysis-add',
+          params: this.$route.params,
+        }
+      } else {
+        return null
       }
     },
     sanitizedAnalysis() {
@@ -89,6 +102,10 @@ export default {
       return parseInt(this.$route.params?.analysisId)
     },
   },
+  mounted() {
+    this.$fetch()
+  },
+
   methods: {
     getItemRoute({ id: analysisId }) {
       return {
@@ -107,7 +124,7 @@ export default {
         await this.$axios.$delete(
           `/api/projects/${params.id}/analysis/${analysisId}`
         )
-        this.analysis = await fetchAnalysis(this.$axios, params)
+        this.$fetch()
         this.updateAnalysisCount()
         this.$emit('update-analysis')
       } catch (error) {

server/api/views.py

@@ -931,6 +931,17 @@ class ProjectAnalysisViewSet(viewsets.ModelViewSet):
     def perform_destroy(self, instance):
         instance.delete()
 
+    @action(detail=False)
+    def permissions(self, request, pk=None, project_pk=None):
+        current_user = request.user
+        return Response(
+            [
+                perm.split(".")[1].split("_")[0]
+                for perm in current_user.get_all_permissions()
+                if perm.endswith("analysis")
+            ]
+        )
+
     @action(detail=True)
     def lodscores(self, request, pk=None, project_pk=None):
         # Get the lodscores