Merge branch 'main' of https://github.com/Matej4545/dependency-visualization

Author: Matej Groman

docker-compose-azure.yml

@@ -46,6 +46,7 @@ services:
       REDIS_PASSWORD: ${REDIS_PASSWORD:?error}
       NEXT_PUBLIC_SONATYPE_OSS_AUTH: ${SONATYPE_OSS_AUTH}
       NEXT_PUBLIC_SERVER_URI: ${NEXT_PUBLIC_SERVER_URI:-http://localhost:3000}
+      NEXT_PUBLIC_GRAPH_EXCLUDED_REGEX: ${GRAPH_EXCLUDED_REGEX:-" "}
       VULN_DB: ${VULN_DB:-Sonatype}
       CORS_ORIGIN: ${CORS_ORIGIN:-http://localhost:3000}
 volumes:

docker-compose.yml

@@ -7,9 +7,7 @@ services:
       - 7474:7474
       - 7687:7687
     volumes:
-      - ./runtime/data:/data
-      - ./runtime/logs:/logs
-      - ./runtime/plugins:/var/lib/neo4j/plugins
+      -   neo4j:/data
     restart: unless-stopped
     environment:
       - NEO4J_AUTH=neo4j/${NEO4J_PASSWORD:?error}
@@ -48,7 +46,11 @@ services:
       NEXT_PUBLIC_SONATYPE_OSS_AUTH: ${SONATYPE_OSS_AUTH}
       NEXT_PUBLIC_SERVER_URI: ${NEXT_PUBLIC_SERVER_URI:-http://localhost:3000}
       VULN_DB: ${VULN_DB:-Sonatype}
+      NEXT_PUBLIC_GRAPH_EXCLUDED_REGEX: ${GRAPH_EXCLUDED_REGEX:-" "}
       CORS_ORIGIN: ${CORS_ORIGIN:-http://localhost:3000}
 volumes:
   cache:
     driver: local
+  neo4j: 
+    driver: local
+

src/depvis-next/apollo/ApolloClient.ts

@@ -1,12 +1,7 @@
-import {
-  ApolloClient,
-  createHttpLink,
-  InMemoryCache,
-  NormalizedCacheObject,
-} from "@apollo/client";
-import { GraphQLUri } from "./ApolloServer";
+import { ApolloClient, createHttpLink, InMemoryCache } from "@apollo/client";
 import { useMemo } from "react";
 import urlJoin from "url-join";
+import { GraphQLUri } from "./ApolloServer";
 
 let httpApolloClient;
 let ssrApolloClient;
@@ -26,7 +21,6 @@ const httpLink = createHttpLink({
 });
 
 const createHttpApolloClient = (ssr: boolean = false) => {
-  const link = ssr ? ssrHttpLink : httpLink;
   console.log("Creating new Apollo Client (ssr: %s)", ssr);
   return new ApolloClient({
     ssrMode: ssr,

src/depvis-next/apollo/ApolloServer.ts

@@ -1,6 +1,5 @@
-import { Driver } from "neo4j-driver";
+import neo4j, { Driver } from "neo4j-driver";
 import { env } from "process";
-import neo4j from "neo4j-driver";
 
 export const GraphQLUri = "/api/graphql";
 

src/depvis-next/components/Details/DescriptionList.tsx

@@ -1,9 +1,19 @@
 import { OverlayTrigger, Stack, Tooltip } from "react-bootstrap";
 
+/**
+ * DataItem Wrapper
+ * @param props React children
+ * @returns
+ */
 const DL = (props) => {
   return <dl>{props.children}</dl>;
 };
 
+/**
+ * Data Item which creates a text with label component
+ * @param props a props object containing label, value, alwaysShow, tooltipText, horizontal attributes
+ * @returns
+ */
 const DLItem = (props) => {
   const { label, value, alwaysShow, tooltipText, horizontal } = props;
   if (!label || (!alwaysShow && !value)) return;

src/depvis-next/components/Details/Details.tsx

@@ -1,13 +1,5 @@
 import { useState } from "react";
-import {
-  Button,
-  Col,
-  Collapse,
-  Container,
-  Row,
-  Stack,
-  Table,
-} from "react-bootstrap";
+import { Button, Collapse, Stack, Table } from "react-bootstrap";
 
 export default function Details(props) {
   const [open, setOpen] = useState(false);

src/depvis-next/components/Details/VulnerabilityDetails.tsx

@@ -1,7 +1,5 @@
 import { gql, useQuery } from "@apollo/client";
-import Link from "next/link";
 import { Badge, Container } from "react-bootstrap";
-import urlJoin from "url-join";
 import { vulnerabilityColorByCVSS } from "../../helpers/GraphHelper";
 import Loading from "../Loading/Loading";
 import { DL, DLItem } from "./DescriptionList";

src/depvis-next/components/Dropdown/Dropdown.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import { Container, Form } from "react-bootstrap";
 
 export type DropdownItem = {
@@ -19,7 +19,7 @@ export default function Dropdown(props) {
       <Form>
         {title && <Form.Label>{title}</Form.Label>}
         <Form.Select
-          value={selectedId && selectedId}
+          value={selectedId}
           disabled={disabled}
           onChange={(e) => {
             setSelectedId(e.target.value);

src/depvis-next/components/Error/GenericError.tsx

@@ -1,12 +1,10 @@
-import Link from 'next/link';
-import { useRouter } from 'next/router';
-import { Container } from 'react-bootstrap';
+import Link from "next/link";
+import { Container } from "react-bootstrap";
 
 export default function GenericError(props) {
-  const router = useRouter();
   return (
     <Container className="mx-auto my-5 text-center">
-      <p className="fs-4 fw-bold">{props.error.message || 'Error occured!'}</p>
+      <p className="fs-4 fw-bold">{props.error.message || "Error occured!"}</p>
       <pre>{JSON.stringify(props.error)}</pre>
       <Link href="/">Go to homepage</Link>
     </Container>

src/depvis-next/components/Error/NoProjectFoundError.tsx

@@ -1,7 +1,7 @@
 import Link from "next/link";
 import { Button, Container } from "react-bootstrap";
 
-export default function NoProjectFoundError(props) {
+export default function NoProjectFoundError() {
   return (
     <Container className="mx-auto my-5 text-center">
       <p className="fs-4 fw-bold">No project found!</p>