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

Place open tab suggestions before history and bookmark suggestions #3728

Merged
merged 23 commits into from
Jan 17, 2025

Conversation

mallexxx
Copy link
Collaborator

Task/Issue URL: https://app.asana.com/0/0/1209138127674910/f
BSK PR: duckduckgo/BrowserServicesKit#1158
iOS PR: duckduckgo/iOS#3800

Description:

  • Fixes Open Tab suggestions ranking to prevail over history records and bookmarks

Steps to test this PR:

  1. create multiple bookmarks containing "duck" word
  2. search for "Duck", open multiple links, wait for the tabs to load and close them
  3. open couple of tabs containing "duck" word but not contained in the bookmarks or the newly created history records
  4. open a new tab, enter "duck", validate the open tabs are suggested

Definition of Done:


Internal references:

Pull Request Review Checklist
Software Engineering Expectations
Technical Design Template
Pull Request Documentation

mallexxx and others added 5 commits January 14, 2025 15:04
Task/Issue URL:
https://app.asana.com/0/608920331025329/1209014062691302/f
Tech Design URL:
CC:

**Description**:

**Optional E2E tests**:
- [x] Run PIR E2E tests
Check this to run the Personal Information Removal end to end tests. If
updating CCF, or any PIR related code, tick this.

**Steps to test this PR**:
1.

<!--
Tagging instructions
If this PR isn't ready to be merged for whatever reason it should be
marked with the `DO NOT MERGE` label (particularly if it's a draft)
If it's pending Product Review/PFR, please add the `Pending Product
Review` label.

If at any point it isn't actively being worked on/ready for
review/otherwise moving forward (besides the above PR/PFR exception)
strongly consider closing it (or not opening it in the first place). If
you decide not to close it, make sure it's labelled to make it clear the
PRs state and comment with more information.
-->

**Definition of Done**:

* [ ] Does this PR satisfy our [Definition of
Done](https://app.asana.com/0/1202500774821704/1207634633537039/f)?

---
###### Internal references:
[Pull Request Review
Checklist](https://app.asana.com/0/1202500774821704/1203764234894239/f)
[Software Engineering
Expectations](https://app.asana.com/0/59792373528535/199064865822552)
[Technical Design
Template](https://app.asana.com/0/59792373528535/184709971311943)
[Pull Request
Documentation](https://app.asana.com/0/1202500774821704/1204012835277482/f)
Task/Issue URL:
https://app.asana.com/0/1199230911884351/1208647902506360/f
Tech Design URL:
CC:

**Description**:

Adds support for conditional clicking of elements by adding “choices”
and “default” keys to the click action.

**Optional E2E tests**:
- [x] Run PIR E2E tests
Check this to run the Personal Information Removal end to end tests. If
updating CCF, or any PIR related code, tick this.

**Steps to test this PR**:
The easiest way to test whether the decoding is working is to setup one
of the test files from the C-S-S integration tests as a fake broker:

1. Download [this
file](https://github.com/duckduckgo/content-scope-scripts/blob/main/injected/integration-test/test-pages/broker-protection/pages/expectation-actions.html)
on your local machine. Open it to copy the file path, should start with
`file://`
2. Download [this
JSON](https://gist.github.com/brianhall/969d81b04b8d4fff4e21c9c6b48164b9)
and update the url to the file path you copied in 1.
3. Save the JSON file in the macos-browser repo under
`LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON`
4. Build the browser (no need for any special dependencies, just build
`main`), then open the debug version of PIR: Debug Menu -> Personal
Information Removal -> Run Personal Information Removal in Debug Mode.
5. In Birth Year enter `1965`, then select **Test Broker** in the list
of brokers and click the Run button.
6. After about 30 seconds, right click the webview and Inspect Element,
then click the console tab and type `window.location.href` and hit
enter. You should see a url that ends with `#1`, which means that the
user was older than 45.
7. Do steps 5-6 again, but for birth year enter `1990`, when you do
`window.location.href` you should get a url that ends with `#2` instead,
indicating that the user is < 45.
8. Edit the mybrokertest.com.json file, copy/paste the contents of [this
gist](https://gist.github.com/brianhall/ebac912c56c5e904ec86c05e3fa3ab30)
in and save. This just sets the default case at the bottom to `null`.
_Now re-build the browser to load the updated JSON._
9. Run steps 5-7 again, this time `window.location.href` should return a
url with `#1` for step 5, and a url with no `#` at the end for step 7,
meaning that nothing was clicked and no error was triggered.
10. Edit the mybrokertest.com.json file again and remove line 45 (and
the comma above on line 44) and then rebuild the browser to update the
JSON. Finally steps 5-7 again - step 5 should return no errors (and have
a `#1` hash at the end of the url), and step 7 should not return an
error, but also not have any hash (e.g. `#1`) at the end of the url.

**Definition of Done**:

* [ ] Does this PR satisfy our [Definition of
Done](https://app.asana.com/0/1202500774821704/1207634633537039/f)?

—
###### Internal references:
[Pull Request Review
Checklist](https://app.asana.com/0/1202500774821704/1203764234894239/f)
[Software Engineering
Expectations](https://app.asana.com/0/59792373528535/199064865822552)
[Technical Design
Template](https://app.asana.com/0/59792373528535/184709971311943)
[Pull Request
Documentation](https://app.asana.com/0/1202500774821704/1204012835277482/f)
Copy link
Contributor

@brindy brindy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Task/Issue URL: https://app.asana.com/0/1204099484721401/1209111326156032/f
Tech Design URL:
CC:

Description:

Fixes issue causing DuckPlayer to render the same (incorrect) video

###### Internal references:
[Pull Request Review
Checklist](https://app.asana.com/0/1202500774821704/1203764234894239/f)
[Software Engineering
Expectations](https://app.asana.com/0/59792373528535/199064865822552)
[Technical Design
Template](https://app.asana.com/0/59792373528535/184709971311943)
[Pull Request
Documentation](https://app.asana.com/0/1202500774821704/1204012835277482/f)
Copy link
Contributor

@brindy brindy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[edit] - sorry didn't see the approval and knew it was good. 👍

SabrinaTardio and others added 16 commits January 15, 2025 15:24
Task/Issue URL: https://app.asana.com/0/0/1209153206410271/f

**Description**: Re-enable new onboarding on old mac-OS version after
fix is available on C-S-S
Task/Issue URL:
https://app.asana.com/0/1203108348835387/1209150117333883/f

iOS PR: duckduckgo/iOS#3808
BSK PR: duckduckgo/BrowserServicesKit#1164

## Description

Adds the VPN App Exclusions remote feature-flag with support for
overriding locally.
Task/Issue URL:
https://app.asana.com/0/72649045549333/1209009315184468/f

**Description**:
Previously, default Privacy Pro links were sent to
`/subscriptions/welcome`, and the frontend redirected to
`/subscriptions`.
Task/Issue URL: https://app.asana.com/0/1199230911884351/1209141686015373/f
Tech Design URL:
CC:

Description:

This PR renames workflow files and names to include the macOS platform string. This is to differentiate them from iOS workflows once we move to a monorepo.
Copy link
Contributor

Warnings
⚠️ PR has more than 500 lines of code changing. Consider splitting into smaller PRs if possible.

Generated by 🚫 dangerJS against f683b4d

@mallexxx mallexxx merged commit 757a2b7 into alex/tab-search Jan 17, 2025
19 of 20 checks passed
@mallexxx mallexxx deleted the alex/open-tab-ranking branch January 17, 2025 11:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants