DBP: Add support for noResultsSelector (#2840)

duckduckgo · Jun 7, 2024 · a6fe664 · a6fe664
1 parent a4e813d
commit a6fe664
Show file tree

Hide file tree

Showing 18 changed files with 33 additions and 20 deletions.
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -12993,7 +12993,7 @@
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 152.0.0;
+				version = 152.0.1;
 			};
 		};
 		9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */ = {

diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -32,17 +32,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "e32733e0e0b03bbac2fec160a2f967a15ed1794b",
-        "version" : "152.0.0"
+        "revision" : "43d6c090699ddc1b92c0c016dc31b923fb06f59f",
+        "version" : "152.0.1"
       }
     },
     {
       "identity" : "content-scope-scripts",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/content-scope-scripts",
       "state" : {
-        "revision" : "fa861c4eccb21d235e34070b208b78bdc32ece08",
-        "version" : "5.17.0"
+        "revision" : "ba2ad0c3a14a8c07d7be8b50a20b47efea207e86",
+        "version" : "5.19.0"
       }
     },
     {

diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift
@@ -29,7 +29,7 @@ let package = Package(
             targets: ["DataBrokerProtection"])
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "152.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "152.0.1"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../XPCHelper"),
     ],

diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/Actions/Extract.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/Actions/Extract.swift
@@ -20,6 +20,7 @@ struct ExtractAction: Action {
     let id: String
     let actionType: ActionType
     let selector: String
+    let noResultsSelector: String?
     let profile: ExtractProfileSelectors
     let dataSource: DataSource?
 }
