Merge branch 'develop' into feature/CDE-54

Dockerfile

@@ -2,6 +2,8 @@ ARG PARENT=ubuntu/nginx
 ARG NODE_PARENT=node:18.12.1
 
 FROM ${NODE_PARENT} as build
+ARG VITE_API_KEY
+ENV VITE_API_KEY=$VITE_API_KEY
 ENV APP_DIR=/app
 
 WORKDIR ${APP_DIR}
@@ -13,10 +15,16 @@ RUN npm install
 
 # user node
 ADD --chown=node:node . ${APP_DIR}
+COPY replace_env_vars.sh /usr/local/bin/replace_env_vars.sh
+RUN chmod +x /usr/local/bin/replace_env_vars.sh
+RUN /usr/local/bin/replace_env_vars.sh
 RUN npm run build
 
 FROM ${PARENT}
 ENV PORT=80
 
+# Copy the custom NGINX configuration file
+COPY default.conf /etc/nginx/sites-available/default
+
 COPY --from=build /app/demo/* /var/www/html
 EXPOSE ${PORT}

README.md

@@ -23,5 +23,17 @@ run
 docker run --name cde-mapper -e TZ=UTC -p 8000:80 cde-mapper
 ```
 
+## docker-compose
+
+run
+```bash
+docker-compose up --build
+```
+
+stop:
+```bash
+docker-compose down
+```
+
 open the url http://localhost:8000/
 

default.conf

@@ -0,0 +1,15 @@
+server {
+    listen 80;
+
+    location / {
+        root /var/www/html;
+        index index.html index.htm;
+        try_files $uri $uri/ =404;
+    }
+
+    location /api/ {
+        proxy_pass https://scicrunch.org;
+        proxy_set_header Host scicrunch.org;
+        proxy_pass_request_headers on;
+    }
+}

demo/integration.js

@@ -1,5 +1,5 @@
 
-import {init, mapElasticSearchHitsToOptions} from '../lib/main.tsx';
+import {init, mapElasticSearchHitsToOptions} from './cde-mapper.js';
 import {getQueryObject} from "./query.js";
 
 export function mapAndInit(datasetMappingFile, additionalDatasetMappingsFiles, datasetFile) {
@@ -111,7 +111,14 @@ function getCollections() {
 
 async function fetchElasticSearchData(queryString) {
     const query = getQueryObject(queryString)
-    const response = await fetch('/api', {
+    const apiKey = import.meta.env.VITE_API_KEY;
+    const baseUrl = '/api/1/elastic/Interlex_pr/_search';
+
+    const queryParameters = new URLSearchParams({
+        key: apiKey,
+    }).toString();
+
+    const response = await fetch(`${baseUrl}?${queryParameters}`, {
         method: 'POST',
         headers: {
             'Content-Type': 'application/json',

docker-compose.yaml

@@ -0,0 +1,6 @@
+version: "2.4"
+services:
+  cde-demo:
+    build: .
+    ports:
+      - "8080:80"

k8s/codefresh.yaml

@@ -20,6 +20,8 @@ steps:
     tag: "${{CF_SHORT_REVISION}}"
     dockerfile: Dockerfile
     registry: ${{REGISTRY}}
+    build_arguments:
+      - VITE_API_KEY=${{VITE_API_KEY}}
   deploy-to-kubernetes:
     image: codefresh/cf-deploy-kubernetes
     tag: latest
@@ -31,3 +33,4 @@ steps:
     environment:
       - KUBECONTEXT=${{CLUSTER}}
       - KUBERNETES_NAMESPACE=${{NAMESPACE}}
+      - VITE_API_KEY=${{VITE_API_KEY}}

lib/components/common/HoveredOptionContent.tsx

@@ -1,6 +1,6 @@
 import {Stack, Typography, Box} from '@mui/material';
 import {vars} from '../../theme/variables';
-import {Option} from "./CustomMappingDropdown.tsx";
+import {Option} from "../../models.ts";
 
 const {
     gray400,

lib/components/steps/mapping/MappingTab.tsx

@@ -174,7 +174,7 @@ const MappingTab = ({defaultCollection}: MappingProps) => {
 
     const handleFiltering = () => {
         // TODO: to implement
-        console.log("To be implemented " + visibleRows)
+        void visibleRows
         setVisibleRows([])
     }
 
@@ -214,13 +214,13 @@ const MappingTab = ({defaultCollection}: MappingProps) => {
         );
     };
 
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const getPairingSuggestions = (key: string) => {
+        void key
         return []
     };
 
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const hasPairingSuggestions = (key: string) => {
+        void key
         return false
     };
 

package.json

@@ -33,7 +33,6 @@
     "@typescript-eslint/eslint-plugin": "^6.14.0",
     "@typescript-eslint/parser": "^6.14.0",
     "@vitejs/plugin-react": "^4.2.1",
-    "dotenv": "^16.4.5",
     "eslint": "^8.55.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.5",

replace_env_vars.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+# replace_env_vars.sh
+
+for var in $(printenv | grep VITE_ | awk -F= '{print $1}'); do
+  sed -i 's|import.meta.env.'$var'|"'$(printenv $var)'"|g' ./demo/*.js
+done

vite.config.ts

@@ -3,9 +3,6 @@ import {resolve} from 'path'
 
 import react from '@vitejs/plugin-react'
 import dts from 'vite-plugin-dts'
-import dotenv from 'dotenv';
-
-dotenv.config();
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => ({
@@ -31,7 +28,6 @@ export default defineConfig(({ mode }) => ({
             '/api': {
                 target: 'https://scicrunch.org',
                 changeOrigin: true,
-                rewrite: (path) => path.replace(/^\/api/, `/api/1/elastic/Interlex_pr/_search?key=${process.env.VITE_API_KEY}`),
             },
         },
     },