diff --git a/.github/workflows/lint-files.yml b/.github/workflows/lint-files.yml index b2017f97e..5610dae39 100644 --- a/.github/workflows/lint-files.yml +++ b/.github/workflows/lint-files.yml @@ -42,7 +42,7 @@ jobs: timeout-minutes: 20 steps: - name: Harden Runner # Security agent: blocks outbound traffic & detects code overwrite to prevent breaches - uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969 + uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 with: disable-sudo: true disable-file-monitoring: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 620e61674..aa68d0b3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -396,4 +396,10 @@ * Add `chrome-pat` and `chrome-pat-ps` commands to test Private Advertising https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/706 * Close support issues using stale actions. https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/571 * Temporarily remove storybook package https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/702 -* Refactor: Update package scope name to `@google-psat` https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/725 \ No newline at end of file +* Refactor: Update package scope name to `@google-psat` https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/725 + + +#v0.9.0 + +## Extension +Remove facilitated testing page Remove facilitated testing page https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/787 \ No newline at end of file diff --git a/bin/chrome-3pcd-ps.bat b/bin/chrome-3pcd-ps.bat index 89196f567..b19266cf6 100644 --- a/bin/chrome-3pcd-ps.bat +++ b/bin/chrome-3pcd-ps.bat @@ -1,7 +1,7 @@ :: Chrome 3pcd with PS Extension :: Download PS Extension -set "ps_analysis_tool_version=v0.9.0" +set "ps_analysis_tool_version=v0.9.1" cd /d %TEMP% if not exist %TEMP%\ps-analysis-tool-%ps_analysis_tool_version% ( mkdir %TEMP%\ps-analysis-tool-%ps_analysis_tool_version% diff --git a/bin/chrome-default-ps.bat b/bin/chrome-default-ps.bat index 79e44061d..d34e67ad9 100644 --- a/bin/chrome-default-ps.bat +++ b/bin/chrome-default-ps.bat @@ -1,7 +1,7 @@ :: Default Chrome with PS Extension :: Download PS Extension -set "ps_analysis_tool_version=v0.9.0" +set "ps_analysis_tool_version=v0.9.1" cd /d %TEMP% if not exist %TEMP%\ps-analysis-tool-%ps_analysis_tool_version% ( mkdir %TEMP%\ps-analysis-tool-%ps_analysis_tool_version% diff --git a/bin/chrome_launcher.sh b/bin/chrome_launcher.sh index 03d666c2f..249a9f755 100644 --- a/bin/chrome_launcher.sh +++ b/bin/chrome_launcher.sh @@ -2,7 +2,7 @@ # Download Extension extension_setup() { - ps_analysis_tool_version=v0.9.0 + ps_analysis_tool_version=v0.9.1 extension_dir="/var/tmp" cd $extension_dir if [ ! -d $extension_dir/ps-analysis-tool-$ps_analysis_tool_version ]; then diff --git a/package-lock.json b/package-lock.json index 84abf32d1..1f308a98c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ps-analysis-tool", - "version": "0.9.0", + "version": "0.9.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "ps-analysis-tool", - "version": "0.9.0", + "version": "0.9.1", "license": "Apache-2.0", "workspaces": [ "packages/*" @@ -21865,7 +21865,7 @@ }, "packages/eslint-import-resolver": { "name": "@google-psat/eslint-import-resolver", - "version": "0.9.0", + "version": "0.9.1", "license": "Apache-2.0", "dependencies": { "eslint-import-resolver-node": "^0.3.7" @@ -21873,7 +21873,7 @@ }, "packages/extension": { "name": "@google-psat/extension", - "version": "0.9.0", + "version": "0.9.1", "license": "Apache-2.0", "dependencies": { "@floating-ui/core": "^1.5.0", diff --git a/package.json b/package.json index 57cb6d15e..6604e2f61 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ps-analysis-tool", - "version": "0.9.0", + "version": "0.9.1", "description": "Cookie Analysis Tool and CLI for analysis and understanding of cookie usage on web pages.", "scripts": { "build-storybook": "storybook build", diff --git a/packages/design-system/src/components/landingPage/constants.ts b/packages/design-system/src/components/landingPage/constants.ts index d70b94883..5287ca57a 100644 --- a/packages/design-system/src/components/landingPage/constants.ts +++ b/packages/design-system/src/components/landingPage/constants.ts @@ -13,10 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/** - * External dependencies. - */ -import { addUTMParams } from '@google-psat/common'; export const QUICK_LINKS = [ { @@ -35,10 +31,4 @@ export const QUICK_LINKS = [ title: 'reportBreakage', link: 'https://goo.gle/report-3pc-broken', }, - { - title: 'requestMigrationTime', - link: addUTMParams( - 'https://developer.chrome.com/origintrials/#/view_trial/3315212275698106369' - ), - }, ]; diff --git a/packages/eslint-import-resolver/package.json b/packages/eslint-import-resolver/package.json index 2a82836ee..b495bb5e4 100644 --- a/packages/eslint-import-resolver/package.json +++ b/packages/eslint-import-resolver/package.json @@ -1,6 +1,6 @@ { "name": "@google-psat/eslint-import-resolver", - "version": "0.9.0", + "version": "0.9.1", "description": "", "main": "src/index.cjs", "scripts": { diff --git a/packages/extension/package.json b/packages/extension/package.json index 45279421c..74a291520 100644 --- a/packages/extension/package.json +++ b/packages/extension/package.json @@ -1,6 +1,6 @@ { "name": "@google-psat/extension", - "version": "0.9.0", + "version": "0.9.1", "description": "Chrome extension for cookie analysis", "repository": { "type": "git", diff --git a/packages/extension/src/manifest.json b/packages/extension/src/manifest.json index 43d551640..1b6a8ec49 100644 --- a/packages/extension/src/manifest.json +++ b/packages/extension/src/manifest.json @@ -1,7 +1,7 @@ { "name": "Privacy Sandbox Analysis Tool", "description": "Tooling for understanding cookie usage and guidance on new privacy-preserving Chrome APIs.", - "version": "0.9.0", + "version": "0.9.1", "manifest_version": 3, "default_locale": "en", "icons": { diff --git a/packages/extension/src/view/devtools/components/facilitatedTesting/faciliatedTestingContent/index.tsx b/packages/extension/src/view/devtools/components/facilitatedTesting/faciliatedTestingContent/index.tsx deleted file mode 100644 index 9263fe6ae..000000000 --- a/packages/extension/src/view/devtools/components/facilitatedTesting/faciliatedTestingContent/index.tsx +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * External dependencies. - */ -import React from 'react'; - -/** - * Internal dependencies. - */ -import RestrictionInfoContainer from './restrictionInfoContainer'; -import InfoCards from './infoCards'; - -const FacilitatedTestingContent = () => { - return ( -
- - -
- ); -}; - -export default FacilitatedTestingContent; diff --git a/packages/extension/src/view/devtools/components/facilitatedTesting/faciliatedTestingContent/infoCards.tsx b/packages/extension/src/view/devtools/components/facilitatedTesting/faciliatedTestingContent/infoCards.tsx deleted file mode 100644 index c1995c50c..000000000 --- a/packages/extension/src/view/devtools/components/facilitatedTesting/faciliatedTestingContent/infoCards.tsx +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * External dependencies. - */ -import React from 'react'; -import { addUTMParams } from '@google-psat/common'; -import { I18n } from '@google-psat/i18n'; - -const EXPERIMENT_GROUP = () => I18n.getMessage('memberShipInExperimentGroup'); - -const INFO_CARDS_DATA = [ - { - heading: () => 'Third-Party Cookie Depreciation Readiness', - content: () => - 'Discover how companies across the web are gearing up for third-party cookie deprecation. This comprehensive list is compiled with insights from participants who have voluntarily shared their preparations.', - }, - { - heading: EXPERIMENT_GROUP, - content: () => - I18n.getMessage('memberShipInExperimentGroupNote', [ - ``, - '', - ]), - }, - { - heading: () => I18n.getMessage('requestAdditionalMigrationTime'), - content: () => - I18n.getMessage('requestAdditionalMigrationTimeNote', [ - ``, - '', - ``, - '', - ]), - }, - { - heading: () => I18n.getMessage('attestationEnrollment'), - content: () => - I18n.getMessage('attestationEnrollmentNote', [ - ``, - '', - ]), - }, - { - heading: () => I18n.getMessage('reportingBreakages'), - content: () => - I18n.getMessage('reportingBreakagesNote', [ - '', - '', - '', - '', - ]), - }, -]; - -const InfoCards = () => { - return ( - - ); -}; - -export default InfoCards; diff --git a/packages/extension/src/view/devtools/components/facilitatedTesting/faciliatedTestingContent/link.tsx b/packages/extension/src/view/devtools/components/facilitatedTesting/faciliatedTestingContent/link.tsx deleted file mode 100644 index 72c8111ce..000000000 --- a/packages/extension/src/view/devtools/components/facilitatedTesting/faciliatedTestingContent/link.tsx +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * External dependencies. - */ -import React from 'react'; - -interface LinkProps { - href: string; - title: string; -} - -const Link = ({ href, title }: LinkProps) => ( - - {title} - -); - -export default Link; diff --git a/packages/extension/src/view/devtools/components/facilitatedTesting/faciliatedTestingContent/restrictionInfoContainer.tsx b/packages/extension/src/view/devtools/components/facilitatedTesting/faciliatedTestingContent/restrictionInfoContainer.tsx deleted file mode 100644 index 8dc14e944..000000000 --- a/packages/extension/src/view/devtools/components/facilitatedTesting/faciliatedTestingContent/restrictionInfoContainer.tsx +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Internal dependencies. - */ -import React from 'react'; -import { PSTimelineIcon } from '@google-psat/design-system'; -import { addUTMParams } from '@google-psat/common'; -import { I18n } from '@google-psat/i18n'; - -const RestrictionInfoContainer = () => ( -
-

`, - '', - ]), - }} - /> -

- -
-

`, - '', - ]), - }} - /> -

