Merge main and add skip

Author: Hani Yacoub

.github/workflows/check-beta.yml

@@ -2,7 +2,7 @@ name: Check new beta version
 
 on:
   schedule:
-    - cron: "34 */1 * * *"
+    - cron: "40 */1 * * *"
 env:
   LATEST: ""
 permissions:
@@ -59,7 +59,7 @@ jobs:
   Run-L10N-Mac-Smoke:
     needs: Check-Beta-Version
     if: ${{ needs.Check-Beta-Version.outputs.mac_l10n_reportable == 'True' }}
-    uses: ./.github/workflows/l10n_smoke.yml
+    uses: ./.github/workflows/l10n.yml
     with:
       job_to_run: L10N-MacOS
     secrets: inherit

SELECTOR_INFO.md

@@ -3043,6 +3043,12 @@ Location: Toolbar
 Path to .json: modules/data/panel_ui.components.json
 ```
 ```
+Selector name: panel-main-view
+Description: Main body of Panel UI
+Location: See above
+Path to .json: modules/data/panel_ui.components.json
+```
+```
 Selector name: sync-user-button
 Selector Data: toolbarbutton[id='fxa-toolbar-menu-button']
 Description: Account button
@@ -3148,6 +3154,12 @@ Location: Firefox menu
 Path to .json: modules/data/panel_ui.components.json
 ```
 ```
+Selector name: panel-ui-history-view
+Description: Subview of Panel UI
+Location: See above
+Path to .json: modules/data/panel_ui.components.json
+```
+```
 Selector name: panel-ui-history-recently-closed
 Selector Data: appMenuRecentlyClosedTabs
 Description: Recently closed tabs

collect_executables.py

@@ -146,23 +146,23 @@ def get_gd_platform():
             beta = int(beta)
 
             next_major = f"{major + 1}.0b1"
-            fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{next_major}-candidates/build1/"
+            fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{next_major}-candidates/"
             rs = requests.get(fx_download_dir_url)
             if rs.status_code < 300:
                 latest_beta_ver = next_major
                 this_beta = next_major
                 continue
 
             next_minor = f"{major}.{minor + 1}b1"
-            fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{next_minor}-candidates/build1/"
+            fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{next_minor}-candidates/"
             rs = requests.get(fx_download_dir_url)
             if rs.status_code < 300:
                 latest_beta_ver = next_minor
                 this_beta = next_minor
                 continue
 
             next_beta = f"{major}.{minor}b{beta + 1}"
-            fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{next_beta}-candidates/build1/"
+            fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{next_beta}-candidates/"
             rs = requests.get(fx_download_dir_url)
             if rs.status_code < 300:
                 latest_beta_ver = next_beta
@@ -171,20 +171,23 @@ def get_gd_platform():
 
             candidate_exists = False
 
-        status = 200
-        build = 0
-        while status < 400 and build < 20:
-            build += 1
-            fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{latest_beta_ver}-candidates/build{build}/"
-
-            # Fetch the page
-            response = requests.get(fx_download_dir_url)
-            status = response.status_code
-
-        # Correct build is the last one that didn't 404
-        build -= 1
-        fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{latest_beta_ver}-candidates/build{build}/{get_fx_platform()}/{language}/"
-
+        # Look for the latest build
+        fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{latest_beta_ver}-candidates/"
+        response = requests.get(fx_download_dir_url)
+        build = 1
+        if response.status_code < 300:
+            soup = BeautifulSoup(response.text, "html.parser")
+            executable_name = ""
+            # Extract the text of each line
+            for line in soup.find_all("a"):
+                line_text = line.getText().split(".")
+                if not line_text[0]:
+                    continue
+                # Get the executable name
+                build = max(int(line_text[0][-2]), build)
+            fx_download_dir_url = f"https://archive.mozilla.org/pub/firefox/candidates/{latest_beta_ver}-candidates/build{build}/{get_fx_platform()}/{language}/"
+
+    # Get the corresponding executable
     response = requests.get(fx_download_dir_url)
     status = response.status_code
     response_text = None

