From a12326a982f6f6c5382c493c3d895041f270bf91 Mon Sep 17 00:00:00 2001 From: amitpanwar789 Date: Sun, 22 Dec 2024 13:35:11 +0530 Subject: [PATCH 1/7] fixed tables, icon changed, left nav bar selected issue fixed --- .../web/polaris_web/web/public/Logo_white.svg | 4 ++ .../layouts/LearnPopoverComponent.jsx | 2 +- .../components/layouts/header/Headers.css | 13 +++++-- .../components/layouts/header/Headers.js | 1 + .../components/layouts/leftnav/LeftNav.css | 8 +++- .../components/layouts/leftnav/LeftNav.js | 33 ++++++++++++----- .../components/shared/ConfirmationModal.jsx | 37 ++++++++++--------- .../components/shared/TitleWithInfo.jsx | 11 +++--- .../components/tables/GithubServerTable.js | 4 +- .../components/tables/rows/GithubRow.js | 2 +- .../dashboard/components/tables/rows/row.css | 14 +++---- .../dashboard/components/tables/style.css | 2 +- .../src/apps/dashboard/pages/Dashboard.jsx | 3 +- .../src/apps/dashboard/pages/dashboard.css | 6 +-- .../src/apps/dashboard/pages/home/HomePage.js | 2 +- .../AllSensitiveData/AllSensitiveData.jsx | 1 - .../api_collections/ApiCollections.jsx | 16 +++++--- .../CreateNewCollectionModal.jsx | 5 +-- .../pages/observe/api_collections/RunTest.jsx | 2 +- .../observe/api_collections/api_inventory.css | 2 + .../pages/observe/data_types/DataTypes.css | 9 +++++ .../apps/dashboard/pages/observe/transform.js | 2 +- .../pages/quick_start/QuickStart.css | 4 -- .../quick_start/components/BurpSource.jsx | 7 ++-- .../quick_start/components/PostmanSource.jsx | 3 +- .../shared/InformationBannerComponent.jsx | 4 +- .../components/shared/NoAccessComponent.jsx | 3 +- .../dashboard/pages/settings/Settings.jsx | 4 +- .../dashboard/pages/settings/about/About.jsx | 2 +- .../settings/integrations/Integrations.jsx | 13 +++++++ .../pages/settings/nav/SettingsLeftNav.jsx | 29 ++++++++++----- .../dashboard/pages/settings/settings.css | 8 ++++ .../pages/test_editor/TestEditor.css | 29 +++++++++++++-- .../pages/test_editor/TestEditor.jsx | 2 +- .../web/src/apps/dashboard/store.js | 2 + .../web/src/apps/main/PersistStore.js | 2 +- .../web/src/apps/signup/styles.css | 2 +- .../web/polaris_web/web/src/util/func.js | 3 +- 38 files changed, 195 insertions(+), 101 deletions(-) create mode 100644 apps/dashboard/web/polaris_web/web/public/Logo_white.svg diff --git a/apps/dashboard/web/polaris_web/web/public/Logo_white.svg b/apps/dashboard/web/polaris_web/web/public/Logo_white.svg new file mode 100644 index 0000000000..edd38f1a38 --- /dev/null +++ b/apps/dashboard/web/polaris_web/web/public/Logo_white.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/LearnPopoverComponent.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/LearnPopoverComponent.jsx index b2855855a2..0406bb6aea 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/LearnPopoverComponent.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/LearnPopoverComponent.jsx @@ -23,7 +23,7 @@ function LearnPopoverComponent({learnMoreObj}) { setPopoverActive(!popoverActive)} disclosure> + )} diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/header/Headers.css b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/header/Headers.css index 00aef2b842..8c8705e103 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/header/Headers.css +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/header/Headers.css @@ -14,6 +14,13 @@ fill: #6D3BEF !important; } -.local_icon .Polaris-Icon__Svg { - fill: #2C6ECB !important; -} \ No newline at end of file +/* .Polaris-TopBar-Menu__Activator:not(:hover){ + background: transparent !important; +} */ + +.Polaris-TopBar-Menu__Activator:hover{ + --border-gradient-bg-hover: var(--p-color-bg-fill-hover)!important; + --border-gradient-border-hover: var(--p-color-border-gradient-hover)!important; + --border-gradient-bg-selected: var(--p-color-button-gradient-bg-fill-selected)!important; + --border-gradient-border-selected: var(--p-color-border-gradient-selected)!important; +} diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/header/Headers.js b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/header/Headers.js index 0dceb86ebe..c8984d649e 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/header/Headers.js +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/header/Headers.js @@ -165,6 +165,7 @@ export default function Header() { }, ]} initials={func.initials(username)} + name={username} open={isUserMenuOpen} onToggle={toggleIsUserMenuOpen} /> diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/leftnav/LeftNav.css b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/leftnav/LeftNav.css index c99c8fd8e9..74a225b959 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/leftnav/LeftNav.css +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/leftnav/LeftNav.css @@ -5,10 +5,14 @@ justify-content: space-between; } -.active .Polaris-Navigation__Item--selected::before{ +/* .active .Polaris-Navigation__Item--selected::before{ width: 0 !important; } .active .Polaris-Navigation__SecondaryNavigation .Polaris-Navigation__Item--selected::before{ width: 0.1875rem !important; -} \ No newline at end of file +} */ + +.active .Polaris-Navigation__PrimaryNavigation > .Polaris-Navigation__Section > .Polaris-Navigation__ListItem > .Polaris-Navigation__ItemWrapper > .Polaris-Navigation__ItemInnerWrapper.Polaris-Navigation__ItemInnerWrapper--selected { + background: transparent !important; +} diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/leftnav/LeftNav.js b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/leftnav/LeftNav.js index 6f2db8f863..a88514c551 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/leftnav/LeftNav.js +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/leftnav/LeftNav.js @@ -8,6 +8,19 @@ import { ChartVerticalFilledIcon, SearchResourceIcon, AlertDiamondIcon, + ChartVerticalIcon, + AppsIcon, + InventoryIcon, + TargetIcon, + FileIcon, + SearchRecentIcon, + CollectionIcon, + CollectionFilledIcon, + BlankFilledIcon, + BlankIcon, + LiveFilledIcon, + LiveIcon, + SettingsIcon } from "@shopify/polaris-icons"; import {useLocation, useNavigate} from "react-router-dom" @@ -39,7 +52,7 @@ export default function LeftNav(){ items={[ { label: Quick Start, - icon: AppsFilledIcon, + icon: (leftNavSelected === 'dashboard_quick_start')? AppsIcon : AppsFilledIcon, onClick: ()=>{ handleSelect("dashboard_quick_start") setActive("normal") @@ -50,7 +63,7 @@ export default function LeftNav(){ }, { label:API Security Posture, - icon: SearchResourceIcon, + icon: (leftNavSelected === 'dashboard_home')? ChartVerticalIcon : ChartVerticalFilledIcon, onClick: ()=>{ handleSelect("dashboard_home") navigate("/dashboard/home") @@ -62,11 +75,11 @@ export default function LeftNav(){ { url: '#', label: API Discovery, - icon: InventoryFilledIcon, + icon: (leftNavSelected.includes('_observe'))? CollectionIcon : CollectionFilledIcon, onClick: ()=>{ handleSelect("dashboard_observe_inventory") navigate('/dashboard/observe/inventory') - setActive("normal") + setActive("active") }, selected: leftNavSelected.includes('_observe'), subNavigationItems:[ @@ -103,11 +116,11 @@ export default function LeftNav(){ { url: '#', label: Testing, - icon: TargetFilledIcon, + icon: (leftNavSelected.includes('_testing'))? TargetIcon : TargetFilledIcon, onClick: ()=>{ navigate('/dashboard/testing/') handleSelect('dashboard_testing') - setActive("normal") + setActive("active") }, selected: leftNavSelected.includes('_testing'), subNavigationItems:[ @@ -143,7 +156,7 @@ export default function LeftNav(){ }, { label: Test Editor, - icon: FileFilledIcon, + icon: (leftNavSelected.includes("dashboard_test_editor"))? FileIcon : FileFilledIcon, onClick: ()=>{ handleSelect("dashboard_test_editor") navigate("/dashboard/test-editor/REMOVE_TOKENS") @@ -154,7 +167,7 @@ export default function LeftNav(){ }, { label: Issues, - icon: ChartVerticalFilledIcon, + icon: (leftNavSelected === 'dashboard_issues')? BlankIcon : BlankFilledIcon, onClick: ()=>{ handleSelect("dashboard_issues") navigate("/dashboard/issues") @@ -166,7 +179,7 @@ export default function LeftNav(){ window?.STIGG_FEATURE_WISE_ALLOWED?.THREAT_DETECTION?.isGranted ? { label: API Runtime Threats, - icon: AlertDiamondIcon, + icon: (leftNavSelected === 'dashboard_threat_detection')? LiveIcon : LiveFilledIcon, onClick: () => { handleSelect("dashboard_threat_detection") navigate("/dashboard/threat-detection") @@ -181,7 +194,7 @@ export default function LeftNav(){ items={[ { label:Settings, - icon: SettingsFilledIcon, + icon: (currPathString === 'settings')? SettingsIcon : SettingsFilledIcon, onClick: ()=>{ navigate("/dashboard/settings/about") setActive("normal") diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/shared/ConfirmationModal.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/shared/ConfirmationModal.jsx index 7f013b2c72..e3b14e3bd8 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/shared/ConfirmationModal.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/shared/ConfirmationModal.jsx @@ -7,7 +7,7 @@ function ConfirmationModal(props) { const confirmationModalConfig = Store(state => state.confirmationModalConfig) const setConfirmationModalConfig = Store(state => state.setConfirmationModalConfig) - const { modalContent, primaryActionContent, primaryAction } = props + const {modalTitle, modalContent, primaryActionContent, primaryAction } = props function closeModal(){ setConfirmationModalConfig({ @@ -19,22 +19,25 @@ function ConfirmationModal(props) { } return ( - closeModal()} - title="Are you sure ?" - primaryAction={{ - content: primaryActionContent, - onAction: () => { - primaryAction() - closeModal() - } - }} - > - - {modalContent} - - +
+ closeModal()} + title={(modalTitle==="")? "Are you sure?" : modalTitle} + primaryAction={{ + destructive:(primaryActionContent === "Remove collection")?true:false, + content: primaryActionContent, + onAction: () => { + primaryAction() + closeModal() + } + }} + > + + {modalContent} + + +
) } diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/shared/TitleWithInfo.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/shared/TitleWithInfo.jsx index 4e162ef4ce..9d2399f14a 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/shared/TitleWithInfo.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/shared/TitleWithInfo.jsx @@ -1,7 +1,8 @@ -import { Avatar, Box, InlineStack, Link, Popover, Text, Tooltip } from '@shopify/polaris' +import { Avatar, Box, Icon, InlineStack, Link, Popover, Text, Tooltip } from '@shopify/polaris' +import {InfoIcon} from '@shopify/polaris-icons' import React, { useState } from 'react' -function TitleWithInfo({titleComp, textProps, titleText, tooltipContent, docsUrl}) { +function TitleWithInfo({titleComp, textProps, titleText, tooltipContent, docsUrl, tone}) { const content = docsUrl ? @@ -14,7 +15,7 @@ function TitleWithInfo({titleComp, textProps, titleText, tooltipContent, docsUrl const [contentActive,setContentActive] = useState(false) return ( - {titleComp ? titleComp : {titleText}} + {titleComp ? titleComp : {titleText}} {docsUrl ?
- +
} @@ -43,7 +44,7 @@ function TitleWithInfo({titleComp, textProps, titleText, tooltipContent, docsUrl : tooltipContent ?
- +
: null } diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/tables/GithubServerTable.js b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/tables/GithubServerTable.js index 5e2e5bbb38..1e3d3975c9 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/tables/GithubServerTable.js +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/tables/GithubServerTable.js @@ -11,7 +11,8 @@ import { ChoiceList, Tabs, Text, - Link} from '@shopify/polaris'; + Link, + Divider} from '@shopify/polaris'; import { GithubRow} from './rows/GithubRow'; import { useState, useCallback, useEffect, useMemo } from 'react'; import "./style.css" @@ -430,6 +431,7 @@ function GithubServerTable(props) { > {rowMarkup} + {(total !== 0 && !props?.hidePagination) && diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/tables/rows/GithubRow.js b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/tables/rows/GithubRow.js index 93af6999a5..ec202660da 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/tables/rows/GithubRow.js +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/tables/rows/GithubRow.js @@ -247,7 +247,7 @@ function GithubRow(props) { id={data.id} key={data.id} position={index} - {...props.newRow ? {tone: ((index % 2) ? "subdued" : '')} : {} } + {...props.newRow ? {tone: ((index % 2) ? '' : '')} : {} } {...props.notHighlightOnselected ? {} : {selected: selectedResources.includes(data?.id)}} onClick={() => handleRowClick(data)} > diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/tables/rows/row.css b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/tables/rows/row.css index d43ba4a947..10fc9cf407 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/tables/rows/row.css +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/tables/rows/row.css @@ -6,6 +6,10 @@ outline: none !important; } +.linkClass > .Polaris-Link:active { + outline: none !important; +} + .Polaris-IndexTable__TableCell--first{ vertical-align: top !important; } @@ -15,18 +19,10 @@ padding-bottom: 8px !important; } -.Polaris-IndexTable__TableCell > .text-subdued{ - color: #8C9196 !important; -} - -.Polaris-IndexTable__TableCell > .text-subdued > .Polaris-Link > .Polaris-Badge{ - color: #8C9196 !important; -} - .icon-deactivated > .Polaris-Icon svg{ fill: #BABEC3 !important; } .Polaris-IndexTable { border-radius: unset !important; -} \ No newline at end of file +} diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/tables/style.css b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/tables/style.css index 2bc279a24b..391eca9c6e 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/tables/style.css +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/tables/style.css @@ -33,4 +33,4 @@ .add-new-buttons .Polaris-Icon{ color: rgba(97, 106, 117, 1) !important; -} \ No newline at end of file +} diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/Dashboard.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/Dashboard.jsx index 7bd843c171..92250e00e2 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/Dashboard.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/Dashboard.jsx @@ -112,6 +112,7 @@ function Dashboard() { const confirmationModalConfig = Store(state => state.confirmationModalConfig) const ConfirmationModalMarkup = { window.open("https://akto.io/api-security-demo", "_blank") }} - variant="monochromePlain">Book a call + variant="plain">Book a call : null} diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/dashboard.css b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/dashboard.css index 87ebfe4d73..99acbefb49 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/dashboard.css +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/dashboard.css @@ -103,11 +103,11 @@ --p-color-bg-fill-brand: var(--akto-primary) !important; --p-color-bg-fill-brand-hover: #5400CB !important; --p-color-bg-fill-brand-active: #4700AE !important; - --p-color-bg-surface-brand-hover: #ECEBFF !important; + /* --p-color-bg-surface-brand-hover: #ECEBFF !important; */ --p-color-bg-surface-info-hover: #F2F7FE !important; --p-color-text-primary: var(--akto-primary) !important; - --p-color-text-success: var(--akto-primary) !important; + /* --p-color-text-success: var(--akto-primary) !important; */ --p-color-text-brand-hover: var(--akto-primary) !important; --p-color-icon-brand: var(--akto-primary) !important; @@ -124,7 +124,7 @@ -.Polaris-Frame__Main, .Polaris-Navigation { +.Polaris-Frame__Main { background: #F6F6F7 !important; } diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/home/HomePage.js b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/home/HomePage.js index e8ec303756..51939f084a 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/home/HomePage.js +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/home/HomePage.js @@ -11,7 +11,7 @@ function HomePage() { const logo = { width: 78, topBarSource: - '/public/akto_name_with_logo.svg', + '/public/logo.svg', url: '/dashboard/observe/inventory', accessibilityLabel: 'Akto Icon', }; diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/AllSensitiveData/AllSensitiveData.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/AllSensitiveData/AllSensitiveData.jsx index 160db9a97a..0dab05bfd0 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/AllSensitiveData/AllSensitiveData.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/AllSensitiveData/AllSensitiveData.jsx @@ -379,7 +379,6 @@ function AllSensitiveData() { tableTabs={tableTabs} onSelect={(val) => setSelected(val)} selected={selected} - lastColumnSticky={true} />, setIsGptScreenActive(false)} title="Akto GPT"> diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiCollections.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiCollections.jsx index b958165537..edb8855c58 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiCollections.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiCollections.jsx @@ -450,7 +450,7 @@ function ApiCollections() { content: `Deactivate collection${func.addPlurality(selectedResources.length)}`, onAction: () => { const message = "Deactivating a collection will stop traffic ingestion and testing for this collection. Please sync the usage data via Settings > billing after deactivating a collection to reflect your updated usage. Are you sure, you want to deactivate this collection ?" - func.showConfirmationModal(message, "Deactivate collection", () => handleCollectionsAction(selectedResources, collectionApi.deactivateCollections, "deactivated") ) + func.showConfirmationModal("",message, "Deactivate collection", () => handleCollectionsAction(selectedResources, collectionApi.deactivateCollections, "deactivated") ) } } ) @@ -460,7 +460,7 @@ function ApiCollections() { content: `Reactivate collection${func.addPlurality(selectedResources.length)}`, onAction: () => { const message = "Please sync the usage data via Settings > billing after reactivating a collection to resume data ingestion and testing." - func.showConfirmationModal(message, "Activate collection", () => handleCollectionsAction(selectedResources, collectionApi.activateCollections, "activated")) + func.showConfirmationModal("",message, "Activate collection", () => handleCollectionsAction(selectedResources, collectionApi.activateCollections, "activated")) } } ) @@ -468,8 +468,12 @@ function ApiCollections() { if (selectedResources.every(v => { return !apiGrous.includes(v) })) { actions.push( { - content: `Remove collection${func.addPlurality(selectedResources.length)}`, - onAction: () => handleCollectionsAction(selectedResources, api.deleteMultipleCollections, "deleted") + content: {`Remove collection${func.addPlurality(selectedResources.length)}`}, + onAction: () => { + const message = "This can't be undone." + const modalTitle = `Remove ${selectedResources.length} collection${func.addPlurality(selectedResources.length)}?` + func.showConfirmationModal(modalTitle,message,"Remove collection",()=> handleCollectionsAction(selectedResources, api.deleteMultipleCollections, "deleted")) + } } ) } @@ -569,7 +573,7 @@ function ApiCollections() { setMoreActions(!moreActions)} disclosure removeUnderline> + )} @@ -598,7 +602,7 @@ function ApiCollections() { - + ) diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/CreateNewCollectionModal.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/CreateNewCollectionModal.jsx index 1495e7d1b2..071f818ef0 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/CreateNewCollectionModal.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/CreateNewCollectionModal.jsx @@ -160,12 +160,11 @@ function CreateNewCollectionModal(props) { } - + } : null diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/RunTest.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/RunTest.jsx index d2c9e728d3..62df03de45 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/RunTest.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/RunTest.jsx @@ -656,7 +656,7 @@ function RunTest({ endpoints, filtered, apiCollectionId, disabled, runTestFromOu - + .card-items{ + padding-left: 1rem; + padding-right:1rem; +} + +.card-items > .card-items .Polaris-Box { + width:100% !important; } \ No newline at end of file diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/transform.js b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/transform.js index b87cac740d..a43abc8386 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/transform.js +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/transform.js @@ -366,7 +366,7 @@ const transform = { getColor(key, isSensitiveBadge=false){ switch(key.toUpperCase()){ - case "CRITICAL": return "critical-strong-experimental" + case "CRITICAL": return "critical" case "HIGH" : { if(isSensitiveBadge){ return "warning" diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/QuickStart.css b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/QuickStart.css index e159cb5801..4d173babdc 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/QuickStart.css +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/QuickStart.css @@ -39,10 +39,6 @@ gap: 20px; } -.card-items .Polaris-InlineStack{ - align-items: flex-start !important; -} - .card-items .Polaris-Box{ position: unset !important; diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/components/BurpSource.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/components/BurpSource.jsx index d7678e1d48..616db22cc4 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/components/BurpSource.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/components/BurpSource.jsx @@ -138,10 +138,9 @@ function BurpSource() { {steps.map((element,index) => ( - - - {element?.text ?{index + 1}. : null} - {element?.text ?{element?.text} : null} + + + {element?.text ?{index+1}. {element?.text} : null} {element?.textComponent} diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/components/PostmanSource.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/components/PostmanSource.jsx index c24e6293ea..2d390bb483 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/components/PostmanSource.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/components/PostmanSource.jsx @@ -302,8 +302,7 @@ function PostmanSource() { {steps.map((element,index) => ( - {index + 1}. - {element.text} + {index + 1}. {element.text} ))} {type === "api" ? diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/components/shared/InformationBannerComponent.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/components/shared/InformationBannerComponent.jsx index 713ac68599..bfba9d474f 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/components/shared/InformationBannerComponent.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/components/shared/InformationBannerComponent.jsx @@ -8,8 +8,8 @@ function InformationBannerComponent({docsUrl,content}) { } return (
- - {content} + {}}> +

{content}

{docsUrl !== '' ? : ""}
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/components/shared/NoAccessComponent.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/components/shared/NoAccessComponent.jsx index e900dffc5a..a4294961ae 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/components/shared/NoAccessComponent.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/components/shared/NoAccessComponent.jsx @@ -10,8 +10,7 @@ function NoAccessComponent({steps , dataString, onClickFunc, toolTipContent, tit {steps.map((element,index) => ( - {index + 1}. - {element.text} + {index + 1}. {element.text} {element.textComponent} diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/Settings.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/Settings.jsx index 9d383ca7e4..e6e45cbf5b 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/Settings.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/Settings.jsx @@ -20,9 +20,9 @@ function SettingsHeader() { - Settings + Settings - +
+ +
)} autofocusTarget="first-node" onClose={() => { setPopoverActive(false) }} diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/AllSensitiveData/AllSensitiveData.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/AllSensitiveData/AllSensitiveData.jsx index 0dab05bfd0..4d5278fea9 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/AllSensitiveData/AllSensitiveData.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/AllSensitiveData/AllSensitiveData.jsx @@ -309,7 +309,9 @@ function AllSensitiveData() { const secondaryActionsComp = ( { (func.checkOnPrem() && window?.USER_NAME !== undefined && window.USER_NAME.includes("razorpay")) ? : <>} - +
+ +
) diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiCollections.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiCollections.jsx index edb8855c58..cadc44f525 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiCollections.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiCollections.jsx @@ -23,6 +23,7 @@ import { saveAs } from 'file-saver' import TreeViewTable from "../../../components/shared/treeView/TreeViewTable" import TableStore from "../../../components/tables/TableStore"; import { useNavigate } from "react-router-dom"; +import './apiCollections.css' const headers = [ @@ -573,9 +574,11 @@ function ApiCollections() { setMoreActions(!moreActions)} disclosure removeUnderline> - More Actions - +
+ +
)} autofocusTarget="first-node" onClose={() => { setMoreActions(false) }} @@ -583,7 +586,7 @@ function ApiCollections() { > - +
+ +
) diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/apiCollections.css b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/apiCollections.css new file mode 100644 index 0000000000..7bb1ceca5d --- /dev/null +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/apiCollections.css @@ -0,0 +1,11 @@ +.polaris-secondaryAction-button > .Polaris-Button--variantSecondary { + background: var(--p-color-bg-fill-tertiary) !important; + box-shadow: none !important; + border: none; + border-radius: var(--p-border-radius-200) !important; + min-height: 1.75rem; + --pc-button-bg_hover: #303030 !important; +} +.polaris-secondaryAction-button > .Polaris-Button--variantSecondary:hover{ + background-color: #D4D4D4 !important; +} diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/settings.css b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/settings.css index 1f7617a572..eb59a886e5 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/settings.css +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/settings.css @@ -12,9 +12,9 @@ align-items: center; } -.header-css .Polaris-Icon__Svg { +/* .header-css .Polaris-Icon__Svg { fill:white !important; -} +} */ .header-css .Polaris-Button--variantPlain .Polaris-Icon__Svg:hover{ fill: var(--pc-button-icon-fill) !important; diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/test_editor/TestEditor.css b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/test_editor/TestEditor.css index f6850a7da0..087313485e 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/test_editor/TestEditor.css +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/test_editor/TestEditor.css @@ -84,13 +84,6 @@ width:0; } -.header-testeditor .Polaris-Button--variantTertiary { - color:white !important; -} - -.header-testeditor .Polaris-Icon__Svg { - fill:white !important; -} .header-testeditor .Polaris-Button--variantTertiary:hover{ background-color: var(--pc-button-icon-fill) !important; From 2384e2caa1fd461a1103fa0007456d411fdd3857 Mon Sep 17 00:00:00 2001 From: amitpanwar789 Date: Mon, 23 Dec 2024 16:05:54 +0530 Subject: [PATCH 3/7] banner fixed, more action button popover changed --- .../src/apps/dashboard/pages/dashboard.css | 2 +- .../api_collections/ApiCollections.jsx | 59 ++++++++++--------- .../observe/api_collections/ApiEndpoints.jsx | 30 ++++++---- .../api_collections/apiCollections.css | 13 ++++ .../pages/observe/data_types/DataTypes.css | 6 +- .../pages/observe/data_types/DataTypes.jsx | 4 +- .../pages/quick_start/QuickStart.css | 10 +++- .../quick_start/components/BurpSource.jsx | 9 ++- .../quick_start/components/PostmanSource.jsx | 13 ++-- .../shared/InformationBannerComponent.jsx | 4 +- .../pages/settings/auth_types/AuthTypes.jsx | 4 +- 11 files changed, 99 insertions(+), 55 deletions(-) diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/dashboard.css b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/dashboard.css index 99acbefb49..69584bc25c 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/dashboard.css +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/dashboard.css @@ -115,7 +115,7 @@ --p-color-bg-surface-critical: #FED3D1 !important; --p-color-bg-surface-caution: #FFD79D !important; - --p-color-bg-surface-info: #A4E8F2 !important; + /* --p-color-bg-surface-info: #A4E8F2 !important; */ } .Polaris-Page{ diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiCollections.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiCollections.jsx index cadc44f525..e5012bc187 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiCollections.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiCollections.jsx @@ -466,18 +466,7 @@ function ApiCollections() { } ) } - if (selectedResources.every(v => { return !apiGrous.includes(v) })) { - actions.push( - { - content: {`Remove collection${func.addPlurality(selectedResources.length)}`}, - onAction: () => { - const message = "This can't be undone." - const modalTitle = `Remove ${selectedResources.length} collection${func.addPlurality(selectedResources.length)}?` - func.showConfirmationModal(modalTitle,message,"Remove collection",()=> handleCollectionsAction(selectedResources, api.deleteMultipleCollections, "deleted")) - } - } - ) - } + const toggleTypeContent = ( { return !apiGrous.includes(v) })) { + bulkActionsOptions.push( + { + content: {`Remove collection${func.addPlurality(selectedResources.length)}`}, + onAction: () => { + const message = "This can't be undone." + const modalTitle = `Remove ${selectedResources.length} collection${func.addPlurality(selectedResources.length)}?` + func.showConfirmationModal(modalTitle,message,"Remove collection",()=> handleCollectionsAction(selectedResources, api.deleteMultipleCollections, "deleted")) + } + } + ) + } return bulkActionsOptions } const updateData = (dataMap) => { @@ -585,23 +586,25 @@ function ApiCollections() { preferredAlignment="right" > + - - - - + setTreeView(!treeView) + } + + ]} + /> + diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiEndpoints.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiEndpoints.jsx index 9a848f8304..f948dada92 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiEndpoints.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiEndpoints.jsx @@ -1,5 +1,5 @@ import PageWithMultipleCards from "../../../components/layouts/PageWithMultipleCards" -import { Text, InlineStack, Button, Popover, Modal, IndexFiltersMode, BlockStack, Box, Checkbox } from "@shopify/polaris" +import { Text, InlineStack, Button, Popover, Modal, IndexFiltersMode, BlockStack, Box, Checkbox, ActionList } from "@shopify/polaris" import api from "../api" import { useEffect, useState } from "react" import func from "@/util/func" @@ -639,9 +639,11 @@ function ApiEndpoints(props) { + )} autofocusTarget="first-node" onClose={() => { setExportOpen(false) }} @@ -650,58 +652,62 @@ function ApiEndpoints(props) { -
+
Refresh
{ isApiGroup ? -
+
Re-compute api group
: null } { !isApiGroup && !(collectionsObj?.hostName && collectionsObj?.hostName?.length > 0) ? +
handleFileChange(file)} tooltipText="Upload traffic(.har)" label={Upload traffic} primary={false} - /> : null + />
: null + } - - Export as + -
0) ? exportOpenApiForSelectedApi : exportOpenApi} style={{cursor: 'pointer'}}> +
Export as
+
0) ? exportOpenApiForSelectedApi : exportOpenApi} style={{cursor: 'pointer'}}> OpenAPI spec
-
+
Postman
-
exportCsv()} style={{cursor: 'pointer'}}> +
exportCsv()} style={{cursor: 'pointer'}}> CSV
+
- Others + Others redactCheckBoxClicked()} + helpText={

Redacts all your data
from the collection

} /> - +
-
+
{`${showWorkflowTests ? "Hide" : "Show"} workflow tests`} diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/apiCollections.css b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/apiCollections.css index 7bb1ceca5d..36427ec362 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/apiCollections.css +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/apiCollections.css @@ -9,3 +9,16 @@ .polaris-secondaryAction-button > .Polaris-Button--variantSecondary:hover{ background-color: #D4D4D4 !important; } + +.popover-menu-button:hover{ + background-color: #F1F1F1 !important; +} + +.popover-menu-button{ + padding:0.3rem !important; + border-radius: var(--p-border-radius-200); +} + +.popover-menu-button.popover-menu-button--extraMargin{ + margin-bottom: 0.2rem !important; +} \ No newline at end of file diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/data_types/DataTypes.css b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/data_types/DataTypes.css index a615e15cc1..5674b321a8 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/data_types/DataTypes.css +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/data_types/DataTypes.css @@ -13,6 +13,10 @@ padding-right:1rem; } -.card-items > .card-items .Polaris-Box { +.card-items .Polaris-Box { width:100% !important; +} + +.card-items .Polaris-InlineStack{ + align-items: flex-start !important; } \ No newline at end of file diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/data_types/DataTypes.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/data_types/DataTypes.jsx index b64707942e..3e60ab4750 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/data_types/DataTypes.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/data_types/DataTypes.jsx @@ -385,7 +385,7 @@ function DataTypes() { docsUrl={"https://docs.akto.io/api-inventory/how-to/redact-sensitive-data"} />} > -
+
@@ -410,7 +410,7 @@ function DataTypes() { tooltipContent={"Create test template for this data type"} />} > -
+
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/QuickStart.css b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/QuickStart.css index 4d173babdc..da8edfdcf2 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/QuickStart.css +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/QuickStart.css @@ -39,10 +39,18 @@ gap: 20px; } +.connect-banner .card-items{ + margin-top: 0 !important; +} + +.connect-banner > .Polaris-ShadowBevel > .Polaris-Box{ + background-color: var(--p-color-bg-surface-info) !important; +} + .card-items .Polaris-Box{ position: unset !important; - width: unset !important; + /* width: unset !important; */ } .copyRequest { diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/components/BurpSource.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/components/BurpSource.jsx index 616db22cc4..b1e6792f70 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/components/BurpSource.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/components/BurpSource.jsx @@ -1,4 +1,4 @@ -import { Box, Button, ButtonGroup, InlineStack, Link, Text, BlockStack } from '@shopify/polaris' +import { Box, Button, ButtonGroup, InlineStack, Link, Text, BlockStack, LegacyCard, TextContainer, Card } from '@shopify/polaris' import React, { useEffect, useState, useRef } from 'react' import {useNavigate} from "react-router-dom" import api from '../api' @@ -133,8 +133,11 @@ function BurpSource() { Use burp plugin to send traffic to Akto and realize quick value. If you like what you see, we highly recommend using AWS or GCP traffic mirroring to get real user data for a smooth, automated and minimum false positive experience. - - +
+ + + +
{steps.map((element,index) => ( diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/components/PostmanSource.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/components/PostmanSource.jsx index 2d390bb483..f85bc5e7cd 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/components/PostmanSource.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/components/PostmanSource.jsx @@ -1,4 +1,4 @@ -import { Badge, Button, ButtonGroup, Checkbox, InlineStack, RadioButton, Text, BlockStack, Modal, DescriptionList, Tooltip, Icon } from '@shopify/polaris' +import { Badge, Button, ButtonGroup, Checkbox, InlineStack, RadioButton, Text, BlockStack, Modal, DescriptionList, Tooltip, Icon, Card } from '@shopify/polaris' import React, { useCallback, useEffect, useState } from 'react' import Dropdown from '../../../components/layouts/Dropdown' import settingFunctions from '../../settings/module' @@ -295,9 +295,14 @@ function PostmanSource() { handleChange("api")}/> handleChange("collection")}/> - +
+ + + +
+ {steps.map((element,index) => ( diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/components/shared/InformationBannerComponent.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/components/shared/InformationBannerComponent.jsx index bfba9d474f..6668dafbe5 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/components/shared/InformationBannerComponent.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/quick_start/components/shared/InformationBannerComponent.jsx @@ -8,8 +8,8 @@ function InformationBannerComponent({docsUrl,content}) { } return (
- {}}> -

{content}

+ +

{content}

{docsUrl !== '' ? : ""}
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/auth_types/AuthTypes.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/auth_types/AuthTypes.jsx index 0bcfe6763d..2b5ffd13f0 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/auth_types/AuthTypes.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/auth_types/AuthTypes.jsx @@ -99,7 +99,9 @@ function AuthTypes() { title={"Auth types"} primaryAction={} secondaryActions={ - +
+ +
} isFirstPage={true} components={[ From a6d0aeecad70bac1fcb5115aa6ae57782d81fd1a Mon Sep 17 00:00:00 2001 From: amitpanwar789 Date: Tue, 24 Dec 2024 23:26:34 +0530 Subject: [PATCH 4/7] button fixed --- .../components/layouts/DateRangeFilter.jsx | 2 + .../components/layouts/header/Headers.js | 4 +- .../components/shared/SemiCircleProgress.jsx | 2 +- .../src/apps/dashboard/pages/dashboard.css | 5 +- .../api_collections/ApiCollections.jsx | 27 ++- .../observe/api_collections/ApiEndpoints.jsx | 166 +++++++++++------- .../api_collections/apiCollections.css | 5 + .../api_collections/data/apiChanges.js | 2 +- .../pages/observe/data_types/DataTypes.jsx | 9 +- .../settings/integrations/Integrations.jsx | 18 +- .../SingleTestRunPage/SingleTestRunPage.js | 5 +- .../TestRunResultPage/TestRunResultFlyout.jsx | 4 +- .../apps/dashboard/pages/testing/transform.js | 2 +- .../pages/testing/user_config/UserConfig.jsx | 18 +- 14 files changed, 165 insertions(+), 104 deletions(-) diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/DateRangeFilter.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/DateRangeFilter.jsx index d197311023..fd5b60d5df 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/DateRangeFilter.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/DateRangeFilter.jsx @@ -24,6 +24,7 @@ function DateRangeFilter(props){ sectioned={false} fullHeight activator={ +
+
} onClose={() => setPopoverActive(false)} > diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/header/Headers.js b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/header/Headers.js index c8984d649e..36ea5c9cd9 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/header/Headers.js +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/header/Headers.js @@ -228,8 +228,8 @@ export default function Header() { - Test run status - {`${currentTestsObj.totalTestsQueued} tests queued`} +
Test run status
 +
{`${currentTestsObj.totalTestsQueued} tests queued`}
 : null} { setMoreActions(false) }} preferredAlignment="right" > - - - + - - - +
@@ -614,6 +610,25 @@ function ApiCollections() { ) + const actionGroups = [ + { + title: 'More actions', + actions: [ + { + content: 'Export as CSV', + icon: FileIcon, + onAction: exportCsv + }, + { + content: treeView ? 'Hide tree view' : 'Display tree view', + icon: treeView ? HideIcon : ViewIcon, + onAction: () => setTreeView(!treeView) + } + ] + }, + + ]; + const handleSelectedTab = (selectedIndex) => { setSelected(selectedIndex) diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiEndpoints.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiEndpoints.jsx index f948dada92..65dc45ec45 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiEndpoints.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiEndpoints.jsx @@ -1,5 +1,5 @@ import PageWithMultipleCards from "../../../components/layouts/PageWithMultipleCards" -import { Text, InlineStack, Button, Popover, Modal, IndexFiltersMode, BlockStack, Box, Checkbox, ActionList } from "@shopify/polaris" +import { Text, InlineStack, Button, Popover, Modal, IndexFiltersMode, BlockStack, Box, Checkbox, ActionList, Divider } from "@shopify/polaris" import api from "../api" import { useEffect, useState } from "react" import func from "@/util/func" @@ -649,72 +649,110 @@ function ApiEndpoints(props) { onClose={() => { setExportOpen(false) }} preferredAlignment="right" > - - - -
- Refresh -
- { - isApiGroup ? -
- Re-compute api group -
: - null - } - { !isApiGroup && !(collectionsObj?.hostName && collectionsObj?.hostName?.length > 0) ? -
- 0) && { + content: ( + handleFileChange(file)} + fileChanged={(file) => handleFileChange(file)} tooltipText="Upload traffic(.har)" label={Upload traffic} - primary={false} - />
: null - - } - - - - - -
Export as
-
0) ? exportOpenApiForSelectedApi : exportOpenApi} style={{cursor: 'pointer'}}> - OpenAPI spec -
-
- Postman -
-
exportCsv()} style={{cursor: 'pointer'}}> - CSV -
- - - - -
- - Others - - redactCheckBoxClicked()} - helpText={

Redacts all your data
from the collection

} - /> - -
- - - -
- - {`${showWorkflowTests ? "Hide" : "Show"} workflow tests`} - -
- - - + primary={false} + /> + ), + }, + ]} + /> + + + + + Export as

, + items:[ + + { + content: "OpenAPI spec", + onAction: + selectedResourcesForPrimaryAction && selectedResourcesForPrimaryAction.length > 0 + ? exportOpenApiForSelectedApi + : exportOpenApi, + accessibilityLabel: "Export OpenAPI Specification", + dataTestId: "openapi_spec_option", + }, + { + content: "Postman", + onAction: exportPostman, + accessibilityLabel: "Export to Postman", + dataTestId: "postman_option", + }, + { + content: "CSV", + onAction: exportCsv, + accessibilityLabel: "Export to CSV", + dataTestId: "csv_option", + }, + ] + }]} + /> + + + + + Others

, + items: [{ + content: ( + + Redacts all your data +
+ from the collection +

+ } + /> + ), + accessibilityLabel: "Redact Collection Data", + }] + }]} + /> + + + + + + + {isApiGroup &&collectionsObj?.automated !== true ? : null} {isGptActive ? : null} diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/apiCollections.css b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/apiCollections.css index 36427ec362..321260a5f7 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/apiCollections.css +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/apiCollections.css @@ -21,4 +21,9 @@ .popover-menu-button.popover-menu-button--extraMargin{ margin-bottom: 0.2rem !important; +} + +[aria-expanded=true]:is(.polaris-secondaryAction-button button){ + box-shadow: var(--p-shadow-inset-200)!important; + background-color: var(--p-color-bg-fill-tertiary-active) !important; } \ No newline at end of file diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/data/apiChanges.js b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/data/apiChanges.js index ed9f69840e..aa2a11fa7b 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/data/apiChanges.js +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/data/apiChanges.js @@ -4,7 +4,7 @@ const endpointHeadings = [ { text: "Endpoint", value: "endpointComp", - title: "Api endpoints", + title: "API endpoints", sortActive: true }, { diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/data_types/DataTypes.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/data_types/DataTypes.jsx index 3e60ab4750..f88008a351 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/data_types/DataTypes.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/data_types/DataTypes.jsx @@ -273,7 +273,7 @@ function DataTypes() {
handleTagsChange(tagValue, 'add')}> - Datatype Tags}/> +

Datatype Tags

}/> {currState.categoriesList && currState.categoriesList.length > 0 && currState.categoriesList.map((tag, index) => { @@ -287,7 +287,9 @@ function DataTypes() {
{currState.dataType === 'Custom' && +

Choose Icon +

{displayIcons.map((icon, index) => { @@ -364,8 +366,7 @@ function DataTypes() { />} > -

Mark the location where you want the data type to be sensitive

-
+

Mark the location where you want the data type to be sensitive

{ handleChange({ sensitiveState: val }) }}/> @@ -390,8 +391,6 @@ function DataTypes() {
-

Redact this data type

-
{ handleChange({ redacted: val }) }}/> diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/integrations/Integrations.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/integrations/Integrations.jsx index c987493916..447eb93cda 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/integrations/Integrations.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/integrations/Integrations.jsx @@ -237,21 +237,21 @@ function Integrations() { function renderItem(item) { const {id, source, name, link} = item; const media = ; - const sourceActions = (item) => { - return [ - { - content:
Configure
, - onClick: () => handleTab(item, link), - }, - ]; - }; + // const sourceActions = (item) => { + // return [ + // { + // content:
Configure
, + // onClick: () => handleTab(item, link), + // }, + // ]; + // }; return ( handleTab(id, link)} > {name} diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/SingleTestRunPage/SingleTestRunPage.js b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/SingleTestRunPage/SingleTestRunPage.js index e10078d816..0fe586be9c 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/SingleTestRunPage/SingleTestRunPage.js +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/SingleTestRunPage/SingleTestRunPage.js @@ -26,6 +26,7 @@ import { SearchResourceIcon, RefreshIcon, PersonIcon, + EditIcon } from "@shopify/polaris-icons"; import api from "../api"; import func from '@/util/func'; @@ -639,7 +640,7 @@ const editableConfigsComp = ( moreActionsList.push({title: 'Update', items:[ { content: 'Edit testing config settings', - icon: EditMajor, + icon: EditIcon, onAction: () => { setShowEditableSettings(true); handleAddSettings(); } } ]}) @@ -647,7 +648,7 @@ const editableConfigsComp = ( setSecondaryPopover(false)} - activator={} + activator={
} autofocusTarget="first-node" > 0 ? - + {infoStateFlyout.map((item, index) => { return ( - + history.navigate(ele.nextUrl)} removeUnderline > {this.getUrlComp(ele.url)} diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/user_config/UserConfig.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/user_config/UserConfig.jsx index 0e792392bb..590ae2d1d6 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/user_config/UserConfig.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/user_config/UserConfig.jsx @@ -161,21 +161,19 @@ function UserConfig() { ) const rateLimit = ( - - - -
+ - -
- - - - + + } + /> ) const updateDeltaPeriodTime = ( From beb053a2dcd776952f5de5b1f7137510662f2975 Mon Sep 17 00:00:00 2001 From: amitpanwar789 Date: Fri, 27 Dec 2024 20:42:21 +0530 Subject: [PATCH 5/7] NavBar arrow effect added --- .../components/layouts/FlyLayout.jsx | 2 +- .../components/layouts/leftnav/LeftNav.css | 26 +++++++++++++ .../src/apps/dashboard/pages/dashboard.css | 4 +- .../src/apps/dashboard/pages/home/HomePage.js | 2 +- .../SensitiveDataExposure.jsx | 2 +- .../api_collections/ApiCollections.jsx | 20 ---------- .../observe/api_collections/ApiDetails.jsx | 37 ++++++++----------- .../observe/api_collections/ApiEndpoints.jsx | 4 +- .../observe/api_collections/ApiSchema.jsx | 6 +-- .../dashboard/pages/settings/Settings.jsx | 2 +- .../pages/settings/integrations/AktoGPT.jsx | 4 +- .../dashboard/pages/settings/settings.css | 4 ++ .../pages/test_editor/TestEditor.css | 9 +++++ .../pages/test_editor/TestEditor.jsx | 2 +- 14 files changed, 69 insertions(+), 55 deletions(-) diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/FlyLayout.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/FlyLayout.jsx index 9c77a46d1e..46ad5dc2eb 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/FlyLayout.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/FlyLayout.jsx @@ -15,7 +15,7 @@ function FlyLayout(props) { return (
- + { loading ?
: diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/leftnav/LeftNav.css b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/leftnav/LeftNav.css index 74a225b959..2a197cd484 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/leftnav/LeftNav.css +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/leftnav/LeftNav.css @@ -16,3 +16,29 @@ .active .Polaris-Navigation__PrimaryNavigation > .Polaris-Navigation__Section > .Polaris-Navigation__ListItem > .Polaris-Navigation__ItemWrapper > .Polaris-Navigation__ItemInnerWrapper.Polaris-Navigation__ItemInnerWrapper--selected { background: transparent !important; } + +.Polaris-Navigation__SecondaryNavigation .Polaris-Navigation__ListItem:not(:has(.Polaris-Navigation__Item--selected)):not(.Polaris-Navigation__ListItem:has(.Polaris-Navigation__Item--selected) ~ .Polaris-Navigation__ListItem) .Polaris-Navigation__Item::before { + opacity: 1 !important; + background: url(data:image/svg+xml,%3Csvg%20width%3D%2221%22%20height%3D%2228%22%20viewBox%3D%220%200%2021%2028%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Crect%20x%3D%229%22%20width%3D%221.5%22%20height%3D%2228%22%20fill%3D%22%23B5B5B5%22%2F%3E%3C%2Fsvg%3E); +} + +.Polaris-Navigation__SecondaryNavigation .Polaris-Navigation__Item--selected::before{ + opacity: 1 !important; + content: url(data:image/svg+xml,%3Csvg%20width%3D%2221%22%20height%3D%2228%22%20viewBox%3D%220%200%2021%2028%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M19%2014.25H19.75V15.75H19V14.25ZM10.077%2013.362L10.7452%2013.0215V13.0215L10.077%2013.362ZM11.388%2014.673L11.7285%2014.0048H11.7285L11.388%2014.673ZM10.5%200V10.2H9V0H10.5ZM14.55%2014.25H19V15.75H14.55V14.25ZM10.5%2010.2C10.5%2011.0525%2010.5006%2011.6467%2010.5384%2012.1093C10.5755%2012.5632%2010.6446%2012.824%2010.7452%2013.0215L9.40873%2013.7025C9.18239%2013.2582%209.08803%2012.7781%209.04336%2012.2315C8.99942%2011.6936%209%2011.0277%209%2010.2H10.5ZM14.55%2015.75C13.7223%2015.75%2013.0564%2015.7506%2012.5185%2015.7066C11.9719%2015.662%2011.4918%2015.5676%2011.0475%2015.3413L11.7285%2014.0048C11.926%2014.1054%2012.1868%2014.1745%2012.6407%2014.2116C13.1033%2014.2494%2013.6975%2014.25%2014.55%2014.25V15.75ZM10.7452%2013.0215C10.9609%2013.4448%2011.3052%2013.7891%2011.7285%2014.0048L11.0475%2015.3413C10.3419%2014.9817%209.76825%2014.4081%209.40873%2013.7025L10.7452%2013.0215Z%22%20fill%3D%22%23B5B5B5%22/%3E%3Cpath%20d%3D%22M17%2012L20%2015L17%2018%22%20stroke%3D%22%23B5B5B5%22%20stroke-width%3D%221.5%22%20stroke-linecap%3D%22round%22%20stroke-linejoin%3D%22round%22/%3E%3C/svg%3E) !important; +} + +.Polaris-Navigation__SecondaryNavigation .Polaris-Navigation__ListItem:not(:has(.Polaris-Navigation__Item--selected)):not(.Polaris-Navigation__ListItem:has(.Polaris-Navigation__Item--selected) ~ .Polaris-Navigation__ListItem) .Polaris-Navigation__Item:hover::before { + opacity: 1; + content: url(data:image/svg+xml,%3Csvg%20width%3D%2221%22%20height%3D%2228%22%20viewBox%3D%220%200%2021%2028%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%3Cpath%20d%3D%22M9%207.75C9%207.33579%209.33579%207%209.75%207V7C10.1642%207%2010.5%207.33579%2010.5%207.75V9.95C10.5%2010.8025%2010.5006%2011.3967%2010.5384%2011.8593C10.5755%2012.3132%2010.6446%2012.574%2010.7452%2012.7715C10.961%2013.1948%2011.3052%2013.539%2011.7285%2013.7548C11.926%2013.8554%2012.1868%2013.9245%2012.6407%2013.9616C13.1033%2013.9994%2013.6975%2014%2014.55%2014H17.9393L16.2197%2012.2803C15.9268%2011.9874%2015.9268%2011.5126%2016.2197%2011.2197C16.5126%2010.9268%2016.9874%2010.9268%2017.2803%2011.2197L20.2803%2014.2197C20.5732%2014.5126%2020.5732%2014.9874%2020.2803%2015.2803L17.2803%2018.2803C16.9874%2018.5732%2016.5126%2018.5732%2016.2197%2018.2803C15.9268%2017.9874%2015.9268%2017.5126%2016.2197%2017.2197L17.9393%2015.5H14.5179C13.705%2015.5%2013.0494%2015.5%2012.5185%2015.4566C11.9719%2015.412%2011.4918%2015.3176%2011.0475%2015.0913C10.3419%2014.7317%209.76825%2014.1581%209.40873%2013.4525C9.18239%2013.0082%209.08803%2012.5281%209.04336%2011.9815C8.99999%2011.4506%208.99999%2010.795%209%209.98212V7.75Z%22%20fill%3D%22%23CCCCCC%22%2F%3E%0A%3C%2Fsvg%3E) !important; +} + +.Polaris-Navigation__List .Polaris-Navigation__ListItem:has(.Polaris-Navigation__Item--selected) ~ .Polaris-Navigation__ListItem .Polaris-Navigation__Item:hover::before { + opacity: 1; + content: url(data:image/svg+xml,%3Csvg%20width%3D%2221%22%20height%3D%2228%22%20viewBox%3D%220%200%2021%2028%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%3Cpath%20d%3D%22M9%207.75C9%207.33579%209.33579%207%209.75%207V7C10.1642%207%2010.5%207.33579%2010.5%207.75V9.95C10.5%2010.8025%2010.5006%2011.3967%2010.5384%2011.8593C10.5755%2012.3132%2010.6446%2012.574%2010.7452%2012.7715C10.961%2013.1948%2011.3052%2013.539%2011.7285%2013.7548C11.926%2013.8554%2012.1868%2013.9245%2012.6407%2013.9616C13.1033%2013.9994%2013.6975%2014%2014.55%2014H17.9393L16.2197%2012.2803C15.9268%2011.9874%2015.9268%2011.5126%2016.2197%2011.2197C16.5126%2010.9268%2016.9874%2010.9268%2017.2803%2011.2197L20.2803%2014.2197C20.5732%2014.5126%2020.5732%2014.9874%2020.2803%2015.2803L17.2803%2018.2803C16.9874%2018.5732%2016.5126%2018.5732%2016.2197%2018.2803C15.9268%2017.9874%2015.9268%2017.5126%2016.2197%2017.2197L17.9393%2015.5H14.5179C13.705%2015.5%2013.0494%2015.5%2012.5185%2015.4566C11.9719%2015.412%2011.4918%2015.3176%2011.0475%2015.0913C10.3419%2014.7317%209.76825%2014.1581%209.40873%2013.4525C9.18239%2013.0082%209.08803%2012.5281%209.04336%2011.9815C8.99999%2011.4506%208.99999%2010.795%209%209.98212V7.75Z%22%20fill%3D%22%23CCCCCC%22%2F%3E%0A%3C%2Fsvg%3E); +} + +.Polaris-Navigation--subNavigationActive::before{ + content: url(data:image/svg+xml,%3Csvg%20width%3D%2221%22%20height%3D%2228%22%20viewBox%3D%220%200%2021%2028%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%3Cpath%20d%3D%22M9%2024.75C9%2024.3358%209.33579%2024%209.75%2024V24C10.1642%2024%2010.5%2024.3358%2010.5%2024.75V28H9V24.75Z%22%20fill%3D%22%23B5B5B5%22%2F%3E%0A%3C%2Fsvg%3E) !important; + left: var(--p-space-200) !important; + opacity: 1 !important; +} \ No newline at end of file diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/dashboard.css b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/dashboard.css index 81e090406c..6552b67fc8 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/dashboard.css +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/dashboard.css @@ -124,9 +124,9 @@ -.Polaris-Frame__Main { +/* .Polaris-Frame__Main { background: #F6F6F7 !important; -} +} */ .Polaris-Tabs { padding: 0 !important; diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/home/HomePage.js b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/home/HomePage.js index 51939f084a..73d8a460f4 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/home/HomePage.js +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/home/HomePage.js @@ -18,7 +18,7 @@ function HomePage() { return ( } topBar={
} logo={logo} > - + diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/SensitiveDataExposure/SensitiveDataExposure.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/SensitiveDataExposure/SensitiveDataExposure.jsx index 04f26bd5cb..10cec89310 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/SensitiveDataExposure/SensitiveDataExposure.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/SensitiveDataExposure/SensitiveDataExposure.jsx @@ -17,7 +17,7 @@ const headings = [ { text: "Endpoint", value: "endpointComp", - title: "Api endpoints", + title: "API endpoints", textValue: "endpoint", filterKey: 'endpoint' }, diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiCollections.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiCollections.jsx index 17ecd58191..0c0a84055a 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiCollections.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiCollections.jsx @@ -610,26 +610,6 @@ function ApiCollections() { ) - const actionGroups = [ - { - title: 'More actions', - actions: [ - { - content: 'Export as CSV', - icon: FileIcon, - onAction: exportCsv - }, - { - content: treeView ? 'Hide tree view' : 'Display tree view', - icon: treeView ? HideIcon : ViewIcon, - onAction: () => setTreeView(!treeView) - } - ] - }, - - ]; - - const handleSelectedTab = (selectedIndex) => { setSelected(selectedIndex) } diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiDetails.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiDetails.jsx index 1c55a4233e..435fdf21d7 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiDetails.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiDetails.jsx @@ -1,5 +1,5 @@ import LayoutWithTabs from "../../../components/layouts/LayoutWithTabs" -import { Box, Button, Popover, Modal, Tooltip, BlockStack } from "@shopify/polaris" +import { Box, Button, Popover, Modal, Tooltip, BlockStack, ActionList } from "@shopify/polaris" import FlyLayout from "../../../components/layouts/FlyLayout"; import GithubCell from "../../../components/tables/cells/GithubCell"; import SampleDataList from "../../../components/shared/SampleDataList"; @@ -142,7 +142,7 @@ function ApiDetails(props) { ) { setUseLocalSubCategoryData(true) } - + fetchData(); }, [apiDetail]) @@ -271,7 +271,7 @@ function ApiDetails(props) { isGptActive || isDemergingActive ? : null} - {isDemergingActive ? : null} - - + : null } diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiEndpoints.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiEndpoints.jsx index 65dc45ec45..921bc4607b 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiEndpoints.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiEndpoints.jsx @@ -34,7 +34,7 @@ const headings = [ { text: "Endpoint", value: "endpointComp", - title: "Api endpoints", + title: "API endpoints", textValue: "endpoint", sortActive: true }, @@ -640,7 +640,7 @@ function ApiEndpoints(props) { active={exportOpen} activator={(
-
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiSchema.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiSchema.jsx index 20bbb1d5a9..11fece1459 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiSchema.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiSchema.jsx @@ -99,7 +99,7 @@ function ApiSingleSchema(props) { return ( - + {title} @@ -117,7 +117,7 @@ function ApiSingleSchema(props) { > - -