Dev merge into Main

.eslintrc.json

@@ -10,6 +10,8 @@
   ],
   "rules": {
     "react-hooks/exhaustive-deps": "off",
+    "react-hooks/rules-of-hooks": "off",
+    "react/no-unescaped-entities": 0,
     "sort-imports-es6-autofix/sort-imports-es6": [
       2,
       {

.github/workflows/cd-workflows.yml

@@ -0,0 +1,68 @@
+name: Docker CD
+
+on:
+  push:
+    branches: 
+      - dev
+  pull_request:
+    branches: 
+      - main
+      - dev
+    types: [opened, synchronize, reopened]
+
+jobs:
+  code-test:
+    # Kicks off the workflow and prepares Github to run coverage test using a ubuntu-latest container.
+    name: Code Test
+    runs-on: ubuntu-latest
+    env:
+      OS: ubuntu-latest
+      PYTHON: '3.9'
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.9
+
+    # Install dependencies required for tests
+    - name: Install Dependencies
+      run: |
+        yarn install
+
+    # - name: Generate Coverage Report
+    #   env:
+    #     GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
+    #   run: |
+    #     echo "Cloning private repository"
+    #     git clone https://openlxp-host:${{ secrets.ACCESS_TOKEN }}@github.com/OpenLXP/openlxp-private.git
+    #     echo "Private repository cloned successfully"
+    #     echo "Copying .env file from openlxp-private to current working directory"
+    #     cp ./openlxp-private/openlxp-xds-ui-env/.env .
+    #     echo "Copied .env file successfully"
+    #     echo "Create openlxp docker network"
+    #     docker network create openlxp
+    #     echo "Docker network successfully created"
+        # yarn
+        # yarn test	--coverage
+
+  build:
+    # requires dependency from step above
+    needs: code-test
+    name: Build Docker Image
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout Code
+      uses: actions/checkout@v2
+    - name: Docker login
+      env:
+       DOCKER_USER: ${{ secrets.DOCKER_USER }}
+       DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+      run: |
+       echo "Authenticate to Docker"
+       docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
+    - name: Docker build
+      run: |
+       echo "Start docker build"
+       docker build . -t openlxp/openlxp-xds-ui

.gitignore

@@ -25,7 +25,6 @@ yarn-debug.log*
 yarn-error.log*
 
 # local env files
-.env
 .env.local
 .env.development.local
 .env.test.local

.nvmrc

@@ -0,0 +1 @@
+18.20.4

Dockerfile

@@ -1,23 +1,21 @@
 # Install dependencies only when needed
-FROM node:14.18.1-alpine AS deps
+FROM node:18.20-alpine AS deps
 
 # RUN apk add libc6-compat
 WORKDIR /app
 COPY package.json ./
 RUN yarn install --production
 
 # Rebuild the source code only when needed
-FROM node:14.18.1-alpine AS builder
+FROM node:18.20-alpine AS builder
 WORKDIR /app
 COPY . .
 COPY --from=deps /app/node_modules ./node_modules
 
-
 RUN yarn build
 
-
 # Production image, copy all the files and run next
-FROM node:14.18.1-alpine AS runner
+FROM node:18.20-alpine AS runner
 WORKDIR /app
 
 ENV NODE_ENV production
@@ -39,3 +37,4 @@ EXPOSE 3000
 ENV NEXT_TELEMETRY_DISABLED 1
 
 CMD ["yarn", "start"]
+

jest.setup.js

@@ -1,3 +1,3 @@
 import '@/__mocks__/mockSetUp';
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 

next.config.js

@@ -1,33 +1,63 @@
+const { createSecureHeaders } = require("next-secure-headers");
+
 const nextConfig = {
     reactStrictMode: true,
     swcMinify: true,
+    // basePath: '/ecc-openlxp-xds-ui',
+
     // Adding policies:
     async headers() {
         return [
             {
                 source: '/(.*)',
-                headers: [
-                    {
-                        key: 'X-Frame-Options',
-                        value: 'DENY',
-                    },
-                    {
-                        key: 'X-Content-Type-Options',
-                        value: 'nosniff',
-                    },
-                    {
-                        key: 'Referrer-Policy',
-                        value: 'origin-when-cross-origin',
-                    },
-                    {
-                        key: 'Strict-Transport-Security',
-                        value: 'max-age=63072000; includeSubDomains; preload',
-                    },
-                    {
-                        key: 'Content-Security-Policy',
-                        value: 'frame-ancestors "self" https://ecc.staging.dso.mil'
-                    },
-                ],
+                headers: createSecureHeaders({
+                    contentSecurityPolicy: {
+                        directives: {
+                            defaultSrc: [
+                                "'self'",
+                                "https://ecc.staging.dso.mil",
+                                "https://ecc.staging.dso.mil/ecc-openlxp-xds/",
+                                "https://ecc.apps.dso.mil",
+                                "https://ecc.apps.dso.mil/ecc-openlxp-xds-ui/"
+                            ],
+                            styleSrc: [
+                                "'self'",
+                                "https://ecc.apps.dso.mil",
+                                "https://ecc.apps.dso.mil/ecc-openlxp-xds-ui/",
+                                "https://ecc.staging.dso.mil", 
+                                "https://fonts.googleapis.com"
+                            ],
+                            imgSrc: ["'self'",
+                                    "data:",
+                                    "data:*",
+                                    "https://www.jcs.mil",
+                                    "https://www.aetc.af.mil",
+                                    "https://prod-discovery.edx-cdn.org",
+                                    "https://media.defense.gov",
+                                    "https://www.dote.osd.mil",
+                                    "https://d15cw65ipctsrr.cloudfront.net",
+                                    "https://d3njjcbhbojbot.cloudfront.net",
+                                    "https://coursera-course-photos.s3.amazonaws.com",
+                                    "https://ecc.apps.dso.mil"
+                            ],
+                            fontSrc: [
+                                "'self'", 
+                                "https://fonts.gstatic.com"
+                            ],
+                            frameAncestors: [
+                                "'self'",
+                                "https://ecc.staging.dso.mil",
+                                "https://ecc.apps.dso.mil",
+                                "https://ecc.apps.dso.mil/ecc-openlxp-xms-ui/"
+                            ]
+                        },
+                        frameGuard: "deny",
+                        noopen: "noopen",
+                        nosniff: "nosniff",
+                        xssProtection: "sanitize",
+                        referrerPolicy: "origin-when-cross-origin",
+                    }
+                })
             },
         ];
     },

package.json

@@ -2,42 +2,57 @@
   "name": "openlxp-xds",
   "version": "0.1.0",
   "private": true,
+  "homepage": ".",
   "dependencies": {
+    "@adobe/css-tools": "4.3.2",
+    "@babel/runtime": "^7.26.10",
     "@headlessui/react": "^1.4.2",
     "@heroicons/react": "^1.0.5",
     "@tailwindcss/line-clamp": "^0.3.0",
+    "@testing-library/dom": "^10.4.0",
     "@xapi/xapi": "^2.0.1",
     "autoprefixer": "^10.4.0",
-    "axios": "^0.23.0",
-    "next": "12.1.0",
-    "postcss": "^8.4.5",
+    "axios": "^1.8.2",
+    "brace-expansion": "^2.0.2",
+    "follow-redirects": "1.15.6",
+    "form-data": "4.0.4",
+    "micromatch": "4.0.8",
+    "next": "^14.2.25",
+    "next-secure-headers": "^2.2.0",
+    "postcss": "^8.4.31",
     "query-string": "^7.0.1",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-query": "^3.26.0",
-    "react-test-renderer": "^17.0.2",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
+    "react-query": "^3.39.3",
+    "react-router-dom": "^5.2.0",
+    "react-test-renderer": "^18",
+    "sharp": "0.32.6",
     "tailwindcss": "^3.0.7",
-    "use-resize-observer": "^9.1.0"
+    "tar-fs": "^2.1.3"
   },
   "scripts": {
     "dev": "next dev",
     "build": "next build",
     "start": "next start",
     "lint": "next lint",
-    "test": "jest --watch",
-    "coverage": "jest --watchAll --coverage --verbose --noStackTrace --silent --maxWorkers=50%"
+    "test:unit": "jest --coverage --watchAll=false",
+    "coverage": "jest --watchAll --coverage --verbose --noStackTrace --silent --maxWorkers=50%",
+    "test:e2e-ci": "CYPRESS_BASE_URL=${ZAP_URL} npx cypress run --browser chrome --config-file cypress/config/pipeline.config.js"
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^5.14.1",
-    "@testing-library/react": "^12.1.2",
+    "@babel/core": "^7.23.2",
+    "@babel/preset-react": "^7.22.15",
+    "@testing-library/jest-dom": "^6.6.3",
+    "@testing-library/react": "^14.0.0",
     "@testing-library/react-hooks": "^7.0.2",
+    "braces": "^3.0.3",
     "eslint": "^8.6.0",
     "eslint-config-next": "12.0.7",
     "eslint-plugin-sort-imports-es6-autofix": "^0.6.0",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^27.2.5",
     "jest-mock-axios": "^4.4.1",
-    "next-router-mock": "^0.5.3",
+    "next-router-mock": "^0.9.11",
     "prettier": "2.5.1"
   }
 }

sonar-project.properties

@@ -0,0 +1,12 @@
+sonar.projectKey=OpenLXP_openlxp-xds-ui
+sonar.organization=openlxp
+
+# This is the name and version displayed in the SonarCloud UI.
+#sonar.projectName=openlxp-xds
+#sonar.projectVersion=1.0
+
+# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
+#sonar.sources=.
+
+# Encoding of the source code. Default is default system encoding
+#sonar.sourceEncoding=UTF-8

src/__mocks__/authContextMock.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import { useContext, createContext } from "react";
+import { createContext, useContext } from "react";
 export const AuthContext = createContext()
 export const AuthContextWrapper = ({children}) => {
     const login = jest.fn()