OpenConceptLab/ocl_online#31 | attempting private package install

Author: snyaggarwal

.github/workflows/build.yml

@@ -49,19 +49,22 @@ jobs:
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
-    #- name: Log in to the Container registry
-    #  uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
-    #  with:
-    #    registry: ghcr.io
-    #    username: ${{ github.actor }}
-    #    password: ${{ secrets.GITHUB_TOKEN }}
+    - name: Setup SSH for premium repos
+      run: |
+        mkdir -p ~/.ssh
+        echo "${{ secrets.PREMIUM_UI_DEPLOY_KEY }}" > ~/.ssh/id_rsa
+        chmod 600 ~/.ssh/id_rsa
+        ssh-keyscan github.com >> ~/.ssh/known_hosts
     - name: Build and push Docker image
       uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
       with:
         context: .
         push: true
+        ssh: default
         tags: openconceptlab/oclweb3:nightly, openconceptlab/oclweb3:${{ steps.package-version.outputs.current-version}}-${{env.GITHUB_SHA_SHORT}}
-        build-args: SOURCE_COMMIT=${{env.GITHUB_SHA_SHORT}}
+        build-args: |
+          SOURCE_COMMIT=${{env.GITHUB_SHA_SHORT}}
+          PRIVATE_PACKAGES_GIT=${{env.PRIVATE_PACKAGES_GIT}}
 
   release:
     needs: [build]

Dockerfile

@@ -1,4 +1,6 @@
 # Stage-1 Build and Development Environment
+# syntax=docker/dockerfile:1.4
+
 FROM node:14.11 as build
 ARG NODE_ENV=production
 ARG NODE_OPTIONS=--max_old_space_size=700
@@ -23,6 +25,17 @@ ADD package-lock.json /app/
 
 RUN npm ci --production=false
 
+# OPTIONAL: install private premium UI package during image build
+# Example installs a package from a private repo/subdir
+ARG PRIVATE_PACKAGES_GIT
+RUN --mount=type=ssh \
+  mkdir -p /root/.ssh && \
+  ssh-keyscan github.com >> /root/.ssh/known_hosts && \
+  if [ -n "$PRIVATE_PACKAGES_GIT" ]; then \
+    echo "Installing premium UI packages:" $PRIVATE_PACKAGES_GIT && \
+    npm i $PRIVATE_PACKAGES_GIT; \
+  fi
+
 ADD webpack.config.js /app/
 ADD .babelrc /app/
 ADD src /app/src/

docker-compose.override.yml

@@ -8,6 +8,7 @@ services:
       target: build
       args:
         NODE_ENV: development
+        PRIVATE_PACKAGES_GIT:
     ports:
       - "4002:4002"
       - "4003:35729"

docker-compose.sso.yml

@@ -8,6 +8,7 @@ services:
       target: build
       args:
         NODE_ENV: development
+        PRIVATE_PACKAGES_GIT:
     ports:
       - "4002:4002"
       - "4003:35729"

docker-compose.yml

@@ -7,6 +7,7 @@ services:
       context: .
       args:
         NODE_ENV: production
+        PRIVATE_PACKAGES_GIT:
     ports:
       - "4002:4002"
     restart: on-failure
@@ -16,7 +17,7 @@ services:
       - WEB_PORT=4002
       - RECAPTCHA_SITE_KEY=${RECAPTCHA_SITE_KEY-6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI}
       - GA_ACCOUNT_ID=${GA_ACCOUNT_ID-UA-000000-01}
-      - ANALYTICS_API
+      - ANALYTICS_API=${ANALYTICS_API-}
       - ERRBIT_URL
       - ERRBIT_KEY
       - HOTJAR_ID

src/common/loadRoutes.js

@@ -0,0 +1,26 @@
+export async function loadRoutes() {
+  try {
+    // This package exists only in your private deployment
+    const mod = require("ocl-analytics-web");
+
+    // Expect the private package to export PremiumRoutes (recommended)
+    // return React component that renders <Route .../>
+    return mod.Routes || null;
+  } catch (e) {
+    // Not installed → no premium routes
+    return null;
+  }
+}
+
+
+export async function loadUsageDashboard() {
+  try {
+    // webpack won't try to resolve this at build time
+    // eslint-disable-next-line global-require, import/no-unresolved
+    const mod = require("ocl-analytics-web");
+    console.log("ocl-analytics-web keys:", Object.keys(mod));
+    return mod.UsageDashboard || mod.default || null;
+  } catch (e) {
+    return null;
+  }
+}

src/components/app/App.jsx

@@ -37,6 +37,9 @@ import ImportHome from '../imports/ImportHome'
 import ConceptsComparison from '../concepts/ConceptsComparison'
 import MappingsComparison from '../mappings/MappingsComparison'
 import CheckAuth from './CheckAuth'
+import { loadUsageDashboard } from "../../common/loadRoutes";
+
+
 
 const AuthenticationRequiredRoute = ({component: Component, ...rest}) => (
   <Route
@@ -58,6 +61,13 @@ const SessionUserRoute = ({component: Component, ...rest}) => (
   />
 )
 
+const StaffUserRoute = ({component: Component, ...rest}) => (
+  <Route
+    {...rest}
+    render={props => getCurrentUser()?.is_staff ? <Component {...props} /> : <Error404 />}
+  />
+)
+
 const App = props => {
   const [networkError, setNetworkError] = React.useState(false)
   const { alert, setAlert, setToggles } = React.useContext(OperationsContext);
@@ -115,6 +125,13 @@ const App = props => {
     setupHotJar()
   }, [])
 
+  const [UsageDashboard, setUsageDashboard] = React.useState(null);
+
+  React.useEffect(() => {
+    loadUsageDashboard().then(setUsageDashboard);
+  }, []);
+  console.log("UsageDashboard:", UsageDashboard)
+
 
 
   const repoTabs = ['concepts', 'mappings', 'versions', 'summary', 'about', 'references']
@@ -136,6 +153,14 @@ const App = props => {
               <Route exact path="/search" component={Search} />
               <Route exact path="/" component={Dashboard} />
               <Route exact path="/imports" component={ImportHome} />
+              {
+                UsageDashboard &&
+                  <StaffUserRoute
+                    exact
+                    path='/admin'
+                    component={UsageDashboard}
+                  />
+              }
               <AuthenticationRequiredRoute exact path={`/:ownerType(users|orgs)/:owner/sources/:repo/:repoVersion/concepts/$match`} component={RepoConceptsMatch} />
               <AuthenticationRequiredRoute exact path={`/:ownerType(users|orgs)/:owner/repos/new/:step?`} component={RepoCreate} />
               <AuthenticationRequiredRoute exact path={`/:ownerType(users|orgs)/:owner/:repoType(sources|collections)/:repo/edit/:step?`} component={RepoCreate} />