l10n_CM/constants/amazon/DE/amazon_ad.json

@@ -3,8 +3,8 @@
   "field_mapping": {
     "country": "90b596de-e266-4e66-9530-2e41b184555d",
     "name": "28f5f493-ad18-4e7c-99fa-524bc768ed7a",
-    "telephone": "28f5f493-ad18-4e7c-99fa-524bc768ed7a",
-    "address_level_1": "a5fb9e4c-60a0-42a2-9e4a-6a067b55d208",
+    "telephone": "c384d303-3e2b-4b8a-ba89-c741056fc9b4",
+    "street_address": "a5fb9e4c-60a0-42a2-9e4a-6a067b55d208",
     "organization": "9e8475b3-e1a5-46cf-9af0-6f2caab918fe",
     "address_level_2": "67cbe0f8-dbe4-4afd-a077-765186bcf0b3",
     "postal_code": "e38f3160-4ce5-4804-b5d5-b92c3ccc499e"
@@ -13,7 +13,7 @@
   "fields": [
     "90b596de-e266-4e66-9530-2e41b184555d",
     "28f5f493-ad18-4e7c-99fa-524bc768ed7a",
-    "28f5f493-ad18-4e7c-99fa-524bc768ed7a",
+    "c384d303-3e2b-4b8a-ba89-c741056fc9b4",
     "a5fb9e4c-60a0-42a2-9e4a-6a067b55d208",
     "9e8475b3-e1a5-46cf-9af0-6f2caab918fe",
     "67cbe0f8-dbe4-4afd-a077-765186bcf0b3",

l10n_CM/constants/amazon/FR/amazon_ad.json

@@ -1,20 +1,20 @@
 {
   "url": "http://127.0.0.1:8080/amazon_ad.html",
   "field_mapping": {
-    "country": "da8fcb20-ecdb-44de-8fe6-d0086af67e96",
-    "name": "53cea474-f431-4d44-bf79-83e28ff8afc1",
-    "telephone": "c75098c8-1441-4e12-93bd-e213af1dc745",
-    "address_level_1": "e1311f61-d43d-403a-94b4-127107489157",
-    "address_level_2": "3809592b-2557-4035-b089-1adbe42a51ad",
-    "postal_code": "122f5d67-36a2-47c7-b759-8ab92103d602"
+    "country": "ec708d25-c69f-48a6-80f1-be4e96b6db04",
+    "name": "87e21b43-187e-400b-bd9d-fd889f9fbaa0",
+    "telephone": "499c2ea7-72a7-4e8f-8f76-5e37bb793016",
+    "street_address": "3f36ea97-c7d4-4334-baba-ed7bb1d31230",
+    "address_level_2": "ef31ec08-7a7a-4a82-b68e-495d3154700c",
+    "postal_code": "71d96b8d-e26c-4aab-bfd7-b2bdb6b4ceb7"
   },
   "form_field": "*[data-moz-autofill-inspect-id='{name}']",
   "fields": [
-    "da8fcb20-ecdb-44de-8fe6-d0086af67e96",
-    "53cea474-f431-4d44-bf79-83e28ff8afc1",
-    "c75098c8-1441-4e12-93bd-e213af1dc745",
-    "e1311f61-d43d-403a-94b4-127107489157",
-    "3809592b-2557-4035-b089-1adbe42a51ad",
-    "122f5d67-36a2-47c7-b759-8ab92103d602"
+    "ec708d25-c69f-48a6-80f1-be4e96b6db04",
+    "87e21b43-187e-400b-bd9d-fd889f9fbaa0",
+    "499c2ea7-72a7-4e8f-8f76-5e37bb793016",
+    "3f36ea97-c7d4-4334-baba-ed7bb1d31230",
+    "ef31ec08-7a7a-4a82-b68e-495d3154700c",
+    "71d96b8d-e26c-4aab-bfd7-b2bdb6b4ceb7"
   ]
 }

l10n_CM/constants/amazon/FR/amazon_cc.json

@@ -9,7 +9,7 @@
   "form_field": "*[data-moz-autofill-inspect-id='{name}']",
   "fields": [
     "4bfc1932-75e6-436c-b195-a443beb1adfc",
-    "4f630b6e-efd1-458d-9762-9a12a3dd28de",
+    "b48f8715-36a7-4c89-8c64-5a5471f7d9f2",
     "fe1bdc2d-e0e3-477b-9d4a-416221ad0851",
     "68a5e85d-d8c5-4d10-9827-394263770656"
   ]

l10n_CM/constants/bestbuy/US/bestbuy_ad.json

@@ -12,6 +12,7 @@
 
  },
  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+ "skip": "True",
  "fields": [
     "24fa9bb9-032c-4aa5-a829-8f3c8950cba3",
     "ca35b256-a76c-476b-bc50-5e651c0a20fe",

l10n_CM/constants/bestbuy/US/bestbuy_cc.json

@@ -6,6 +6,7 @@
     "cvv": "3752da40-c202-4c98-8c7b-4d211ed879c4"
 },
   "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "skip": "True",
   "fields": [
     "619571c7-fa6e-4b47-a8e2-a6e36fec376a",
     "2a9ecff6-145f-48de-a8f7-f1ac282885b9",

l10n_CM/constants/etsy/CA/etsy_ad.json

@@ -0,0 +1,21 @@
+{
+ "url": "http://127.0.0.1:8080/etsy_ad.html",
+ "field_mapping": {
+    "name": "7771b652-4623-4583-9545-a9a8fefb3df3",
+    "street_address": "4502ed8f-43f4-4eb4-aa1a-444f42b54f3c",
+    "address_level_2": "22534994-3376-45b8-8255-144bd5fae86e",
+    "address_level_1": "e76a5693-ac48-4b3f-8c1e-1a20dc209b95",
+    "postal_code": "82c605d7-c9b8-4573-a44b-6fac3db96bc0",
+     "email": "ba1830ab-adad-4026-ad15-356f03489722"
+ },
+
+ "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+ "fields": [
+    "7771b652-4623-4583-9545-a9a8fefb3df3",
+    "4502ed8f-43f4-4eb4-aa1a-444f42b54f3c",
+    "22534994-3376-45b8-8255-144bd5fae86e",
+    "e76a5693-ac48-4b3f-8c1e-1a20dc209b95",
+    "82c605d7-c9b8-4573-a44b-6fac3db96bc0",
+    "ba1830ab-adad-4026-ad15-356f03489722"
+ ]
+}

l10n_CM/constants/etsy/CA/etsy_cc.json

@@ -0,0 +1,18 @@
+{
+  "url": "http://127.0.0.1:8080/etsy_cc.html",
+  "field_mapping": {
+    "name": "f1cb6519-4fb3-4e1e-8286-12ddd1c8e237",
+    "card_number": "f27252a3-c5aa-4062-b422-a879c746d772",
+    "expiration_month": "fbf757ed-9628-48d1-8eb4-21486fec38fc",
+    "expiration_year": "42841b42-61a2-4651-b9a4-33ae12a8243e",
+    "cvv": "7f6eebc8-8281-4653-9940-5fd90ddd62c4"
+  },
+  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "fields": [
+    "f1cb6519-4fb3-4e1e-8286-12ddd1c8e237",
+    "f27252a3-c5aa-4062-b422-a879c746d772",
+    "fbf757ed-9628-48d1-8eb4-21486fec38fc",
+    "42841b42-61a2-4651-b9a4-33ae12a8243e",
+    "7f6eebc8-8281-4653-9940-5fd90ddd62c4"
+  ]
+}