Merge pull request #21 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

src/components/CippCards/CippInfoBar.jsx

@@ -1,46 +1,45 @@
-import React, { useState } from "react";
-import { Box, Card, Stack, SvgIcon, Typography, Skeleton, Tooltip } from "@mui/material";
-import { Grid } from "@mui/system";
-import { CippOffCanvas } from "../CippComponents/CippOffCanvas";
-import { CippPropertyListCard } from "./CippPropertyListCard";
+import React, { useState, Fragment } from 'react'
+import { Box, Card, Stack, SvgIcon, Typography, Skeleton, Tooltip } from '@mui/material'
+import { Grid } from '@mui/system'
+import { CippOffCanvas } from '../CippComponents/CippOffCanvas'
+import { CippPropertyListCard } from './CippPropertyListCard'
 
 export const CippInfoBar = ({ data, isFetching }) => {
-  const [visibleIndex, setVisibleIndex] = useState(null);
+  const [visibleIndex, setVisibleIndex] = useState(null)
 
   return (
     <Card>
       <Grid container>
         {data.map((item, index) => (
-          <>
+          <Fragment key={item.name}>
             <Grid
               size={{ md: 3, sm: 6, xs: 12 }}
-              key={item.name}
               onClick={item.offcanvas ? () => setVisibleIndex(index) : undefined}
               sx={{
-                cursor: item.offcanvas ? "pointer" : "default",
+                cursor: item.offcanvas ? 'pointer' : 'default',
                 borderBottom: (theme) => ({
                   xs: `1px solid ${theme.palette.divider}`,
-                  md: "none",
+                  md: 'none',
                 }),
                 borderRight: (theme) => ({
                   md: `1px solid ${theme.palette.divider}`,
                 }),
-                "&:nth-of-type(3)": {
+                '&:nth-of-type(3)': {
                   borderBottom: (theme) => ({
                     xs: `1px solid ${theme.palette.divider}`,
-                    sm: "none",
+                    sm: 'none',
                   }),
                 },
-                "&:nth-of-type(4)": {
-                  borderBottom: "none",
-                  borderRight: "none",
+                '&:nth-of-type(4)': {
+                  borderBottom: 'none',
+                  borderRight: 'none',
                 },
               }}
             >
               <Stack alignItems="center" direction="row" spacing={2} sx={{ p: 2, minWidth: 0 }}>
                 {item?.icon && (
                   <SvgIcon
-                    color={item.color ? item.color : "primary"}
+                    color={item.color ? item.color : 'primary'}
                     fontSize="small"
                     sx={{ flexShrink: 0 }}
                   >
@@ -52,57 +51,57 @@ export const CippInfoBar = ({ data, isFetching }) => {
                     <Box
                       sx={() => {
                         if (!item?.icon) {
-                          return { pl: 2, minWidth: 0, flex: 1 };
+                          return { pl: 2, minWidth: 0, flex: 1 }
                         }
-                        return { minWidth: 0, flex: 1 };
+                        return { minWidth: 0, flex: 1 }
                       }}
                     >
                       <Typography
                         color="text.secondary"
                         variant="overline"
                         sx={{
-                          display: "block",
-                          overflow: "hidden",
-                          textOverflow: "ellipsis",
-                          whiteSpace: "nowrap",
+                          display: 'block',
+                          overflow: 'hidden',
+                          textOverflow: 'ellipsis',
+                          whiteSpace: 'nowrap',
                         }}
                       >
                         {item.name}
                       </Typography>
                       <Typography
                         variant="h6"
-                        sx={{ overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}
+                        sx={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}
                       >
-                        {isFetching ? <Skeleton width={"100%"} /> : item.data}
+                        {isFetching ? <Skeleton width={'100%'} /> : item.data}
                       </Typography>
                     </Box>
                   </Tooltip>
                 ) : (
                   <Box
                     sx={() => {
                       if (!item?.icon) {
-                        return { pl: 2, minWidth: 0, flex: 1 };
+                        return { pl: 2, minWidth: 0, flex: 1 }
                       }
-                      return { minWidth: 0, flex: 1 };
+                      return { minWidth: 0, flex: 1 }
                     }}
                   >
                     <Typography
                       color="text.secondary"
                       variant="overline"
                       sx={{
-                        display: "block",
-                        overflow: "hidden",
-                        textOverflow: "ellipsis",
-                        whiteSpace: "nowrap",
+                        display: 'block',
+                        overflow: 'hidden',
+                        textOverflow: 'ellipsis',
+                        whiteSpace: 'nowrap',
                       }}
                     >
                       {item.name}
                     </Typography>
                     <Typography
                       variant="h6"
-                      sx={{ overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}
+                      sx={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}
                     >
-                      {isFetching ? <Skeleton width={"100%"} /> : item.data}
+                      {isFetching ? <Skeleton width={'100%'} /> : item.data}
                     </Typography>
                   </Box>
                 )}
@@ -111,17 +110,17 @@ export const CippInfoBar = ({ data, isFetching }) => {
             {item.offcanvas && (
               <>
                 <CippOffCanvas
-                  title={item?.offcanvas?.title || "Details"}
+                  title={item?.offcanvas?.title || 'Details'}
                   size="md"
                   visible={visibleIndex === index}
                   onClose={() => setVisibleIndex(null)}
                 >
                   <Box
                     sx={{
-                      overflowY: "auto",
-                      maxHeight: "100%",
-                      display: "flex",
-                      flexDirection: "column",
+                      overflowY: 'auto',
+                      maxHeight: '100%',
+                      display: 'flex',
+                      flexDirection: 'column',
                     }}
                   >
                     <Grid container spacing={1}>
@@ -140,9 +139,9 @@ export const CippInfoBar = ({ data, isFetching }) => {
                 </CippOffCanvas>
               </>
             )}
-          </>
+          </Fragment>
         ))}
       </Grid>
     </Card>
-  );
-};
+  )
+}

src/data/standards.json

@@ -5998,6 +5998,12 @@
         "placeholder": "e.g. https://example.com/*",
         "helperText": "Enter URLs to allowlist in the extension. Press enter to add each URL. Wildcards are allowed. This should be used for sites that are being blocked by the extension but are known to be safe."
       },
+      {
+        "type": "switch",
+        "name": "standards.DeployCheckChromeExtension.domainSquattingEnabled",
+        "label": "Enable domain squatting detection",
+        "defaultValue": true
+      },
       {
         "type": "textField",
         "name": "standards.DeployCheckChromeExtension.companyName",
@@ -6026,6 +6032,27 @@
         "placeholder": "support@yourcompany.com",
         "required": false
       },
+      {
+        "type": "textField",
+        "name": "standards.DeployCheckChromeExtension.supportUrl",
+        "label": "Support URL",
+        "placeholder": "https://support.yourcompany.com",
+        "required": false
+      },
+      {
+        "type": "textField",
+        "name": "standards.DeployCheckChromeExtension.privacyPolicyUrl",
+        "label": "Privacy Policy URL",
+        "placeholder": "https://yourcompany.com/privacy",
+        "required": false
+      },
+      {
+        "type": "textField",
+        "name": "standards.DeployCheckChromeExtension.aboutUrl",
+        "label": "About URL",
+        "placeholder": "https://yourcompany.com/about",
+        "required": false
+      },
       {
         "type": "textField",
         "name": "standards.DeployCheckChromeExtension.primaryColor",