Merge branch 'main' into gsocmodule_C_week_5

Author: PRAteek-singHWY

.dockerignore

@@ -48,6 +48,7 @@ Vagrantfile
 
 ### conventions ###
 venv/
+.venv/
 venv-*/
 v/
 

Dockerfile

@@ -1,6 +1,7 @@
 FROM node:lts as build
 LABEL org.opencontainers.image.source = "https://github.com/OWASP/OpenCRE"
 WORKDIR /code
+RUN apt-get update && apt-get install -y chromium
 COPY . /code
 RUN yarn install && yarn build
 

application/frontend/src/pages/Explorer/visuals/force-graph/forceGraph.tsx

@@ -31,7 +31,7 @@ export const ExplorerForceGraph = () => {
     fullLoadProgress,
     dataLoadError,
   } = useDataStore();
-  const fgRef = useRef<ForceGraphMethods>();
+  const fgRef = useRef<ForceGraphMethods | undefined>(undefined);
   // ADDING STATE FOR FILTERING LOGIC
   const [filterTypeA, setFilterTypeA] = useState('');
   const [filterTypeB, setFilterTypeB] = useState('');

application/frontend/src/pages/GapAnalysis/GapAnalysis.tsx

@@ -127,7 +127,7 @@ export const GapAnalysis = () => {
   const [loadingGA, setLoadingGA] = useState<boolean>(false);
   const [error, setError] = useState<string | null | object>(null);
   const { apiUrl } = useEnvironment();
-  const timerIdRef = useRef<NodeJS.Timer>();
+  const timerIdRef = useRef<ReturnType<typeof setInterval> | undefined>(undefined);
 
   useEffect(() => {
     const fetchData = async () => {
@@ -173,7 +173,9 @@ export const GapAnalysis = () => {
       timerIdRef.current = setInterval(pollingCallback, 10000);
     };
     const stopPolling = () => {
-      clearInterval(timerIdRef.current);
+      if (timerIdRef.current !== undefined) {
+        clearInterval(timerIdRef.current);
+      }
     };
 
     if (gaJob) {

application/frontend/src/pages/chatbot/chatbot.tsx

@@ -105,7 +105,7 @@ export const Chatbot = () => {
 
   function processResponse(response: string) {
     const responses = response.split('```');
-    const res: JSX.Element[] = [];
+    const res: React.ReactElement[] = [];
 
     responses.forEach((txt, i) => {
       if (i % 2 === 0) {

application/frontend/src/routes.tsx

@@ -1,4 +1,4 @@
-import { ReactNode } from 'react';
+import { ElementType } from 'react';
 
 import {
   BROWSEROOT,
@@ -34,7 +34,7 @@ const ExplorerForceGraphWithLayout = withExplorerLayout(ExplorerForceGraph);
 
 export interface IRoute {
   path: string;
-  component: ReactNode | ReactNode[];
+  component: ElementType;
   showFilter: boolean;
 }
 export interface Capabilities {

package.json

@@ -8,7 +8,7 @@
     "build": "webpack --config webpack.prod.js",
     "start": "webpack serve",
     "test:e2e": "jest",
-    "postinstall": "del-cli node_modules/@types/react-dom/node_modules/@types && del-cli node_modules/webpack/types.d.ts"
+    "postinstall": "del-cli node_modules/@types/react-dom/node_modules/@types && del-cli node_modules/webpack/types.d.ts && del-cli node_modules/@types/minimatch"
   },
   "keywords": [],
   "author": "Craig Knott",

scripts/prod-docker-entrypoint.sh

@@ -2,7 +2,19 @@
 
 export INSECURE_REQUESTS=1
 export FLASK_CONFIG="production"
-export FLASK_APP=`pwd`/cre.py 
-flask db upgrade
+export FLASK_APP=`pwd`/cre.py
+flask db upgrade heads
+python - <<'PY'
+import sqlite3
+
+db_path = "/code/standards_cache.sqlite"
+conn = sqlite3.connect(db_path)
+for table in ("cre", "node"):
+    cols = {row[1] for row in conn.execute(f"PRAGMA table_info({table})")}
+    if "document_metadata" not in cols:
+        conn.execute(f"ALTER TABLE {table} ADD COLUMN document_metadata JSON")
+conn.commit()
+conn.close()
+PY
 python /code/cre.py --upstream_sync
 gunicorn cre:app -b :5000 --timeout 90

tsconfig.json

@@ -16,5 +16,5 @@
     "esModuleInterop": true
   },
   "include": ["**/*.ts", "**/*.tsx", "**/*.js", "src/**/*"],
-  "exclude": ["venv", "dist", "node_modules", "build", "scripts"]
+  "exclude": ["venv", "dist", "node_modules", "build", "scripts", "application/frontend/www"]
 }