quick

tapis-project · Aug 21, 2024 · 3c99a72 · 3c99a72
1 parent 691932b
commit 3c99a72
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 35 deletions.
diff --git a/packages/icicle-tapisui-extension/src/pages/VisualAnalytics/VisualAnalytics.tsx b/packages/icicle-tapisui-extension/src/pages/VisualAnalytics/VisualAnalytics.tsx
@@ -16,7 +16,8 @@ export const VisualAnalytics: Component = ({ accessToken }) => {
       {accessToken ? (
         <iframe
           style={{ flexGrow: 1, border: 'none' }}
-          src={`https://vaapibackenddev.pods.icicle.tapis.io/tapisui-entry?jwt=${accessToken}`}
+          src={'https://vadash.pods.icicleai.tapis.io/'}
+          //src={`https://vaapibackenddev.pods.icicle.tapis.io/tapisui-entry?jwt=${accessToken}`}
         />
       ) : (
         <>Invalid JWT. Log out of TapisUI then log back in</>

diff --git a/packages/tapisui-common/src/ui/DescriptionList/DescriptionList.jsx b/packages/tapisui-common/src/ui/DescriptionList/DescriptionList.jsx
@@ -61,10 +61,15 @@ const DescriptionListValue = ({ value }) => {
   return <>{JSON.stringify(value)}</>;
 };
 
-const DescriptionList = ({ className, data, density, direction }) => {
+const DescriptionList = ({
+  className = '',
+  data,
+  density = DEFAULT_DENSITY,
+  direction = DEFAULT_DIRECTION,
+}) => {
   const modifierClasses = [];
-  modifierClasses.push(DENSITY_CLASS_MAP[density || DEFAULT_DENSITY]);
-  modifierClasses.push(DIRECTION_CLASS_MAP[direction || DEFAULT_DIRECTION]);
+  modifierClasses.push(DENSITY_CLASS_MAP[density]);
+  modifierClasses.push(DIRECTION_CLASS_MAP[direction]);
   const containerStyleNames = ['container', ...modifierClasses]
     .map((name) => styles[name])
     .join(' ');
@@ -103,10 +108,5 @@ DescriptionList.propTypes = {
   /** Layout direction */
   direction: PropTypes.oneOf(DIRECTIONS),
 };
-DescriptionList.defaultProps = {
-  className: '',
-  density: DEFAULT_DENSITY,
-  direction: DEFAULT_DIRECTION,
-};
 
 export default DescriptionList;
diff --git a/packages/tapisui-common/src/ui/Icon/Icon.jsx b/packages/tapisui-common/src/ui/Icon/Icon.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import './Icon.module.css';
 
-const Icon = ({ children, className, name }) => {
+const Icon = ({ children = '', className = '', name }) => {
   const iconClassName = `icon icon-${name}`;
   // FAQ: The conditional avoids an extra space in class attribute value
   const fullClassName = className
@@ -20,9 +20,5 @@ Icon.propTypes = {
   /** Name of icon from icon font (without the (`icon-` prefix) */
   name: PropTypes.string.isRequired,
 };
-Icon.defaultProps = {
-  children: '',
-  className: '',
-};
 
 export default Icon;
diff --git a/packages/tapisui-common/src/ui/SectionHeader/SectionHeader.js b/packages/tapisui-common/src/ui/SectionHeader/SectionHeader.js
@@ -33,11 +33,11 @@ import styles from './SectionHeader.module.css';
  * </SectionHeader>
  */
 function SectionHeader({
-  actions,
+  actions = '',
   children,
-  className,
-  isForForm,
-  isForTable,
+  className = '',
+  isForForm = false,
+  isForTable = false,
 }) {
   let styleName = '';
   const styleNameList = [styles['root']];
@@ -82,12 +82,5 @@ SectionHeader.propTypes = {
   /** Whether this header is for a table */
   isForTable: PropTypes.bool,
 };
-SectionHeader.defaultProps = {
-  actions: '',
-  className: '',
-  children: '',
-  isForForm: false,
-  isForTable: false,
-};
 
 export default SectionHeader;
diff --git a/src/app/Files/_Layout/Layout.tsx b/src/app/Files/_Layout/Layout.tsx
@@ -9,7 +9,7 @@ import {
 import { SystemsNav } from '../_components';
 import { Router } from '../_Router';
 import Toolbar from '../_components/Toolbar';
-import { useLocation } from 'react-router';
+import { useLocation } from 'react-router-dom';
 import { breadcrumbsFromPathname } from '@tapis/tapisui-common';
 import styles from './Layout.module.scss';
 import { FilesProvider } from '../_components/FilesContext';

diff --git a/src/app/Files/_components/Toolbar/MoveCopyModal/MoveCopyModal.tsx b/src/app/Files/_components/Toolbar/MoveCopyModal/MoveCopyModal.tsx
@@ -7,7 +7,7 @@ import { FileListingTable } from '@tapis/tapisui-common';
 import { FileOperationStatus } from '../_components';
 import { FileExplorer } from '@tapis/tapisui-common';
 import { ToolbarModalProps } from '../Toolbar';
-import { useLocation } from 'react-router';
+import { useLocation } from 'react-router-dom';
 import { focusManager } from 'react-query';
 import { Files as Hooks } from '@tapis/tapisui-hooks';
 import { Files } from '@tapis/tapis-typescript';

diff --git a/src/app/Files/_components/Toolbar/TransferModal/TransferModal.tsx b/src/app/Files/_components/Toolbar/TransferModal/TransferModal.tsx
@@ -4,7 +4,7 @@ import { breadcrumbsFromPathname } from '@tapis/tapisui-common';
 import { FileListingTable } from '@tapis/tapisui-common';
 import { FileExplorer } from '@tapis/tapisui-common';
 import { ToolbarModalProps } from '../Toolbar';
-import { useLocation } from 'react-router';
+import { useLocation } from 'react-router-dom';
 import { Files } from '@tapis/tapis-typescript';
 import styles from './TransferModal.module.scss';
 import { useFilesSelect } from '../../FilesContext';

diff --git a/src/app/Workflows/_components/Modals/RunPipelineModal/RunPipelineModal.tsx b/src/app/Workflows/_components/Modals/RunPipelineModal/RunPipelineModal.tsx
@@ -2,6 +2,7 @@ import React, { useCallback } from 'react';
 import { Workflows } from '@tapis/tapis-typescript';
 import { Workflows as Hooks } from '@tapis/tapisui-hooks';
 import {
+  Button,
   Dialog,
   DialogActions,
   DialogContent,
@@ -10,7 +11,6 @@ import {
   AlertTitle,
 } from '@mui/material';
 import { LoadingButton } from '@mui/lab';
-import { Button } from '@mui/material';
 import * as Yup from 'yup';
 import { Form, Formik, FieldArray } from 'formik';
 import { FormikInput, SectionHeader } from '@tapis/tapisui-common';

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
-    "target": "es6",
-    "lib": ["dom", "dom.iterable", "es6"],
+    "target": "esnext",
+    "lib": ["dom", "dom.iterable", "esnext"],
     // "lib": ["es6", "dom"],
     "noImplicitAny": true,
     "noImplicitThis": true,
@@ -21,6 +21,9 @@
     "jsx": "react-jsx",
     "baseUrl": "src",
     "types": ["vite/client"]
+    // "useDefineForClassFields": true,
+    // "noUnusedLocals": true,
+    // "noUnusedParameters": true,
   },
   "include": ["src"],
   "exclude": ["packages"]

diff --git a/vite/vite.local.config.mts b/vite/vite.local.config.mts
@@ -6,6 +6,7 @@ import commonjs from '@rollup/plugin-commonjs';
 import viteCommonjs from 'vite-plugin-commonjs';
 import babel from '@rollup/plugin-babel';
 import { visualizer } from 'rollup-plugin-visualizer';
+// import vitePluginRequire from "vite-plugin-require";
 
 export default defineConfig({
   // depending on your application, base can also be "/"
@@ -15,6 +16,7 @@ export default defineConfig({
     define: {
       'process.platform': null,
       'process.version': null,
+      // 'process.env.NODE_ENV': 'production',
     },
   },
   css: { preprocessorOptions: { scss: { charset: false } } },
@@ -29,8 +31,25 @@ export default defineConfig({
   plugins: [
     react(),
     commonjs({
-      include: /node_modules\/@uiw\/react-codemirror/, // Ensure CommonJS transformation for node_modules
-      // requireReturnsDefault: 'auto', // Handle default exports correctly
+      include: [
+        /node_modules\/@uiw\/react-codemirror/, // Ensure CommonJS transformation for node_modules
+        /node_modules\/react-table/, // Include react-table for CommonJS transformation
+        /node_modules\/react/,
+        /node_modules\/react-dom/,
+        /node_modules\/react-router/,
+        /node_modules\/scheduler/,
+        /node_modules\/react-is/,
+        /node_modules\/hoist-non-react-statics/,
+        /node_modules\/tiny-invariant/,
+        /packages\/tapisui-common\/node_modules\/react-table/,
+        /packages\/tapisui-common\/node_modules\/hoist-non-react-statics/,
+        /packages\/tapisui-common\/node_modules\/react-router/,
+        /packages\/tapisui-common\/node_modules\/react-is/,
+        /packages\/icicle-tapisui-extension\/node_modules\/react-is/,
+      ],
+      requireReturnsDefault: false, // "preferred" | "auto" | true | false
+      strictRequires: 'debug',
+      //esmExternals: ["react-table"], // Convert CommonJS modules to ESModule
     }),
     // viteCommonjs(),
     viteTsconfigPaths(),
@@ -42,8 +61,8 @@ export default defineConfig({
     }),
   ],
   build: {
-    minify: false,
-    sourcemap: false,
+    minify: true,
+    sourcemap: true,
     outDir: 'dist',
     manifest: true,
     rollupOptions: {