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

Fix: Regression testing for 0.4 release. #348

Merged
merged 22 commits into from
Dec 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
6 changes: 6 additions & 0 deletions packages/cli-dashboard/src/app.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
@tailwind base;
@tailwind components;
@tailwind utilities;

@layer utilities {
.no-scrollbar::-webkit-scrollbar {
display: none;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ const CookiesListing = ({
title: 'Platform',
},
isBlocked: {
title: 'Cookie Accepted',
title: 'Cookie Affected',
description:
"Whether the cookie was accepted(set) in Chrome's Cookie Store",
hasStaticFilterValues: true,
Expand All @@ -270,7 +270,7 @@ const CookiesListing = ({
},
comparator: (value: InfoType, filterValue: string) => {
const val = !value;
return val === (filterValue === 'True');
return val === (filterValue === 'False');
},
},
}),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const ListRow = ({ row }: Props) => {
href={row.link}
target="_blank"
rel="noreferrer"
className="text-sm text-analytics font-medium leading-6 dark:text-medium-persian-blue"
className="text-sm text-bright-navy-blue dark:text-jordy-blue font-medium leading-6"
>
{row.title}
</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ const Details = ({ selectedCookie }: DetailsProps) => {
<p className="mb-4 text-outer-space-crayola dark:text-bright-gray">
{selectedCookie.analytics?.description || 'No description available.'}
</p>
{selectedCookie.isBlocked && (
{selectedCookie.isBlocked && blockedReasons && (
<>
<p className="font-bold text-granite-gray dark:text-manatee mb-1">
Blocked reason
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const QuickLinksList = () => {
href="https://privacysandbox.com/news/"
target="_blank"
rel="noreferrer"
className="leading-6 text-sm text-analytics dark:text-medium-persian-blue font-semibold px-3 border border-american-silver dark:border-quartz rounded inline-flex gap-2 items-center"
className="leading-6 text-sm text-bright-navy-blue dark:text-jordy-blue font-semibold px-3 border border-american-silver dark:border-quartz rounded inline-flex gap-2 items-center"
>
View More <ChevronRight />
</a>
Expand Down
15 changes: 6 additions & 9 deletions packages/extension/src/view/devtools/app.css
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
@tailwind base;

@tailwind components;
@tailwind utilities;
@layer utilities {
@variants responsive {
/* Hide scrollbar for Chrome, Safari and Opera */
.no-scrollbar::-webkit-scrollbar {
display: none;
}
/* Hide scrollbar for Chrome, Safari and Opera */
.no-scrollbar::-webkit-scrollbar {
display: none;
}
}
@layer base {
body {
@apply font-sans;
}
:root{
:root {
--color-message-box-dark: 33deg 14% 18%;
--color-message-box-light: 30deg 100% 75%;
}
}
@tailwind components;
@tailwind utilities;
23 changes: 22 additions & 1 deletion packages/extension/src/view/devtools/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ const App: React.FC = () => {
<InspectButton
isInspecting={isInspecting}
setIsInspecting={setIsInspecting}
isTabFocused={isSidebarFocused}
isTabFocused={isSidebarFocused && isKeySelected('cookies')}
/>
);
} else {
Expand Down Expand Up @@ -204,6 +204,27 @@ const App: React.FC = () => {
updateSelectedItemKey(selectedFrame || 'cookies');
}, [selectedFrame, tabUrl, updateSelectedItemKey]);

useEffect(() => {
const storeChangeListener = async () => {
const tabId = chrome.devtools.inspectedWindow.tabId.toString();

const getTabBeingListenedTo = await chrome.storage.local.get();

if (
getTabBeingListenedTo &&
tabId.toString() !== getTabBeingListenedTo?.tabToRead
) {
updateSelectedItemKey('cookies');
}
};

chrome.storage.onChanged.addListener(storeChangeListener);

return () => {
chrome.storage.onChanged.removeListener(storeChangeListener);
};
}, [updateSelectedItemKey]);

const [filteredCookies, setFilteredCookies] = useState<CookieTableData[]>([]);

const handleUpdate = useCallback(
Expand Down
Loading