diff --git a/...es/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswhizr.com.json b/...es/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswhizr.com.json
@@ -1,7 +1,7 @@
 {
   "name": "PeoplesWhizr",
   "url": "peopleswhizr.com",
-  "version": "0.1.7",
+  "version": "0.2.0",
   "parent": "peoplewhiz.com",
   "addedDatetime": 1709445600000,
   "steps": [
@@ -18,6 +18,7 @@
           "actionType": "extract",
           "id": "bc952139-373b-4461-8e24-83661038f657",
           "selector": "[class^='ResultsTable__Record-sc']",
+          "noResultsSelector": "div[class^=ResultNotFound__NoResults]",
           "profile": {
             "name": {
               "selector": "[class^='ResultsTable__Name-sc']"

diff --git a/...ages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswiz.com.json b/...ages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswiz.com.json
@@ -1,7 +1,7 @@
 {
   "name": "PeoplesWiz",
   "url": "peopleswiz.com",
-  "version": "0.1.7",
+  "version": "0.2.0",
   "parent": "peoplewhiz.com",
   "addedDatetime": 1709445600000,
   "steps": [
@@ -18,6 +18,7 @@
           "actionType": "extract",
           "id": "9e1e6ff5-cb99-49aa-a37c-b3dc80012f19",
           "selector": "[class^='ResultsTable__Record-sc']",
+          "noResultsSelector": "div[class^=ResultNotFound__NoResults]",
           "profile": {
             "name": {
               "selector": "[class^='ResultsTable__Name-sc']"

diff --git a/...s/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswizard.com.json b/...s/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswizard.com.json
@@ -1,7 +1,7 @@
 {
   "name": "PeoplesWizard",
   "url": "peopleswizard.com",
-  "version": "0.1.7",
+  "version": "0.2.0",
   "parent": "peoplewhiz.com",
   "addedDatetime": 1709445600000,
   "steps": [
@@ -18,6 +18,7 @@
           "actionType": "extract",
           "id": "c538d04e-85ce-46a5-bbbd-3f9bd0fae078",
           "selector": "[class^='ResultsTable__Record-sc']",
+          "noResultsSelector": "div[class^=ResultNotFound__NoResults]",
           "profile": {
             "name": {
               "selector": "[class^='ResultsTable__Name-sc']"

diff --git a/...ages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhiz.com.json b/...ages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhiz.com.json
@@ -1,7 +1,7 @@
 {
   "name": "PeopleWhiz.com",
   "url": "peoplewhiz.com",
-  "version": "0.1.7",
+  "version": "0.2.0",
   "addedDatetime": 1676160000000,
   "steps": [
     {
@@ -17,6 +17,7 @@
           "actionType": "extract",
           "id": "efa321f2-f214-411f-a87b-bc42feff7931",
           "selector": "[class^='ResultsTable__Record-sc']",
+          "noResultsSelector": "div[class^=ResultNotFound__NoResults]",
           "profile": {
             "name": {
               "selector": "[class^='ResultsTable__Name-sc']"

diff --git a/...ages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhiz.net.json b/...ages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhiz.net.json
@@ -1,7 +1,7 @@
 {
   "name": "PeopleWhiz.net",
   "url": "peoplewhiz.net",
-  "version": "0.1.7",
+  "version": "0.2.0",
   "parent": "peoplewhiz.com",
   "addedDatetime": 1709424000000,
   "steps": [
@@ -18,6 +18,7 @@
           "actionType": "extract",
           "id": "9e0d566b-dd31-40a7-9315-ec6fba8d6233",
           "selector": "[class^='ResultsTable__Record-sc']",
+          "noResultsSelector": "div[class^=ResultNotFound__NoResults]",
           "profile": {
             "name": {
               "selector": "[class^='ResultsTable__Name-sc']"

diff --git a/...es/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhized.com.json b/...es/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhized.com.json
@@ -1,7 +1,7 @@
 {
   "name": "PeopleWhized.com",
   "url": "peoplewhized.com",
-  "version": "0.1.7",
+  "version": "0.2.0",
   "parent": "peoplewhiz.com",
   "addedDatetime": 1709424000000,
   "steps": [
@@ -18,6 +18,7 @@
           "actionType": "extract",
           "id": "77517554-f1e7-4e73-b0d1-92f56a0f247c",
           "selector": "[class^='ResultsTable__Record-sc']",
+          "noResultsSelector": "div[class^=ResultNotFound__NoResults]",
           "profile": {
             "name": {
               "selector": "[class^='ResultsTable__Name-sc']"

diff --git a/...es/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhized.net.json b/...es/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhized.net.json
@@ -1,7 +1,7 @@
 {
   "name": "PeopleWhized.net",
   "url": "peoplewhized.net",
-  "version": "0.1.7",
+  "version": "0.2.0",
   "parent": "peoplewhiz.com",
   "addedDatetime": 1709445600000,
   "steps": [
@@ -18,6 +18,7 @@
           "actionType": "extract",
           "id": "440406f6-bd8a-4af7-b509-43eb24c79e4c",
           "selector": "[class^='ResultsTable__Record-sc']",
+          "noResultsSelector": "div[class^=ResultNotFound__NoResults]",
           "profile": {
             "name": {
               "selector": "[class^='ResultsTable__Name-sc']"

diff --git a/...ges/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhizr.com.json b/...ges/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhizr.com.json
@@ -1,7 +1,7 @@
 {
   "name": "PeopleWhizr.com",
   "url": "peoplewhizr.com",
-  "version": "0.1.7",
+  "version": "0.2.0",
   "parent": "peoplewhiz.com",
   "addedDatetime": 1709445600000,
   "steps": [
@@ -18,6 +18,7 @@
           "actionType": "extract",
           "id": "21a783ce-7a7e-4a97-8dc2-ee4c2f3dc63a",
           "selector": "[class^='ResultsTable__Record-sc']",
+          "noResultsSelector": "div[class^=ResultNotFound__NoResults]",
           "profile": {
             "name": {
               "selector": "[class^='ResultsTable__Name-sc']"

diff --git a/...ges/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhizr.net.json b/...ges/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhizr.net.json
@@ -1,7 +1,7 @@
 {
   "name": "PeopleWhizr.net",
   "url": "peoplewhizr.net",
-  "version": "0.1.7",
+  "version": "0.2.0",
   "parent": "peoplewhiz.com",
   "addedDatetime": 1709445600000,
   "steps": [
@@ -18,6 +18,7 @@
           "actionType": "extract",
           "id": "2955fb45-374e-42f2-a72a-f7a2ffe4ebe5",
           "selector": "[class^='ResultsTable__Record-sc']",
+          "noResultsSelector": "div[class^=ResultNotFound__NoResults]",
           "profile": {
             "name": {
               "selector": "[class^='ResultsTable__Name-sc']"

diff --git a/...kages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewiz.com.json b/...kages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewiz.com.json
@@ -1,7 +1,7 @@
 {
   "name": "PeopleWiz",
   "url": "peoplewiz.com",
-  "version": "0.1.7",
+  "version": "0.2.0",
   "parent": "peoplewhiz.com",
   "addedDatetime": 1709445600000,
   "steps": [
@@ -18,6 +18,7 @@
           "actionType": "extract",
           "id": "36ba376d-03c1-4ecc-92ed-2fe12bd79d6f",
           "selector": "[class^='ResultsTable__Record-sc']",
+          "noResultsSelector": "div[class^=ResultNotFound__NoResults]",
           "profile": {
             "name": {
               "selector": "[class^='ResultsTable__Name-sc']"

diff --git a/...es/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewizard.net.json b/...es/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewizard.net.json
@@ -1,7 +1,7 @@
 {
   "name": "PeopleWizard.net",
   "url": "peoplewizard.net",
-  "version": "0.1.7",
+  "version": "0.2.0",
   "parent": "peoplewhiz.com",
   "addedDatetime": 1709445600000,
   "steps": [
@@ -18,6 +18,7 @@
           "actionType": "extract",
           "id": "f6d41239-9208-419e-b101-c58e52a71d42",
           "selector": "[class^='ResultsTable__Record-sc']",
+          "noResultsSelector": "div[class^=ResultNotFound__NoResults]",
           "profile": {
             "name": {
               "selector": "[class^='ResultsTable__Name-sc']"

diff --git a/...ages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewizr.com.json b/...ages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewizr.com.json
@@ -1,7 +1,7 @@
 {
   "name": "PeopleWizr",
   "url": "peoplewizr.com",
-  "version": "0.1.7",
+  "version": "0.2.0",
   "parent": "peoplewhiz.com",
   "addedDatetime": 1709445600000,
   "steps": [
@@ -18,6 +18,7 @@
           "actionType": "extract",
           "id": "53c86c5d-3960-44a9-91a3-143b71d1e07f",
           "selector": "[class^='ResultsTable__Record-sc']",
+          "noResultsSelector": "div[class^=ResultNotFound__NoResults]",
           "profile": {
             "name": {
               "selector": "[class^='ResultsTable__Name-sc']"

diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift
@@ -32,7 +32,7 @@ let package = Package(
         .library(name: "VPNAppLauncher", targets: ["VPNAppLauncher"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "152.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "152.0.1"),
         .package(url: "https://github.com/airbnb/lottie-spm", exact: "4.4.1"),
         .package(path: "../AppLauncher"),
         .package(path: "../XPCHelper"),

diff --git a/LocalPackages/SubscriptionUI/Package.swift b/LocalPackages/SubscriptionUI/Package.swift
@@ -12,7 +12,7 @@ let package = Package(
             targets: ["SubscriptionUI"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "152.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "152.0.1"),
         .package(path: "../SwiftUIExtensions")
     ],
     targets: [