Clean up build-and-deploy, filter some apps from test users

UH-CI · Jan 14, 2025 · f017aba · f017aba
1 parent 33a7a0a
commit f017aba
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 52 deletions.
diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
@@ -6,6 +6,7 @@ on:
       - 'main'
     paths-ignore:
       - '**/README.md'
+# Leftover from original build-and-deploy?
 #  workflow_dispatch:
 
 env:
@@ -23,47 +24,14 @@ jobs:
         with:
           node-version: 22.9.0
 
-      #    - name: clean workspace
-      #      run: npm cache clean --force && rm -rf dist && rm -rf node_modules && rm package-lock.json
-
       - name: Initialize Sub-Packages
         run: npm run init-project container
 
       - name: Initialize Project
         run: npm run init-project twice
 
-      - name: build tapis-ui
+      - name: Build tapis-ui
         run: npm run build
-      #        run: |
-      #          echo "Initializing TapisUI sub-packages..."
-      #          # Directories to build
-      #          dirs=(
-      #            "packages/tapisui-api"
-      #            "packages/tapisui-hooks"
-      #            "packages/tapisui-common"
-      #            "packages/tapisui-extensions-core"
-      #            "packages/tapisui-extension-devtools"
-      #            "packages/icicle-tapisui-extension"
-      #            ""
-      #          )
-      #
-      #          for dir in "${dirs[@]}"; do
-      #            echo "Processing $dir..."
-      #            cd "$dir" || { echo "Package directory $dir does not exist"; exit 1; }
-      #            echo "Installing dependencies..."
-      #            npm install --verbose || { echo "Failed to install dependencies in $dir"; exit 1; }
-      #            echo "Building package..."
-      #            npm run build || { echo "Failed to build package in $dir"; exit 1; }
-      #            cd ../../ || exit 1
-      #          done
-
-      #      - name: Format Code
-      #        run: npm run prettier
-
-      # - name: add config
-      #   run: echo "${{ secrets.CONFIG_JSON }}" | base64 -d > src/config.json
-      #    - name: build
-      #      run: npm run build
 
       - name: Debug Build Directory
         run: ls -la dist

diff --git a/src/app/Apps/_components/AppsTable/AppsTable.tsx b/src/app/Apps/_components/AppsTable/AppsTable.tsx
@@ -45,7 +45,7 @@ export const AppListingTable: React.FC<AppListingTableProps> = React.memo(
 
     const appList: Array<Apps.TapisApp> = data?.result ?? [];
 
-    const excludeList: string[] = [''];
+    const excludeList: string[] = ['ampliseq-condensed-pipeline-test-1.0'];
 
     const filteredAppList = appList.filter((app) => {
       if (!app || !app.id) return false;
@@ -59,7 +59,7 @@ export const AppListingTable: React.FC<AppListingTableProps> = React.memo(
       '16Sv1-pipeline-uhhpc',
       'ampliseq-ITS-pipeline-uhhpc',
       'ampliseq-16S-pipeline-uhhpc',
-      'ampliseq-condensed-pipeline-test',
+      // 'ampliseq-condensed-pipeline-test',
       'ampliseq-pipeline-test',
     ];
 

diff --git a/src/index.tsx b/src/index.tsx
@@ -1,22 +1,22 @@
-import React from "react";
-import { HashRouter as Router } from "react-router-dom";
-import { createRoot } from "react-dom/client";
-import App from "app";
-import { TapisProvider } from "@tapis/tapisui-hooks";
-import "styles/index.css";
-import { resolveBasePath } from "utils/resolveBasePath";
-import reportWebVitals from "./reportWebVitals";
-import { ExtensionsProvider } from "./extensions";
-import { Extension } from "@tapis/tapisui-extensions-core";
-import { extension as icicleExtension } from "@icicle/tapisui-extension";
-import { NotificationsProvider } from "app/_components/Notifications";
-import Theme from "./theme"; // Import the Theme component
+import React from 'react';
+import { HashRouter as Router } from 'react-router-dom';
+import { createRoot } from 'react-dom/client';
+import App from 'app';
+import { TapisProvider } from '@tapis/tapisui-hooks';
+import 'styles/index.css';
+import { resolveBasePath } from 'utils/resolveBasePath';
+import reportWebVitals from './reportWebVitals';
+import { ExtensionsProvider } from './extensions';
+import { Extension } from '@tapis/tapisui-extensions-core';
+import { extension as icicleExtension } from '@icicle/tapisui-extension';
+import { NotificationsProvider } from 'app/_components/Notifications';
+import Theme from './theme'; // Import the Theme component
 
 const initializedExtensions: { [key: string]: Extension } = {
-  "@icicle/tapisui-extension": icicleExtension,
+  '@icicle/tapisui-extension': icicleExtension,
 };
 
-const container = document.getElementById("react-root");
+const container = document.getElementById('react-root');
 const root = createRoot(container!);
 
 root.render(

diff --git a/src/utils/resolveBasePath.ts b/src/utils/resolveBasePath.ts
@@ -9,6 +9,6 @@ export const resolveBasePath = () => {
   // if (/127\.0\.0\.1|localhost/.test(baseUrl)) {
   //   return import.meta.env.VITE_TAPIS_BASE_URL;
   // }
-
+  // Hardcoded path for serverless deployment
   return 'https://dev.tapis.io';
 };
diff --git a/vite/vite.config.mts b/vite/vite.config.mts
@@ -79,6 +79,7 @@ export default defineConfig({
   },
   logLevel: 'info',
   server: {
+    // False for serverless deployment (e.g. github pages)
     open: false, // Opens browser
     port: 3000,
   },