Merge branch 'donskov/v2' into aslobodian/v2-add-certificate-creation…

…-dialog

src/app.tsx

@@ -50,16 +50,12 @@ export function App() {
   return (
     <>
       <CertificatesSidebar className={styles.sidebar}>
-        {fetching.providers === "pending" ? (
-          // TODO: add loading skeleton
-          "Loading providers list..."
-        ) : (
-          <CertificatesProvidersList
-            providers={providers}
-            currentProviderId={currentProviderId}
-            onSelect={handleProviderChange}
-          />
-        )}
+        <CertificatesProvidersList
+          providers={providers}
+          currentProviderId={currentProviderId}
+          onSelect={handleProviderChange}
+          loading={!fetching.providers || fetching.providers === "pending"}
+        />
       </CertificatesSidebar>
       <CertificatesTopbar
         className={styles.top_bar}

src/components/certificates-providers-list-item/CertificatesProvidersListItem.tsx

@@ -4,10 +4,11 @@ import { useTranslation } from "react-i18next";
 import clsx from "clsx";
 import { Typography } from "@peculiar/react-components";
 import ProviderIcon from "../../icons/provider.svg?react";
+import SmartcardIcon from "../../icons/smartcard.svg?react";
 import styles from "./styles/index.module.scss";
 
 interface CertificatesProvidersListItemProps {
-  provider: IProviderInfo;
+  provider: Pick<IProviderInfo, "id" | "name" | "isRemovable" | "readOnly">;
   isSelected: boolean;
   onClick: (id: string) => void;
 }
@@ -20,15 +21,19 @@ export const CertificatesProvidersListItem: React.FunctionComponent<
 
   return (
     <li
+      tabIndex={0}
       className={clsx(styles.list_item, {
         [styles.current_list_item]: isSelected,
       })}
       onClick={() => {
-        onClick && onClick(provider.id);
+        onClick(provider.id);
       }}
+      onKeyDown={(event) =>
+        ["Enter"].includes(event.code) && onClick(provider.id)
+      }
     >
       <div className={styles.list_item_icon_wrapper}>
-        <ProviderIcon />
+        {provider.isRemovable ? <SmartcardIcon /> : <ProviderIcon />}
       </div>
       <div className={styles.list_item_name_wrapper}>
         <Typography

src/components/certificates-providers-list-item/styles/index.module.scss

@@ -11,6 +11,7 @@
     display: flex;
     flex-direction: column;
     justify-content: center;
+    color: var(--pv-color-gray-9);
     svg {
       width: var(--pv-size-base-6);
       height: var(--pv-size-base-6);
@@ -39,11 +40,13 @@
     background-color: var(--pv-color-primary-tint-5);
     cursor: default;
 
-    .list_item_icon_wrapper svg circle {
-      fill: var(--pv-color-primary);
-    }
-    .list_item_icon_wrapper svg path {
-      stroke: var(--pv-color-primary);
+    .list_item_icon_wrapper {
+      color: var(--pv-color-primary);
     }
   }
+
+  &:focus-visible {
+    outline: 1px solid var(--pv-color-primary);
+    z-index: 1;
+  }
 }

src/components/certificates-providers-list/CertificatesProvidersList.stories.tsx

@@ -0,0 +1,38 @@
+import type { Meta, StoryObj } from "@storybook/react";
+import { fn } from "@storybook/test";
+import { CertificatesProvidersList } from "./CertificatesProvidersList";
+
+const meta: Meta<typeof CertificatesProvidersList> = {
+  title: "Components/CertificatesProvidersList",
+  component: CertificatesProvidersList,
+};
+
+export default meta;
+type Story = StoryObj<typeof CertificatesProvidersList>;
+
+export const Default: Story = {
+  args: {
+    currentProviderId: "1",
+    providers: [
+      {
+        id: "1",
+        name: "Provider 1",
+        isRemovable: false,
+        readOnly: true,
+      },
+      {
+        id: "2",
+        name: "Provider 2",
+        isRemovable: false,
+        readOnly: true,
+      },
+      {
+        id: "3",
+        name: "Smartcard",
+        isRemovable: true,
+        readOnly: true,
+      },
+    ],
+    onSelect: fn(),
+  },
+};

src/components/certificates-providers-list/CertificatesProvidersList.tsx

@@ -3,19 +3,20 @@ import { IProviderInfo } from "@peculiar/fortify-client-core";
 import { useTranslation } from "react-i18next";
 import { CertificatesProvidersListItem } from "../certificates-providers-list-item";
 import AttentionCircleIcon from "../../icons/attention-circle.svg?react";
-import { Typography } from "@peculiar/react-components";
+import { Skeleton, Typography } from "@peculiar/react-components";
 import styles from "./styles/index.module.scss";
 
 interface CertificatesProvidersListProps {
-  providers: IProviderInfo[];
+  providers: Pick<IProviderInfo, "id" | "name" | "isRemovable" | "readOnly">[];
   currentProviderId?: string;
   onSelect?: (id: string) => void;
+  loading?: boolean;
 }
 
 export const CertificatesProvidersList: React.FunctionComponent<
   CertificatesProvidersListProps
 > = (props) => {
-  const { providers, currentProviderId, onSelect } = props;
+  const { providers, currentProviderId, loading, onSelect } = props;
   const { t } = useTranslation();
 
   return (
@@ -24,7 +25,17 @@ export const CertificatesProvidersList: React.FunctionComponent<
         {t("providers.list.label")}
       </Typography>
 
-      {!providers?.length ? (
+      {loading ? (
+        <div className={styles.loading_skeleton}>
+          {[...Array(4).keys()].map((index) => (
+            <Skeleton
+              className={styles.loading_skeleton_item}
+              key={`scel-itm-${index}`}
+              height={50}
+            />
+          ))}
+        </div>
+      ) : !providers?.length ? (
         <div className={styles.empty_list}>
           <div className={styles.empty_list_icon}>
             <AttentionCircleIcon />

src/components/certificates-providers-list/styles/index.module.scss

@@ -9,7 +9,7 @@
   }
 
   .list_wrapper {
-    padding: 0 var(--pv-size-base-2);
+    padding: 1px var(--pv-size-base-2);
     max-height: 100%;
     overflow-y: auto;
     overscroll-behavior: none;
@@ -18,6 +18,20 @@
       flex-direction: column;
     }
   }
+  .loading_skeleton {
+    padding: 0 var(--pv-size-base-2);
+    .loading_skeleton_item {
+      &:nth-child(1) {
+        width: 92%;
+      }
+      &:nth-child(2) {
+        width: 71%;
+      }
+      &:nth-child(4) {
+        width: 78%;
+      }
+    }
+  }
 }
 
 .empty_list {