Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Malware status support and design updates #249

Closed
wants to merge 23 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions build/app/img/refresh-assets/Success-128.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions build/app/img/refresh-assets/chrevron--down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 1 addition & 9 deletions debugger/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,7 @@ const keys = Object.keys(states);
/**
* @type {Screen[]}
*/
const validInitialScreens = [
'breakageForm',
'promptBreakageForm',
'toggleReport',
'choiceBreakageForm',
'categoryTypeSelection',
'categorySelection',
'primaryScreen',
];
const validInitialScreens = ['breakageForm', 'breakageFormFinalStep', 'toggleReport', 'primaryScreen'];
const screens = Object.fromEntries(validInitialScreens.map((x) => [x, x]));

const items = [
Expand Down
33 changes: 18 additions & 15 deletions global.types.d.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
import { AndroidBreakageDialog } from './v2/android-breakage-dialog';

declare global {
namespace preact.JSX {
interface IntrinsicElements {
'ddg-android-breakage-dialog': {
items: [string, string][];
title: string;
cancelText: string;
okText: string;
ref: import('preact').RefObject<AndroidBreakageDialog | null>;
};
}
}
}
/* Example declaration of a custom element
*
* import { AndroidBreakageDialog } from './v2/android-breakage-dialog';
*
* declare global {
* namespace preact.JSX {
* interface IntrinsicElements {
* 'ddg-android-breakage-dialog': {
* items: [string, string][];
* title: string;
* cancelText: string;
* okText: string;
* ref: import('preact').RefObject<AndroidBreakageDialog | null>;
* };
* }
* }
* }
*/

export {};
28 changes: 8 additions & 20 deletions guides/breakage-flows.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,27 @@ title: Breakage flows

# Breakage flows

### Flow 1: Show Category-type selection when 'Website not working?' is clicked
### Flow 1: Open primary breakage reporting screen (category type selection)

Open the dashboard with the following query params

- `breakageScreen=categoryTypeSelection`
- `screen=breakageForm`

### Flow 2: Show Category selection when 'Website not working?' is clicked
### Flow 2: Open secondary ategory selection directly (like from a menu)

Open the dashboard with the following query params

- `breakageScreen=categorySelection`
- `screen=breakageFormCategorySelection`

### Flow 3: Open Category-type selection directly (like from a menu)
### Flow 3: Open the final screen of the Breakage Form directly:

Open the dashboard with the following query params

- `screen=categoryTypeSelection`

### Flow 4: Open Category selection directly (like from a menu)

Open the dashboard with the following query params

- `screen=categorySelection`

### Flow 5: Open the new Breakage Form directly:

Open the dashboard with the following query params

- `screen=choiceBreakageForm`
- `screen=breakageFormFinalStep`
- `category=videos` (this can be any valid category value)

### Flow 6: Open the new Breakage Form directly
### Flow 4: Open the final screen of the Breakage Form directly:

Open the dashboard with the following query params

- `screen=choiceBreakageForm`
- `screen=breakageFormFinalStep`
28 changes: 28 additions & 0 deletions guides/toggle-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ This is called immediately to retrieve the data needed to render the list.
- WebKit: {@link "macOS integration".privacyDashboardGetToggleReportOptions}
- Other platforms will be added

See also: [Data disclosure item ids and their meanings](#appendix-data-disclosure-item-ids-and-their-meanings)

## Step 4: Implement new handlers

The following are all sent in response to user interactions
Expand All @@ -42,3 +44,29 @@ The following are all sent in response to user interactions
### 👆Tapping anywhere on the success screen (macos only)

- Webkit: {@link "macOS integration".privacyDashboardClose}

## Appendix: Data disclosure item ids and their meanings

| ID | Description |
| ------------------- | ------------------------------------------------------------------------------------------------------------------ |
| appVersion | App version number |
| atb | Anonymous experiment group for feature testing |
| description | Your selected category and optional comments |
| device | Device make, model, and manufacturer |
| didOpenReportInfo | Whether or not you opted to show this report info |
| errorDescriptions | Browser-reported errors |
| extensionVersion | Extension version number |
| features | List of which browser features were active |
| httpErrorCodes | Website response status (HTTP) codes |
| jsPerformance | How quickly parts of the page loaded |
| lastSentDay | Date of last report sent for this site |
| listVersions | Information about which versions of our protections were active |
| locale | Primary language and country of your device |
| openerContext | How you got to this page, either: "SERP" (DuckDuckGo search), "Navigation" (link/URL), or "External" (other means) |
| os | Operating system version number |
| reportFlow | Which reporting form you used ("menu", "dashboard", etc.) |
| requests | Hostnames of trackers blocked, surrogate requests, ignored requests, and requests not in tracker blocking list |
| siteUrl | Page URL (without identifiable info) |
| toggleReportCounter | Number of times protections were toggled off |
| userRefreshCount | Number of refreshes since page load |
| wvVersion | Web browser engine version number |
97 changes: 0 additions & 97 deletions integration-tests/AltBreakageFlows.js

This file was deleted.

Loading
Loading