Merge branch 'main' into feat/explorer-force-graph-polish

PRAteek-singHWY · web-flow · commit 256fbb5052ba · 2026-03-27T17:12:12.000+05:30
diff --git a/application/database/db.py b/application/database/db.py
@@ -2060,7 +2060,7 @@ def dbNodeFromCode(code: cre_defs.Node) -> Node:
     code = cast(cre_defs.Code, code)
     tags = ""
     if code.tags:
-        tags = ",".join(tags)
+        tags = ",".join(code.tags)
     return Node(
         name=code.name,
         ntype=code.doctype.value,
diff --git a/application/frontend/src/components/DocumentNode/DocumentNode.tsx b/application/frontend/src/components/DocumentNode/DocumentNode.tsx
@@ -2,10 +2,10 @@ import './documentNode.scss';
 
 import axios from 'axios';
 import React, { FunctionComponent, useContext, useEffect, useMemo, useState } from 'react';
-import { Link, useHistory } from 'react-router-dom';
+import { Link, useHistory, useLocation } from 'react-router-dom';
 import { Icon } from 'semantic-ui-react';
 
-import { TYPE_AUTOLINKED_TO, TYPE_CONTAINS, TYPE_IS_PART_OF, TYPE_RELATED } from '../../const';
+import { CRE, TYPE_AUTOLINKED_TO, TYPE_CONTAINS, TYPE_IS_PART_OF, TYPE_RELATED } from '../../const';
 import { useEnvironment } from '../../hooks';
 import { applyFilters } from '../../hooks/applyFilters';
 import { Document } from '../../types';
@@ -14,6 +14,7 @@ import { getApiEndpoint, getDocumentTypeText, getInternalUrl } from '../../utils
 import { FilterButton } from '../FilterButton/FilterButton';
 import { LoadingAndErrorIndicator } from '../LoadingAndErrorIndicator';
 
+const MAX_LENGTH_FOR_AUTO_EXPAND = 5;
 export interface DocumentNode {
   node: Document;
   linkType: string;
@@ -30,6 +31,7 @@ export const DocumentNode: FunctionComponent<DocumentNode> = ({
   hasLinktypeRelatedParent,
 }) => {
   const [expanded, setExpanded] = useState<boolean>(false);
+  const [showAll, setShowAll] = useState<Record<number, boolean>>({});
   const isStandard = node.doctype in ['Tool', 'Code', 'Standard'];
   const { apiUrl } = useEnvironment();
   const [nestedNode, setNestedNode] = useState<Document>();
@@ -42,6 +44,27 @@ export const DocumentNode: FunctionComponent<DocumentNode> = ({
   const hasExternalLink = Boolean(usedNode.hyperlink);
   const linksByType = useMemo(() => groupLinksByType(usedNode), [usedNode]);
   let currentUrlParams = new URLSearchParams(window.location.search);
+  const { pathname } = useLocation();
+  const isCrePath = useMemo(() => pathname.includes(CRE), [pathname]);
+
+  const isNestedInRelated = hasLinktypeRelatedParent || linkType === TYPE_RELATED;
+
+  const getTopicsToDisplayOrderdByLinkType = () => {
+    return Object.entries(linksByType)
+      .filter(([type, _]) => !linkTypesExcludedInNesting.includes(type))
+      .filter(([type, _]) =>
+        isNestedInRelated ? !linkTypesExcludedWhenNestingRelatedTo.includes(type) : true
+      );
+  };
+
+  const topicsToDisplay = useMemo(() => getTopicsToDisplayOrderdByLinkType(), [linksByType, isNestedInRelated]);
+
+  useEffect(() => {
+    const isAllowedToAutoExpandByLength =
+      topicsToDisplay.map(([, links]) => links).reduce((prev, cur) => prev.concat(cur), []).length <=
+      MAX_LENGTH_FOR_AUTO_EXPAND;
+    setExpanded(isCrePath ? isAllowedToAutoExpandByLength : false);
+  }, [topicsToDisplay, isCrePath]);
 
   useEffect(() => {
     if (!isStandard && linkTypesToNest.includes(linkType)) {
@@ -66,19 +89,7 @@ export const DocumentNode: FunctionComponent<DocumentNode> = ({
   };
 
   const hasActiveLinks = () => {
-    return getTopicsToDisplayOrderdByLinkType().length > 0;
-  };
-
-  const isNestedInRelated = (): Boolean => {
-    return hasLinktypeRelatedParent || linkType === TYPE_RELATED;
-  };
-
-  const getTopicsToDisplayOrderdByLinkType = () => {
-    return Object.entries(linksByType)
-      .filter(([type, _]) => !linkTypesExcludedInNesting.includes(type))
-      .filter(([type, _]) =>
-        isNestedInRelated() ? !linkTypesExcludedWhenNestingRelatedTo.includes(type) : true
-      );
+    return topicsToDisplay.length > 0;
   };
 
   const Hyperlink = (hyperlink) => {
@@ -134,37 +145,39 @@ export const DocumentNode: FunctionComponent<DocumentNode> = ({
         <div className={`content${active} document-node`}>
           <Hyperlink hyperlink={usedNode.hyperlink} />
           {expanded &&
-            getTopicsToDisplayOrderdByLinkType().map(([type, links], idx) => {
-              const sortedResults = links.sort((a, b) =>
+            topicsToDisplay.map(([type, links], idx) => {
+              const sortedResults = [...links].sort((a, b) =>
                 getDocumentDisplayName(a.document).localeCompare(getDocumentDisplayName(b.document))
               );
-              let lastDocumentName = sortedResults[0].document.name;
               return (
-                <div className="document-node__link-type-container" key={type}>
+                <div className="document-node__link-type-container" key={`${type}-${idx}`}>
                   {idx > 0 && <hr style={{ borderColor: 'transparent', margin: '20px 0' }} />}
                   <div>
                     <b>Which {getDocumentTypeText(type, links[0].document.doctype, node.doctype)}</b>:
                     {/* Risk here of mixed doctype in here causing odd output */}
                   </div>
                   <div>
                     <div className="accordion ui fluid styled f0">
-                      {sortedResults.map((link, i) => {
-                        const temp = (
-                          <div key={Math.random()}>
-                            {lastDocumentName !== link.document.name && <span style={{ margin: '5px' }} />}
-                            <DocumentNode
-                              node={link.document}
-                              linkType={type}
-                              hasLinktypeRelatedParent={isNestedInRelated()}
-                              key={Math.random()}
-                            />
-                            <FilterButton document={link.document} />
-                          </div>
-                        );
-                        lastDocumentName = link.document.name;
-                        return temp;
-                      })}
+                      {sortedResults.slice(0, showAll[idx] ? sortedResults.length : MAX_LENGTH_FOR_AUTO_EXPAND).map((link, i) => (
+                        <div key={`document-node-container-${type}-${idx}-${i}`} style={{ marginBottom: '4px' }}>
+                          <DocumentNode
+                            node={link.document}
+                            linkType={type}
+                            hasLinktypeRelatedParent={isNestedInRelated as boolean}
+                            key={`document-sub-node-${type}-${idx}-${i}`}
+                          />
+                          <FilterButton document={link.document} />
+                        </div>
+                      ))}
                     </div>
+                    {sortedResults.length > MAX_LENGTH_FOR_AUTO_EXPAND && (
+                      <button
+                        onClick={() => setShowAll(prev => ({ ...prev, [idx]: !prev[idx] }))}
+                        style={{ marginTop: '8px', cursor: 'pointer' }}
+                      >
+                        {showAll[idx] ? 'Show less ▲' : 'Show more ▼'}
+                      </button>
+                    )}
                   </div>
                 </div>
               );
diff --git a/application/frontend/src/pages/CommonRequirementEnumeration/CommonRequirementEnumeration.tsx b/application/frontend/src/pages/CommonRequirementEnumeration/CommonRequirementEnumeration.tsx
@@ -13,20 +13,24 @@ import { Document } from '../../types';
 import { groupLinksByType } from '../../utils';
 import { getDocumentDisplayName, getDocumentTypeText, orderLinksByType } from '../../utils/document';
 
+const MAX_LENGTH_FOR_AUTO_EXPAND = 5;
+
 export const CommonRequirementEnumeration = () => {
   const { id } = useParams<{ id: string }>();
   const { search } = useLocation();
   const { apiUrl } = useEnvironment();
   const [loading, setLoading] = useState<boolean>(false);
   const [error, setError] = useState<string | Object | null>(null);
   const [data, setData] = useState<Document | null>();
+  const [showAll, setShowAll] = useState<Record<string, boolean>>({});
   const source = useMemo(() => {
     const sourceParam = new URLSearchParams(search).get('source');
     return sourceParam && sourceParam.trim().length > 0 ? sourceParam : null;
   }, [search]);
 
   useEffect(() => {
     setLoading(true);
+    setShowAll({});
     window.scrollTo(0, 0);
 
     const params = source ? { params: { source } } : undefined;
@@ -93,24 +97,26 @@ export const CommonRequirementEnumeration = () => {
                 const sortedResults = links.sort((a, b) =>
                   getDocumentDisplayName(a.document).localeCompare(getDocumentDisplayName(b.document))
                 );
-                let lastDocumentName = sortedResults[0].document.name;
                 return (
                   <div className="cre-page__links" key={type}>
                     <div className="cre-page__links-eader">
                       <b>Which {getDocumentTypeText(type, links[0].document.doctype)}</b>:
                       {/* Risk of mixed doctype in here causing odd output */}
                     </div>
-                    {sortedResults.map((link, i) => {
-                      const temp = (
-                        <div key={i} className="accordion ui fluid styled cre-page__links-container">
-                          {lastDocumentName !== link.document.name && <span style={{ margin: '5px' }} />}
-                          <DocumentNode node={link.document} linkType={type} />
-                          <FilterButton document={link.document} />
-                        </div>
-                      );
-                      lastDocumentName = link.document.name;
-                      return temp;
-                    })}
+                    {sortedResults.slice(0, showAll[type] ? sortedResults.length : MAX_LENGTH_FOR_AUTO_EXPAND).map((link, i) => (
+                      <div key={i} className="accordion ui fluid styled cre-page__links-container" style={{ marginBottom: '4px' }}>
+                        <DocumentNode node={link.document} linkType={type} />
+                        <FilterButton document={link.document} />
+                      </div>
+                    ))}
+                    {sortedResults.length > MAX_LENGTH_FOR_AUTO_EXPAND && (
+                      <button
+                        onClick={() => setShowAll(prev => ({ ...prev, [type]: !prev[type] }))}
+                        style={{ marginTop: '8px', cursor: 'pointer' }}
+                      >
+                        {showAll[type] ? 'Show less ▲' : 'Show more ▼'}
+                      </button>
+                    )}
                   </div>
                 );
               })}
diff --git a/application/frontend/src/pages/Explorer/GraphDebugPanel.scss b/application/frontend/src/pages/Explorer/GraphDebugPanel.scss
@@ -11,6 +11,7 @@
     gap: 8px;
     margin-bottom: 8px;
     font-size: 14px;
+    flex-wrap: wrap;
   }
 
   &__summary {
@@ -26,13 +27,20 @@
   }
 
   &__table-wrap {
+    width: 100%;
     overflow-x: auto;
-    max-height: 400px;
     overflow-y: auto;
+    max-height: 400px;
+    -webkit-overflow-scrolling: touch;
+  }
+
+  &__table {
+    min-width: 700px;
   }
 
   &__node-name {
     font-family: monospace;
     font-size: 12px;
+    white-space: nowrap;
   }
 }
diff --git a/application/frontend/src/pages/Explorer/GraphDebugPanel.tsx b/application/frontend/src/pages/Explorer/GraphDebugPanel.tsx
@@ -77,7 +77,7 @@ export const GraphDebugPanel = ({ dataStore }: GraphDebugPanelProps) => {
       </div>
 
       <div className="graph-debug-panel__table-wrap">
-        <Table compact size="small" celled>
+        <Table compact size="small" celled unstackable className="graph-debug-panel__table">
           <Table.Header>
             <Table.Row>
               <Table.HeaderCell>Node</Table.HeaderCell>
diff --git a/application/frontend/src/pages/Explorer/explorer.scss b/application/frontend/src/pages/Explorer/explorer.scss
@@ -14,7 +14,7 @@ main#explorer-content {
   p,
   label,
   .menu-title {
-    color: #f7fafc;
+    color: #1a202c;
   }
 
   a {
diff --git a/application/frontend/src/pages/Explorer/explorer.tsx b/application/frontend/src/pages/Explorer/explorer.tsx
@@ -2,7 +2,7 @@ import './explorer.scss';
 
 import React, { useEffect, useState } from 'react';
 import { Link } from 'react-router-dom';
-import { Checkbox, List } from 'semantic-ui-react';
+import { Checkbox, List, Popup } from 'semantic-ui-react';
 
 import { LoadingAndErrorIndicator } from '../../components/LoadingAndErrorIndicator';
 import { TYPE_CONTAINS, TYPE_LINKED_TO } from '../../const';
@@ -160,13 +160,21 @@ export const Explorer = () => {
               </li>
             </ul>
           </div>
-          <div id="debug-toggle">
+          <div id="debug-toggle" style={{ display: 'flex', alignItems: 'center', gap: '8px' }}>
             <Checkbox
               toggle
               label="Debug mode"
               checked={debugMode}
               onChange={() => setDebugMode(!debugMode)}
             />
+            <Popup
+               content="Debug mode shows graph connectivity stats and link type details for each CRE node."
+            trigger={
+               <span style={{ cursor: 'help', color: '#666', fontSize: '14px', border: '1px solid #666', borderRadius: '50%', padding: '0 4px', fontWeight: 'bold' }}>
+                ?
+               </span>
+              }
+            />
           </div>
         </div>
 
diff --git a/application/utils/external_project_parsers/parsers/misc_tools_parser.py b/application/utils/external_project_parsers/parsers/misc_tools_parser.py
@@ -3,8 +3,7 @@
 import os
 import re
 import urllib
-from typing import List, NamedTuple
-from xmlrpc.client import boolean
+from typing import List
 
 from application.database import db
 from application.defs import cre_defs as defs
@@ -22,7 +21,7 @@
 
 
 class MiscTools(ParserInterface):
-    name = "miscelaneous tools"
+    name = "miscellaneous tools"
     tool_urls = [
         "https://github.com/commjoen/wrongsecrets.git",
     ]
@@ -33,23 +32,30 @@ def parse(self, cache: db.Node_collection, ph: prompt_client.PromptHandler):
         tools = {}
         for url in self.tool_urls:
             tool_entries = self.parse_tool(cache=cache, tool_repo=url)
-            tools[tool_entries[0].name] = tool_entries
+            if tool_entries:
+                tools[tool_entries[0].name] = tool_entries
         return ParseResult(results=tools)
 
     def parse_tool(
-        self, tool_repo: str, cache: db.Node_collection, dry_run: boolean = False
-    ):
-        if not dry_run:
-            repo = git.clone(tool_repo)
+        self, tool_repo: str, cache: db.Node_collection, dry_run: bool = False
+    ) -> List[defs.Tool]:
+        if dry_run:
+            logger.info("dry run, skipping clone and parsing for %s", tool_repo)
+            return []
+        repo = git.clone(tool_repo)
         readme = os.path.join(repo.working_dir, "README.md")
         title_regexp = r"# (?P<title>(\w+ ?)+)"
         cre_link = r".*\[.*\]\((?P<url>(https\:\/\/www\.)?opencre\.org\/cre\/(?P<cre>\d+-\d+).*)"
-        tool_entries = []
+        tool_entries: List[defs.Tool] = []
         with open(readme) as rdf:
             mdtext = rdf.read()
 
             if "opencre.org" not in mdtext:
-                logging.error("didn't find a link, bye")
+                logger.error(
+                    "no opencre.org link found in %s for repo %s, skipping",
+                    readme,
+                    tool_repo,
+                )
                 return []
             title = re.search(title_regexp, mdtext)
             cre = re.search(cre_link, mdtext, flags=re.IGNORECASE)
@@ -86,7 +92,7 @@ def parse_tool(
                                 document=dbcre,
                             )
                         )
-                        print(
+                        logger.info(
                             f"Registered new Document of type:Tool, toolType: {tool_type}, name:{tool_name} and hyperlink:{hyperlink},"
                             f"linked to cre:{dbcre.id}"
                         )
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
diff --git a/docs/designs/easier-importing.md b/docs/designs/easier-importing.md

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`gap: 8px;`
`12`	`12`	`margin-bottom: 8px;`
`13`	`13`	`font-size: 14px;`
	`14`	`+ flex-wrap: wrap;`
`14`	`15`	`}`
`15`	`16`
`16`	`17`	`&__summary {`
`@@ -26,13 +27,20 @@`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`&__table-wrap {`
	`30`	`+ width: 100%;`
`29`	`31`	`overflow-x: auto;`
`30`		`- max-height: 400px;`
`31`	`32`	`overflow-y: auto;`
	`33`	`+ max-height: 400px;`
	`34`	`+ -webkit-overflow-scrolling: touch;`
	`35`	`+ }`
	`36`	`+`
	`37`	`+ &__table {`
	`38`	`+ min-width: 700px;`
`32`	`39`	`}`
`33`	`40`
`34`	`41`	`&__node-name {`
`35`	`42`	`font-family: monospace;`
`36`	`43`	`font-size: 12px;`
	`44`	`+ white-space: nowrap;`
`37`	`45`	`}`
`38`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ main#explorer-content {`
`14`	`14`	`p,`
`15`	`15`	`label,`
`16`	`16`	`.menu-title {`
`17`		`- color: #f7fafc;`
	`17`	`+ color: #1a202c;`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`a {`