@digi-frontend/dgate-api-documentation 1.0.47 → 1.0.52

package/src/layout/docsComponents/DocsHeader/DocsHeader.module.scss

@@ -17,7 +17,7 @@
     margin-left: 2.9375rem;
   }
 
-  :global(.search-filter-btn) {
+  .search_filter_btn {
     background-color: #ffffff !important;
     border: 1px solid #e8e9ee !important;
     width: 10.4375rem;
@@ -30,6 +30,10 @@
       color: #000000;
     }
 
+    &:hover {
+      color: #000;
+    }
+
     svg {
       margin-left: 0.5rem;
     }
@@ -55,13 +59,16 @@
     }
   }
 
-  :global(.api-btn) {
+  .api_btn {
     background-color: #ffffff !important;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
     border: none !important;
     box-shadow: 0px 1px 2px rgba(16, 24, 40, 0.05);
     padding: 0.4rem;
-    width: 8.5rem;
-    font-size: 0.9175rem;
+    width: 8.4875rem;
+    font-size: 0.8125rem;
     font-weight: 400;
     line-height: 1.234rem;
     height: 2.25rem;
@@ -135,12 +142,78 @@
     cursor: pointer;
   }
 
+  .name-input {
+    // border-color: #bbbec5 !important;
+    width: 27.875rem;
+    height: 2.5rem;
+    border-radius: 0.5rem;
+    border: 0.0625rem solid #bbbec5;
+    padding-top: 0.5rem;
+    padding-bottom: 0.5rem;
+
+    > div.inputWrapper {
+      border: 0px !important;
+    }
+  }
+
+  .methodList {
+    width: 27.875rem;
+    border-radius: 0.5rem;
+    border: 0.0625rem solid #f0f1f2;
+
+    .method-item {
+      display: flex;
+      flex-direction: row;
+      justify-content: flex-start;
+      align-items: center;
+      gap: 0.5rem;
+      padding-left: 0.75rem;
+      padding-right: 0.75rem;
+      padding-top: 0.5rem;
+      border-radius: 0.5rem;
+      padding-bottom: 0.5rem;
+      border-bottom: 1px solid #f0f1f2;
+      span {
+        font-weight: 400;
+        font-size: 0.875rem;
+      }
+      input {
+        cursor: pointer;
+        width: 1.25rem;
+        height: 1.25rem;
+        border-radius: 0.25rem;
+        border: 1px solid #64748b;
+      }
+    }
+  }
+
   .method-container {
     display: flex;
     flex-direction: column;
     gap: 0.5rem;
     position: relative;
     z-index: 10;
+
+    .typeDdl {
+      cursor: pointer;
+      width: 27.875rem;
+      height: 2.5rem;
+      border-radius: 0.5rem;
+      border: 0.0625rem solid #bbbec5;
+      padding-top: 0.5rem;
+      padding-bottom: 0.5rem;
+      padding-left: 1.3rem;
+      padding-right: 0.75rem;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      span {
+        font-weight: 400;
+        font-size: 0.875rem;
+        color: #8390a2;
+      }
+    }
   }
 
   .method-container label {
@@ -157,7 +230,7 @@
     display: flex;
     justify-content: center;
     width: 100%;
-    margin-top: auto;
+    padding-top: 0 !important;
     padding: 1.5rem 0;
   }
 

package/src/layout/docsComponents/DocsHeader/DocsHeader.tsx

@@ -1,16 +1,31 @@
 import React, { useState, useRef } from 'react'
 import { Button, Size, Input, SelectGroup } from 'digitinary-ui'
 import SVGLoader from '../../../components/SVGLoader/SVGLoader'
-import { FilterIcon, BookIcon, ApiIcon, SearchIcon } from '../../../assets/icons'
+import {
+  FilterIcon,
+  BookIcon,
+  ApiIcon,
+  SearchIcon,
+  arrowDownGray,
+  UpArrowIcon,
+  DownArrowIcon,
+} from '../../../assets/icons'
 import Tooltip from '../../../components/Tooltip/Tooltip'
 import CommonDialog from '../../../components/dialog/index'
 import { METHOD_OPTIONS } from '../../../constants/methods.constant'
 import styles from './DocsHeader.module.scss'
 
-const DocsHeader: React.FC = () => {
+const DocsHeader: React.FC = ({
+  transformedOpenApis,
+  updateFilteredData,
+}: {
+  transformedOpenApis: any[]
+  updateFilteredData: any
+}) => {
   const [showSearchFilter, setShowSearchFilter] = useState<boolean>(false)
   const [apiName, setApiName] = useState<string>('')
   const [selectedMethods, setSelectedMethods] = useState<any[]>([])
+  const [methodListOpened, setMethodListOpened] = useState(false)
   const [isMethodDropdownOpen, setIsMethodDropdownOpen] = useState<boolean>(false)
   const selectRef = useRef<any>(null)
 
@@ -24,9 +39,49 @@ const DocsHeader: React.FC = () => {
   }
 
   const handleApplyFilters = (): void => {
+    // Reset: no filters applied
+    if (!apiName?.trim() && (!selectedMethods || selectedMethods.length === 0)) {
+      updateFilteredData(transformedOpenApis, true)
+      setShowSearchFilter(false)
+      return
+    }
+
+    let filteredItems = [...transformedOpenApis]
+
+    // Filter by API name
+    if (apiName?.trim()) {
+      const lowerApiName = apiName.toLowerCase()
+      filteredItems = filteredItems.filter((api) => api.title.toLowerCase().includes(lowerApiName))
+    }
+
+    // Filter by selected HTTP methods
+    if (selectedMethods?.length) {
+      filteredItems = filteredItems.filter((api) => {
+        const allMethods = Object.values(api.tags || {})
+          .flat()
+          .map((endpoint: any) => endpoint.method?.toLowerCase())
+
+        return selectedMethods.some((method) => allMethods.includes(method.toLowerCase()))
+      })
+    }
+
+    updateFilteredData(filteredItems)
     setShowSearchFilter(false)
   }
 
+  const handleCheckMethod = (e, method: (typeof METHOD_OPTIONS)[0]) => {
+    const {
+      target: { checked },
+    } = e
+    if (checked) {
+      setSelectedMethods((prev) => [...prev, method.value])
+    } else {
+      if (selectedMethods.includes(method.value)) {
+        setSelectedMethods((prev) => prev.filter((_m) => _m != method.value))
+      }
+    }
+  }
+
   return (
     <>
       <header className={styles.api_docs_header}>
@@ -34,7 +89,7 @@ const DocsHeader: React.FC = () => {
           <Button
             variant="outlined"
             size="small"
-            className="search-filter-btn"
+            className={styles.search_filter_btn}
             onClick={handleOpenSearchFilter}
           >
             Search & Filter
@@ -52,9 +107,8 @@ const DocsHeader: React.FC = () => {
                 GUIDES
               </Button>
             </Tooltip>
-            <Button variant="outlined" size="small" className="api-btn">
-              <SVGLoader src={ApiIcon} />
-              API reference
+            <Button variant="outlined" size="small" className={styles.api_btn}>
+              <SVGLoader src={ApiIcon} /> &nbsp; API reference
             </Button>
           </div>
         </div>
@@ -65,12 +119,14 @@ const DocsHeader: React.FC = () => {
         onClose={handleCloseSearchFilter}
         icon={false}
         withClose={false}
+        noActions
         content={
           <div className={`search-filter-form ${isMethodDropdownOpen ? 'expanded' : ''}`}>
             <div className="search-filter-form__header">
               <p className="search-filter-form__header__title">Search & Filter</p>
             </div>
             <Input
+              className="name-input"
               placeholder="Search by API name"
               value={apiName}
               onChange={(value) => setApiName(value as string)}
@@ -80,23 +136,37 @@ const DocsHeader: React.FC = () => {
             />
             <div className="method-container">
               <label>Method</label>
-              <SelectGroup
+              {/* <SelectGroup
                 isMultiple={true}
                 size={Size.Medium}
                 placeholder="Select Method"
                 value={selectedMethods}
                 onChange={(value) => setSelectedMethods(value || [])}
                 options={[
-                  {
-                    list: METHOD_OPTIONS.map((method) => ({
-                      label: <span style={{ color: method.color }}>{method.label}</span>,
-                      value: method.value,
-                      data: method,
-                    })),
-                  },
+                  
                 ]}
+                withSearch={false}
                 className="method-select custom-select-border"
-              />
+              /> */}
+              <div className="typeDdl" onClick={() => setIsMethodDropdownOpen((prev) => !prev)}>
+                <span>Select Method</span>
+                <SVGLoader src={!isMethodDropdownOpen ? DownArrowIcon : UpArrowIcon} />
+              </div>
+              {isMethodDropdownOpen && (
+                <div className="methodList">
+                  {METHOD_OPTIONS.map((_m) => (
+                    <div className="method-item">
+                      <input
+                        type="checkbox"
+                        className="agreement-checkbox"
+                        checked={selectedMethods.includes(_m.value)}
+                        onChange={(e) => handleCheckMethod(e, _m)}
+                      />
+                      <span style={{ color: _m.color }}>{_m.label}</span>
+                    </div>
+                  ))}
+                </div>
+              )}
             </div>
             <div className="button-container">
               <Button

package/src/layout/docsComponents/DocsSideMenuTree/DocsSideMenuTree.tsx

@@ -1,28 +1,60 @@
 import './style.scss'
-import React, { useState } from 'react'
+import React, { useEffect, useState } from 'react'
 import SVGLoader from '../../../components/SVGLoader/SVGLoader'
 import { arrowDownGray, arrowRightGray, document, eye } from '../../../assets/icons'
+import { EndpointData, OverviewData } from 'src/layout/docsLayout'
 
 const DocsSideMenuTree = ({
   apis,
   setActiveItemData,
+  activeItemData,
+  activeType,
+  expandedSections,
+  setExpandedSections,
   isFirstApiExpanded,
   setIsFirstApiExpanded,
+  setActiveType,
+}: {
+  apis: OverviewData[]
+  setActiveItemData: React.Dispatch<React.SetStateAction<OverviewData | EndpointData>>
+  activeItemData: OverviewData | EndpointData
+  expandedSections: Record<string, boolean>
+  setExpandedSections: React.Dispatch<React.SetStateAction<Record<string, boolean>>>
+  isFirstApiExpanded: boolean
+  setIsFirstApiExpanded: React.Dispatch<React.SetStateAction<boolean>>
+  setActiveType: React.Dispatch<React.SetStateAction<'OVERVIEW' | 'ENDPOINT'>>
+  activeType: 'OVERVIEW' | 'ENDPOINT'
 }) => {
-  const [expandedSections, setExpandedSections] = useState({})
+  // Auto-expand first API only once
+  useEffect(() => {
+    if (!apis?.length || !isFirstApiExpanded) return
+
+    const firstApi = apis[0]
+    const sectionKey = `api-${firstApi.apiSpecId}-section`
+    const overviewKey = `api-${firstApi.apiSpecId}-overview`
+
+    setExpandedSections((prev) => ({
+      ...prev,
+      [sectionKey]: true,
+      [overviewKey]: true,
+    }))
+
+    setActiveItemData(firstApi)
+    setActiveType('OVERVIEW')
+    setIsFirstApiExpanded(false)
+  }, [apis, isFirstApiExpanded])
 
   const toggleSection = (apiId, sectionId: string, resetOthers?: boolean, key?: string[]) => {
-    isFirstApiExpanded && setIsFirstApiExpanded(false)
     if (resetOthers && key) {
       const filteredExpandedSections = Object.fromEntries(
-        Object.entries({ ...expandedSections }).filter(([expandKey, _]) => {
+        Object.entries({ ...expandedSections }).filter(([expandKey]) => {
           // Close other APIs sections
           if (!expandKey.includes(apiId)) return false
           // always return the clicked on section
-          else if (expandKey === sectionId) return true
+          if (expandKey === sectionId) return true
           // filter all sections containing the key
-          else if (key.some((k) => expandKey.includes(k))) return false
-          else return true
+          if (key.some((k) => expandKey.includes(k))) return false
+          return true
         })
       )
 
@@ -38,64 +70,94 @@ const DocsSideMenuTree = ({
     }
   }
 
-  const renderEndpoints = (endpoints, api) => {
-    return endpoints.map((endpoint, index) => {
-      const isResourceExpanded = expandedSections[`api-${api.id}-resource-${endpoint.id}`]
+  const renderEndpoints = (endpoints: EndpointData[], api: OverviewData) =>
+    endpoints.map((endpoint, index) => {
+      const key = `api-${api.apiSpecId}-resource-${endpoint.id}`
+      const isExpanded = expandedSections[key]
 
       return (
         <div
           key={index}
           className={`api-docs-api-tree__endpoint api-docs-api-tree__endpoint--${endpoint.method.toLowerCase()}`}
           onClick={() => {
-            setActiveItemData({
-              ...endpoint,
-              api: {
-                id: api.id,
-                title: api.title,
-                description: api.description,
-                version: api.version,
-              },
-            })
-
-            if (!isResourceExpanded) {
-              toggleSection(api.id, `api-${api.id}-resource-${endpoint.id}`, true, [
-                'resource',
-                'overview',
-              ])
+            if (!isExpanded) {
+              setActiveItemData({
+                ...endpoint,
+                api: {
+                  id: api.apiSpecId,
+                  title: api.title,
+                  description: api.description,
+                  version: api.version,
+                  ...api,
+                },
+              })
+              setActiveType('ENDPOINT')
+              toggleSection(api.apiSpecId, key, true, ['resource', 'overview'])
             }
           }}
-          data-active={isResourceExpanded}
+          data-active={isExpanded}
         >
           <span className="api-docs-api-tree__endpoint-method">{endpoint.method}</span>
           <span className="api-docs-api-tree__endpoint-name">{endpoint.path}</span>
         </div>
       )
     })
-  }
 
-  const renderApiSection = (api, index) => {
-    const isApiExpanded = expandedSections[`api-${api.id}-section`]
-    const isEndpointActive = Object.keys(expandedSections).some((k) =>
-      k.includes(`api-${api.id}-resource`)
+  const renderSubSection = (
+    tagName: string,
+    data: EndpointData[],
+    api: OverviewData,
+    sectionIndex: number
+  ) => {
+    const sectionKey = `api-${api.apiSpecId}-section-${sectionIndex}`
+    const isSectionExpanded = expandedSections[sectionKey]
+
+    return (
+      <div key={sectionKey} className="api-docs-api-tree__subsection">
+        <div
+          className="api-docs-api-tree__subsection-header"
+          onClick={() => toggleSection(api.apiSpecId, sectionKey)}
+        >
+          {isSectionExpanded ? (
+            <SVGLoader src={arrowDownGray} />
+          ) : (
+            <SVGLoader src={arrowRightGray} />
+          )}
+          <span className="api-docs-api-tree__subsection-title">{tagName}</span>
+        </div>
+
+        {isSectionExpanded && (
+          <div className="api-docs-api-tree__endpoints">{renderEndpoints(data, api)}</div>
+        )}
+      </div>
     )
-    const isEndpointsExpanded = expandedSections[`api-${api.id}-endpoints`]
-    const isOverviewExpanded = expandedSections[`api-${api.id}-overview`]
+  }
 
-    if (isFirstApiExpanded && index === 0 && !isApiExpanded) {
-      toggleSection(api.id, `api-${api.id}-section`)
-      toggleSection(api.id, `api-${api.id}-overview`)
-      setActiveItemData(api)
-    }
+  const renderApiSection = (api: OverviewData) => {
+    const sectionKey = `api-${api.apiSpecId}-section`
+    const endpointsKey = `api-${api.apiSpecId}-endpoints`
+    const overviewKey = `api-${api.apiSpecId}-overview`
+
+    const isApiExpanded = expandedSections[sectionKey]
+    const isOverviewExpanded =
+      'apiSpecId' in activeItemData &&
+      activeItemData.apiSpecId === api.apiSpecId &&
+      activeType === 'OVERVIEW'
+    const isEndpointActive =
+      'api' in activeItemData &&
+      activeItemData.api.id === api.apiSpecId &&
+      'path' in activeItemData &&
+      'method' in activeItemData
 
     return (
       <div
-        key={api.id}
+        key={api.apiSpecId}
         className="api-docs-api-tree__section"
         data-active={isEndpointActive || isOverviewExpanded}
       >
         <div
           className="api-docs-api-tree__section-header"
-          onClick={() => toggleSection(api.id, `api-${api.id}-section`)}
+          onClick={() => toggleSection(api.apiSpecId, sectionKey)}
         >
           {isApiExpanded ? <SVGLoader src={arrowDownGray} /> : <SVGLoader src={arrowRightGray} />}
           <SVGLoader src={document} />
@@ -105,39 +167,40 @@ const DocsSideMenuTree = ({
         {isApiExpanded && (
           <>
             <div
-              className={`api-docs-api-tree__section__overview`}
+              className="api-docs-api-tree__section__overview"
               onClick={() => {
-                toggleSection(api.id, `api-${api.id}-overview`, true, ['resource'])
-                setActiveItemData(api)
+                if (!isOverviewExpanded) {
+                  toggleSection(api.apiSpecId, overviewKey, true, ['resource'])
+                  setActiveItemData(api)
+                  setActiveType('OVERVIEW')
+                }
               }}
               data-active={isOverviewExpanded}
             >
-              {<SVGLoader src={eye} />}
+              <SVGLoader src={eye} />
               <span>Overview</span>
             </div>
+
             <div
               className="api-docs-api-tree__section__endpoints"
-              onClick={() => {
-                toggleSection(api.id, `api-${api.id}-endpoints`)
-              }}
+              onClick={() => toggleSection(api.apiSpecId, endpointsKey)}
               data-active={isEndpointActive && !isOverviewExpanded}
             >
-              {isEndpointsExpanded ? (
+              {expandedSections[endpointsKey] ? (
                 <SVGLoader src={arrowDownGray} />
               ) : (
                 <SVGLoader src={arrowRightGray} />
               )}
               <span>Endpoints</span>
             </div>
-            {isEndpointsExpanded && (
+
+            {expandedSections[endpointsKey] && (
               <div className="api-docs-api-tree__subsections">
                 {Object.entries(api.tags)
-                  .sort(([a], [b]) => {
-                    if (a === 'default') return 1
-                    if (b === 'default') return -1
-                    return a.localeCompare(b)
-                  })
-                  .map(([tagName, data], index) => renderSubSection(tagName, data, api, index))}
+                  .sort(([a], [b]) =>
+                    a === 'default' ? 1 : b === 'default' ? -1 : a.localeCompare(b)
+                  )
+                  .map(([tagName, data], i) => renderSubSection(tagName, data, api, i))}
               </div>
             )}
           </>
@@ -146,38 +209,7 @@ const DocsSideMenuTree = ({
     )
   }
 
-  const renderSubSection = (tagName, data, api, sectionIndex) => {
-    const sectionKey = `api-${api.id}-section-${sectionIndex}`
-    const isSectionExpanded = expandedSections[sectionKey]
-
-    return (
-      <div key={sectionKey} className="api-docs-api-tree__subsection">
-        <>
-          <div
-            className="api-docs-api-tree__subsection-header"
-            onClick={() => toggleSection(api.id, sectionKey)}
-          >
-            {isSectionExpanded ? (
-              <SVGLoader src={arrowDownGray} />
-            ) : (
-              <SVGLoader src={arrowRightGray} />
-            )}
-            <span className="api-docs-api-tree__subsection-title">{tagName}</span>
-          </div>
-
-          {isSectionExpanded && (
-            <div className="api-docs-api-tree__endpoints">{renderEndpoints(data, api)}</div>
-          )}
-        </>
-      </div>
-    )
-  }
-
-  return (
-    <aside className="api-docs-api-tree">
-      {apis.map((api, index) => renderApiSection(api, index))}
-    </aside>
-  )
+  return <aside className="api-docs-api-tree">{apis.map((api) => renderApiSection(api))}</aside>
 }
 
 export default DocsSideMenuTree

package/src/layout/docsComponents/index.scss

@@ -1,10 +1,12 @@
 .api-docs-layout {
+  @import url('https://fonts.googleapis.com/css2?family=Cascadia+Code:ital,wght@0,200..700;1,200..700&display=swap');
+
   display: grid;
   height: 100vh;
   max-height: 100%;
   width: 100%;
   overflow: hidden;
-  grid-template: 3.125rem auto / 12.5rem 1fr auto;
+  grid-template: 2.625rem auto / 12.5rem 1fr auto;
   padding: 0 !important;
 
   * {