-); - -export default RestrictionInfoContainer; diff --git a/packages/extension/src/view/devtools/components/facilitatedTesting/index.tsx b/packages/extension/src/view/devtools/components/facilitatedTesting/index.tsx deleted file mode 100644 index 6f18891e4..000000000 --- a/packages/extension/src/view/devtools/components/facilitatedTesting/index.tsx +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * External dependencies. - */ -import React from 'react'; -import { I18n } from '@google-psat/i18n'; -import { LandingPage } from '@google-psat/design-system'; - -/** - * Internal dependencies. - */ -import FacilitatedTestingContent from './faciliatedTestingContent'; - -const FacilitatedTesting = () => ( -
- } - extraClasses="2xl:max-w-6xl xl:max-w-4xl max-w-2xl h-fit" - /> -
-); - -export default FacilitatedTesting; diff --git a/packages/extension/src/view/devtools/components/facilitatedTesting/tests/index.tsx b/packages/extension/src/view/devtools/components/facilitatedTesting/tests/index.tsx deleted file mode 100644 index 9b70e2c8b..000000000 --- a/packages/extension/src/view/devtools/components/facilitatedTesting/tests/index.tsx +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * External dependencies. - */ -import React from 'react'; -import { render, screen } from '@testing-library/react'; -import '@testing-library/jest-dom'; -import SinonChrome from 'sinon-chrome'; -/** - * Internal dependencies - */ -import FacilitatedTesting from '..'; -//@ts-ignore -// eslint-disable-next-line import/no-unresolved -import PSInfo from 'ps-analysis-tool/data/PSInfo.json'; -import { act } from 'react-dom/test-utils'; - -describe('FacilitatedTesting Landing Pages', () => { - beforeAll(() => { - globalThis.chrome = SinonChrome as unknown as typeof chrome; - globalThis.fetch = function () { - return Promise.resolve({ - json: () => - Promise.resolve({ - ...PSInfo, - }), - text: () => Promise.resolve({}), - }); - } as unknown as typeof fetch; - }); - - it('should render FacilitatedTesting', async () => { - act(() => { - render(); - }); - expect( - await screen.findByTestId('facilitated-testing-content') - ).toBeInTheDocument(); - }); -}); diff --git a/packages/extension/src/view/devtools/components/index.ts b/packages/extension/src/view/devtools/components/index.ts index 1d225e910..9198cc7c1 100644 --- a/packages/extension/src/view/devtools/components/index.ts +++ b/packages/extension/src/view/devtools/components/index.ts @@ -19,5 +19,4 @@ export * from './siteBoundaries'; export { default as Cookies } from './cookies'; export { default as PrivacySandbox } from './privacySandbox'; export { default as Settings } from './settings'; -export { default as FacilitatedTesting } from './facilitatedTesting'; export { default as Layout } from './layout'; diff --git a/packages/extension/src/view/devtools/tabs.ts b/packages/extension/src/view/devtools/tabs.ts index 0b3868c99..932583b28 100644 --- a/packages/extension/src/view/devtools/tabs.ts +++ b/packages/extension/src/view/devtools/tabs.ts @@ -40,7 +40,6 @@ import { PrivacySandboxIcon, PrivacySandboxIconWhite, type SidebarItems, - InfoIcon, SIDEBAR_ITEMS_KEYS, GroupsIcon, } from '@google-psat/design-system'; @@ -66,7 +65,6 @@ import { Fingerprinting, PrivacySandbox, Settings, - FacilitatedTesting, } from './components'; import { I18n } from '@google-psat/i18n'; import ProtectedAudience from './components/privateAdvertising/protectedAudience'; @@ -237,26 +235,6 @@ const TABS: SidebarItems = { }, }, }, - [SIDEBAR_ITEMS_KEYS.FACILITATED_TESTING]: { - title: () => I18n.getMessage('facilitatedTesting'), - panel: { - Element: FacilitatedTesting, - }, - icon: { - Element: InfoIcon, - props: { - className: 'fill-gray', - }, - }, - selectedIcon: { - Element: InfoIcon, - props: { - className: 'fill-white', - }, - }, - dropdownOpen: false, - children: {}, - }, [SIDEBAR_ITEMS_KEYS.SETTINGS]: { title: () => I18n.getMessage('settings'), panel: { diff --git a/packages/i18n/_locales/messages/en/messages.json b/packages/i18n/_locales/messages/en/messages.json index 830d904d0..423dc09a5 100644 --- a/packages/i18n/_locales/messages/en/messages.json +++ b/packages/i18n/_locales/messages/en/messages.json @@ -977,9 +977,6 @@ "reportBreakage": { "message": "Report a breakage" }, - "requestMigrationTime": { - "message": "Request Additional Migration Time" - }, "quickLinks": { "message": "Quick Links" }, diff --git a/packages/i18n/_locales/messages/es/messages.json b/packages/i18n/_locales/messages/es/messages.json index fb57eb6e5..4d68ca5e9 100644 --- a/packages/i18n/_locales/messages/es/messages.json +++ b/packages/i18n/_locales/messages/es/messages.json @@ -977,9 +977,6 @@ "reportBreakage": { "message": "Informar sobre un fallo" }, - "requestMigrationTime": { - "message": "Solicitar más tiempo para la migración" - }, "quickLinks": { "message": "Enlaces rápidos" }, @@ -1609,9 +1606,6 @@ "fingerprinting": { "message": "Recogida de huella digital" }, - "facilitatedTesting": { - "message": "Pruebas facilitadas" - }, "rwsJsonGenerator": { "message": "Generador de JSON para conjuntos de sitios web relacionados" }, diff --git a/packages/i18n/_locales/messages/hi/messages.json b/packages/i18n/_locales/messages/hi/messages.json index 96207630e..4b573faa8 100644 --- a/packages/i18n/_locales/messages/hi/messages.json +++ b/packages/i18n/_locales/messages/hi/messages.json @@ -977,9 +977,6 @@ "reportBreakage": { "message": "ब्रेकेज की शिकायत करें" }, - "requestMigrationTime": { - "message": "माइग्रेशन के लिए अतिरिक्त समय का अनुरोध करें" - }, "quickLinks": { "message": "क्विक लिंक (खास पेजों पर सीधे पहुंचाने वाले लिंक)" }, @@ -1609,9 +1606,6 @@ "fingerprinting": { "message": "ऑनलाइन ट्रैकिंग" }, - "facilitatedTesting": { - "message": "जांच करने की सुविधा देना" - }, "rwsJsonGenerator": { "message": "Related Website Sets JSON Generator" }, diff --git a/packages/i18n/_locales/messages/ja/messages.json b/packages/i18n/_locales/messages/ja/messages.json index e65152463..2b98784f4 100644 --- a/packages/i18n/_locales/messages/ja/messages.json +++ b/packages/i18n/_locales/messages/ja/messages.json @@ -977,9 +977,6 @@ "reportBreakage": { "message": "障害の報告" }, - "requestMigrationTime": { - "message": "移行期間の延長のリクエスト" - }, "quickLinks": { "message": "クイックリンク" }, @@ -1609,9 +1606,6 @@ "fingerprinting": { "message": "フィンガープリント" }, - "facilitatedTesting": { - "message": "主導テスト" - }, "rwsJsonGenerator": { "message": "関連ウェブサイト セットの JSON 生成ツール" }, diff --git a/packages/i18n/_locales/messages/ko/messages.json b/packages/i18n/_locales/messages/ko/messages.json index b72bd4c1a..2afeeeece 100644 --- a/packages/i18n/_locales/messages/ko/messages.json +++ b/packages/i18n/_locales/messages/ko/messages.json @@ -977,9 +977,6 @@ "reportBreakage": { "message": "중단 신고" }, - "requestMigrationTime": { - "message": "추가 이전 시간 요청" - }, "quickLinks": { "message": "빠른 링크" }, @@ -1609,9 +1606,6 @@ "fingerprinting": { "message": "디지털 지문 수집" }, - "facilitatedTesting": { - "message": "원활한 테스트" - }, "rwsJsonGenerator": { "message": "관련 웹사이트 세트 JSON 생성기" }, diff --git a/packages/i18n/_locales/messages/pt_BR/messages.json b/packages/i18n/_locales/messages/pt_BR/messages.json index 996db6805..3c8a56f38 100644 --- a/packages/i18n/_locales/messages/pt_BR/messages.json +++ b/packages/i18n/_locales/messages/pt_BR/messages.json @@ -977,9 +977,6 @@ "reportBreakage": { "message": "Informar uma falha" }, - "requestMigrationTime": { - "message": "Solicitar mais tempo de migração" - }, "quickLinks": { "message": "Links rápidos" }, @@ -1609,9 +1606,6 @@ "fingerprinting": { "message": "Técnicas de impressão digital" }, - "facilitatedTesting": { - "message": "Teste facilitado" - }, "rwsJsonGenerator": { "message": "Gerador JSON de conjuntos de sites relacionados" },