Merge branch 'main' into add_open_to_title

OWASP · Jun 27, 2023 · d401510 · d401510
2 parents 0f849a0 + fa252d5
commit d401510
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 17 deletions.
diff --git a/application/frontend/src/components/DocumentNode/DocumentNode.tsx b/application/frontend/src/components/DocumentNode/DocumentNode.tsx
@@ -126,9 +126,10 @@ export const DocumentNode: FunctionComponent<DocumentNode> = ({
         <div className={`content${active} document-node`}>
           <Hyperlink hyperlink={usedNode.hyperlink} />
           {expanded &&
-            getTopicsToDisplayOrderdByLinkType().map(([type, links]) => {
+            getTopicsToDisplayOrderdByLinkType().map(([type, links], idx) => {
               return (
                 <div className="document-node__link-type-container" key={type}>
+                  {idx > 0 && <hr/>}
                   <div>
                     <span>{getDocumentDisplayName(usedNode)}</span>
                     <b> {DOCUMENT_TYPE_NAMES[type]}</b>:

diff --git a/application/frontend/src/components/DocumentNode/documentNode.scss b/application/frontend/src/components/DocumentNode/documentNode.scss
@@ -31,7 +31,7 @@
     }
   }
 
-  &__link-type-container:not(:first-child) {
-    padding-top: 20px;
+  &__link-type-container hr {
+    margin: 15px 0;
   }
 }
diff --git a/application/frontend/src/pages/CommonRequirementEnumeration/CommonRequirementEnumeration.tsx b/application/frontend/src/pages/CommonRequirementEnumeration/CommonRequirementEnumeration.tsx
@@ -65,16 +65,6 @@ export const CommonRequirementEnumeration = () => {
               </a>
             </>
           )}
-          {display.tags ? (
-            <div className="cre-page__tags">
-              Tags:
-              {display.tags.map((tag) => (
-                <b>{tag} </b>
-              ))}
-            </div>
-          ) : (
-            ''
-          )}
 
           {currentUrlParams.get('applyFilters') === 'true' ? (
             <div className="cre-page__filters">
@@ -95,7 +85,7 @@ export const CommonRequirementEnumeration = () => {
                     {getDocumentDisplayName(display)}
                     <b>{DOCUMENT_TYPE_NAMES[type]}</b>:
                   </div>
-                  {links.map((link, i) => (
+                  {links.sort((a, b) => getDocumentDisplayName(a.document).localeCompare(getDocumentDisplayName(b.document))).map((link, i) => (
                     <div key={i} className="accordion ui fluid styled cre-page__links-container">
                       <DocumentNode node={link.document} linkType={type} />
                       <FilterButton document={link.document} />

diff --git a/application/frontend/src/pages/Search/components/SearchResults.tsx b/application/frontend/src/pages/Search/components/SearchResults.tsx
@@ -1,12 +1,13 @@
 import React from 'react';
 
 import { DocumentNode } from '../../../components/DocumentNode';
+import { getDocumentDisplayName } from 'application/frontend/src/utils/document';
 
 export const SearchResults = ({ results }) => {
   if (results && results.length != 0) {
     return (
       <>
-        {results.map((document, i) => (
+        {results.sort((a, b) => getDocumentDisplayName(a).localeCompare(getDocumentDisplayName(b))).map((document, i) => (
           <div key={i} className="accordion ui fluid styled standard-page__links-container">
             <DocumentNode node={document} linkType={'Standard'} />
           </div>

diff --git a/application/frontend/src/pages/Standard/Standard.tsx b/application/frontend/src/pages/Standard/Standard.tsx
@@ -9,6 +9,7 @@ import { DocumentNode } from '../../components/DocumentNode';
 import { LoadingAndErrorIndicator } from '../../components/LoadingAndErrorIndicator';
 import { useEnvironment } from '../../hooks';
 import { Document } from '../../types';
+import { getDocumentDisplayName } from '../../utils/document';
 
 export const Standard = () => {
   let { type, id } = useParams();
@@ -44,7 +45,7 @@ export const Standard = () => {
         <LoadingAndErrorIndicator loading={loading} error={error} />
         {!loading &&
           !error &&
-          documents.map((standard, i) => (
+          documents.sort((a, b) => getDocumentDisplayName(a).localeCompare(getDocumentDisplayName(b))).map((standard, i) => (
             <div key={i} className="accordion ui fluid styled standard-page__links-container">
               <DocumentNode node={standard} linkType={'Standard'} />
             </div>

diff --git a/application/frontend/src/pages/Standard/StandardSection.tsx b/application/frontend/src/pages/Standard/StandardSection.tsx
@@ -85,7 +85,7 @@ export const StandardSection = () => {
                     {getDocumentDisplayName(document)}
                     <b>{DOCUMENT_TYPE_NAMES[type]}</b>:
                   </div>
-                  {links.map((link, i) => (
+                  {links.sort((a, b) => getDocumentDisplayName(a.document).localeCompare(getDocumentDisplayName(b.document))).map((link, i) => (
                     <div key={i} className="accordion ui fluid styled cre-page__links-container">
                       <DocumentNode node={link.document} linkType={type} />
                     </div>