Merge pull request #28 from MozillaSecurity/a-bunch-of-stuff

A few smaller changes

Author: denschub

.gitignore

@@ -4,18 +4,21 @@
 # Generated by Finder in Mac OS X
 .DS_Store
 
-# JetBrains
+# Editors
 .idea/
+.vscode/
 
 coverage/
 server/db.sqlite3
 server/settings.secret
 server/static/
 server/logs/
 
+.venv/
 src/WebCompatManager.egg-info/
 build/
 dist/
+uv.lock
 
 # Code coverage
 .coverage*

pyproject.toml

@@ -31,7 +31,7 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-dev = ["pre-commit", "tox"]
+dev = ["pre-commit", "tox", "ruff==0.6.5"]
 docker = [
     "gunicorn~=22.0.0",
     "mozilla-django-oidc~=4.0.1",

server/frontend/src/components/Buckets/List.vue

@@ -162,7 +162,7 @@
                   sortKeys.includes('-bug__external_id'),
               }"
             >
-              External Bug
+              Details
             </th>
           </tr>
         </thead>

server/frontend/src/components/Buckets/ReportPreviewRow.vue

@@ -5,10 +5,6 @@
       <span class="two-line-limit">{{ report.url }}</span>
     </td>
     <td class="wrap-normal">{{ report.comments }}</td>
-    <td>{{ report.app_name }}</td>
-    <td>{{ report.app_channel }}</td>
-    <td>{{ report.app_version }}</td>
-    <td>{{ report.breakage_category }}</td>
     <td>
       <img
         v-if="report.os === 'Linux'"
@@ -40,6 +36,28 @@
       />
       <span v-else>{{ report.os }}</span>
     </td>
+    <td>{{ report.app_name }}</td>
+    <td>{{ report.app_channel }}</td>
+    <td>{{ report.app_version }}</td>
+    <td>{{ report.breakage_category }}</td>
+    <td>
+      {{
+        report.details.boolean
+          .broken_site_report_tab_info_antitracking_has_tracking_content_blocked
+      }}
+    </td>
+    <td>
+      {{
+        report.details.string
+          .broken_site_report_tab_info_antitracking_block_list
+      }}
+    </td>
+    <td>
+      {{
+        report.details.boolean
+          .broken_site_report_tab_info_antitracking_is_private_browsing
+      }}
+    </td>
   </tr>
 </template>
 

server/frontend/src/components/Buckets/Row.vue

@@ -25,33 +25,23 @@
     </td>
     <td>
       <a
-        v-if="bucket.bug && bucket.bug_urltemplate"
-        :class="{ fixedbug: bucket.bug_closed }"
-        :href="bucket.bug_urltemplate"
-        target="_blank"
+        class="btn btn-default"
+        title="View details and comments"
+        :href="bucket.view_url"
       >
-        {{ bucket.bug }}
+        View details and comments
       </a>
-      <p v-else-if="bucket.bug">
-        {{ bucket.bug }} on {{ bucket.bug_hostname }}
-      </p>
-      <div v-else-if="canEdit" class="btn-group">
-        <assignbutton :bucket="bucket.id" :providers="providers" />
-        <a :href="bucket.new_bug_url" class="btn btn-danger">File a bug</a>
-      </div>
     </td>
   </tr>
 </template>
 
 <script>
 import { date } from "../../helpers";
-import AssignBtn from "./AssignBtn.vue";
 import ActivityGraph from "../ActivityGraph.vue";
 
 export default {
   components: {
     activitygraph: ActivityGraph,
-    assignbutton: AssignBtn,
   },
   filters: {
     date: date,

server/frontend/src/components/Buckets/View.vue

@@ -150,11 +150,14 @@
               <th>Date Reported</th>
               <th>URL</th>
               <th>User Comments</th>
+              <th>OS</th>
               <th>App</th>
               <th>Channel</th>
               <th>Version</th>
               <th>Breakage Category</th>
-              <th>OS</th>
+              <th>ETP content blocked?</th>
+              <th>ETP blocklist</th>
+              <th>Is PBM?</th>
             </tr>
           </thead>
           <tbody>
@@ -201,7 +204,7 @@ import AssignBtn from "./AssignBtn.vue";
 import HideBucketBtn from "./HideBucketBtn.vue";
 import ReportPreviewRow from "./ReportPreviewRow.vue";
 
-const pageSize = 10;
+const pageSize = 50;
 
 export default {
   components: {

server/frontend/tests/buckets_list.test.js

@@ -81,9 +81,5 @@ test("bucket list has two buckets", async () => {
   // Assert two buckets (one assigned to a bug, the other not) are displayed in the table
   expect(document.querySelectorAll("tbody tr").length).toBe(2);
   getByText("A short description for bucket 1");
-  const buttonLink = getByText("1630739");
-  expect(buttonLink).toHaveProperty("href", buckets.results[0].bug_urltemplate);
-  expect(buttonLink).toHaveProperty("target", "_blank");
   getByText("A short description for bucket 2");
-  getByText("Assign an existing bug");
 });

server/reportmanager/management/commands/import_reports_from_bigquery.py

@@ -1,7 +1,6 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-import json
 from contextlib import suppress
 from logging import getLogger
 from urllib.parse import urlsplit
@@ -52,7 +51,7 @@ def handle(self, *args, **options):
                 app_version=row.app_version,
                 breakage_category=row.breakage_category,
                 comments=row.comments,
-                details=json.loads(row.details),
+                details=row.details,
                 reported_at=row.reported_at.replace(tzinfo=timezone.utc),
                 url=urlsplit(row.url),
                 os=row.os,

server/server/settings.py

@@ -119,6 +119,16 @@ def resolver_context_processor(request):
 
 USE_OIDC = False
 
+
+# Credentials to connect to BigQuery
+# This is using service account credentials directly.
+# If not specified, gcloud will look for Application Default Credentials or
+# use a service account attached to the Compute VM.
+
+BIGQUERY_PROJECT = "moz-fx-dev-dschubert-wckb"
+BIGQUERY_TABLE = "moz-fx-dev-dschubert-wckb.webcompat_user_reports.user_reports_prod"
+BIGQUERY_SERVICE_ACCOUNT = ""
+
 # Modify the way we generate our usernames, based on the email address
 # OIDC_USERNAME_ALGO = 'server.auth.generate_username'
 #