Skip to content

Commit 5779c8d

Browse files
committed
fix: updates for PR comments
1 parent 623a50e commit 5779c8d

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

site/src/components/Tabs/Tabs.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ export const Tabs: FC<TabsProps> = ({ className, active, ...htmlProps }) => {
1919
<div
2020
// Because the Tailwind preflight is not used, its necessary to set border style to solid and
2121
// reset all border widths to 0 https://tailwindcss.com/docs/border-width#using-without-preflight
22-
className={cn("border-0 border-b border-solid border-border", className)}
22+
className={cn(
23+
"border-0 border-b border-solid border-border",
24+
className,
25+
)}
2326
{...htmlProps}
2427
/>
2528
</TabsContext.Provider>

site/src/pages/ManagementSettingsPage/IdpSyncPage/IdpSyncPage.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { Link } from "components/Link/Link";
1515
import { Paywall } from "components/Paywall/Paywall";
1616
import { useFeatureVisibility } from "modules/dashboard/useFeatureVisibility";
1717
import { useOrganizationSettings } from "modules/management/OrganizationSettingsLayout";
18-
import { type FC, useEffect } from "react";
18+
import type { FC } from "react";
1919
import { Helmet } from "react-helmet-async";
2020
import { useMutation, useQueries, useQueryClient } from "react-query";
2121
import { useParams } from "react-router-dom";
@@ -59,11 +59,11 @@ export const IdpSyncPage: FC = () => {
5959
);
6060

6161
const error =
62+
patchGroupSyncSettingsMutation.error ||
63+
patchRoleSyncSettingsMutation.error ||
6264
groupIdpSyncSettingsQuery.error ||
6365
roleIdpSyncSettingsQuery.error ||
64-
groupsQuery.error ||
65-
patchGroupSyncSettingsMutation.error ||
66-
patchRoleSyncSettingsMutation.error;
66+
groupsQuery.error;
6767

6868
const groupsMap = new Map<string, string>();
6969
if (groupsQuery.data) {

site/src/pages/ManagementSettingsPage/IdpSyncPage/IdpSyncPageView.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,6 @@ export const RolesTab: Story = {
8585
const canvas = within(canvasElement);
8686
const rolesTab = await canvas.findByText("Role sync settings");
8787
await user.click(rolesTab);
88-
await expect(canvas.findByText("IdP role")).resolves.toBeVisible();
88+
await expect(canvas.findByText("IdP role")).toBeVisible();
8989
},
9090
};

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy