fix issue with numbers

uc-cdis · Feb 22, 2024 · 87e50f0 · 87e50f0
1 parent 4a335a4
commit 87e50f0
Show file tree

Hide file tree

Showing 7 changed files with 415 additions and 333 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -4,6 +4,7 @@
   "author": "CTDS",
   "description": "Core module for gen3 frontend. Provides an interface for interacting with the gen3 API and a redux store for managing state.",
   "license": "Apache-2.0",
+  "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
   "unpkg": "dist/index.umd.js",

diff --git a/packages/core/rollup.config.mjs b/packages/core/rollup.config.mjs
@@ -48,7 +48,6 @@ const config = [
       {
         file: 'dist/index.esm.js',
         format: 'esm',
-        name: 'gen3Core',
         globals,
       },
     ],

diff --git a/packages/frontend/package.json b/packages/frontend/package.json
@@ -3,33 +3,38 @@
   "version": "0.10.3",
   "description": "Gen3 frontend components, content management, and pages",
   "keywords": [],
-  "author": "",
+  "author": "Center for Translational Data Science",
   "license": "Apache-2.0",
   "sideEffects": false,
-  "main": "dist/index.js",
-  "module": "dist/index.esm.js",
-  "unpkg": "dist/index.umd.js",
+  "main": "dist/cjs/index.js",
+  "module": "dist/esm/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "compile": "tsc",
     "clean": "rimraf dist",
+    "rollup": "rollup --config rollup.config.mjs",
     "test": "jest unit",
     "test:watch": "jest unit --watch",
     "test:int": "echo No integrations tests yet",
     "test:all": "jest",
     "types": "tsc --emitDeclarationOnly",
-    "copy-tailwind": "mkdir -p dist && cp src/tailwind.cjs dist/tailwind.cjs",
-    "copy-style": "mkdir -p dist/styles && cp src/styles/* dist/styles/",
-    "build": "npm run build:rollup && npm run types",
-    "build:clean": "npm run clean && npm run build && npm run types",
-    "build:rollup": "npm run compile && npm run copy-tailwind && rollup --config rollup.config.mjs",
-    "build:compile": "npm run compile && npm run types && npm run build:rollup",
-    "build:swc": "npm run compile && npm run copy-tailwind && swc src -d dist",
-    "build:watch": "npm run build:rollup -- --watch",
+    "copy-tailwind": "cp src/tailwind.cjs dist/tailwind.cjs",
+    "build": "npm run compile && npm run types && npm run copy-tailwind && npm run rollup",
+    "build:clean": "npm run clean && npm run build",
+    "build:watch": "npm run build -- --watch",
     "dev": "npm run build:watch"
   },
   "exports": {
-    ".": "./dist/index.js",
+    ".": {
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/esm/index.js"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/cjs/index.js"
+      }
+    },
     "./tailwind": {
       "require": "./dist/tailwind.cjs"
     }
@@ -43,7 +48,7 @@
     "@fontsource/montserrat": "^4.5.12",
     "@fontsource/source-sans-pro": "^4.5.11",
     "@graphiql/react": "^0.20.2",
-    "@gen3/core": "@gen3/core",
+    "@gen3/core": "file:../core",
     "@iconify/react": "^4.0.1",
     "@mantine/core": "^6.0.21",
     "@mantine/form": "^6.0.21",

diff --git a/packages/frontend/rollup.config.mjs b/packages/frontend/rollup.config.mjs
@@ -51,23 +51,14 @@ const config = [
     input: './src/index.ts',
     output: [
       {
-        dir: 'dist',
+        dir: 'dist/cjs',
         format: 'cjs',
         globals,
         sourcemap: true
       },
       {
-        dir: 'dist',
+        dir: 'dist/esm',
         format: 'esm',
-        name: 'gen3frontend',
-        plugins: [terser()],
-        globals,
-        sourcemap: true
-      },
-      {
-        dir: 'dist',
-        format: 'esm',
-        name: 'gen3Core',
         globals,
         sourcemap: true
       },

diff --git a/packages/frontend/src/features/Discovery/TableRenderers/CellRenderers.tsx b/packages/frontend/src/features/Discovery/TableRenderers/CellRenderers.tsx
@@ -32,7 +32,7 @@ export const RenderArrayCell: CellRendererFunction = ({
   return <span>value</span>;
 };
 
-export const RenderArrayCellNegativePositive = ({
+export const RenderArrayCellNegativePositive : CellRendererFunction = ({
   value,
   cell,
 }: CellRenderFunctionProps) => {
@@ -56,7 +56,7 @@ export const RenderArrayCellNegativePositive = ({
   return <span>{value as any}</span>;
 };
 
-export const RenderLinkCell = ({ value }: CellRenderFunctionProps) => {
+export const RenderLinkCell : CellRendererFunction = ({ value }: CellRenderFunctionProps) => {
   const content = value as string;
   return (
     <Link
@@ -70,13 +70,22 @@ export const RenderLinkCell = ({ value }: CellRenderFunctionProps) => {
   );
 };
 
-const RenderStringCell = ({ value }: CellRenderFunctionProps) => {
+const RenderStringCell : CellRendererFunction = ({ value }: CellRenderFunctionProps,  params? : JSONObject) => {
   const content = value as string | string[];
+  if (content === undefined || content === null) {
+    return <Text>{`${params && params?.valueIfNotAvailable ? params?.valueIfNotAvailable : ''}`}   </Text>;
+  }
+  if (content == '') {
+    return <Text>{`${params && params?.valueIfNotAvailable ? params?.valueIfNotAvailable : ''}`}   </Text>;
+  }
   return <Text>{isArray(content) ? content.join(', ') : content}</Text>;
 };
 
-const RenderNumberCell = ({ value }: CellRenderFunctionProps) => {
+const RenderNumberCell : CellRendererFunction = ({ value }: CellRenderFunctionProps, params? : JSONObject) => {
   const content = value as number | number[];
+  if (content === undefined || content === null) {
+    return <Text>{`${params && params?.valueIfNotAvailable ? params?.valueIfNotAvailable : ''}`}   </Text>;
+  }
   return (
     <Text>
       {isArray(content)
@@ -86,7 +95,7 @@ const RenderNumberCell = ({ value }: CellRenderFunctionProps) => {
   );
 };
 
-const RenderParagraphsCell = ({ value }: CellRenderFunctionProps) => {
+const RenderParagraphsCell : CellRendererFunction  = ({ value }: CellRenderFunctionProps) => {
   const content = value as string | string[];
   return (
     <React.Fragment>
@@ -108,7 +117,7 @@ interface TagData {
 
 // TODO Fix below
 // eslint-disable-next-line react/prop-types
-export const RenderTagsCell = ({ value }: CellRenderFunctionProps) => {
+export const RenderTagsCell : CellRendererFunction = ({ value }: CellRenderFunctionProps) => {
   const content = value as TagData[];
   const { discoveryConfig: config } = useDiscoveryContext();
   return (

diff --git a/packages/sampleCommons/package.json b/packages/sampleCommons/package.json
@@ -13,8 +13,8 @@
     "getDRSToHostname": "node ../../node_modules/@gen3/toolsff/dist/getDRSToHostname.esm.js --out=config/"
   },
   "dependencies": {
-    "@gen3/core": "@gen3/core",
-    "@gen3/frontend": "@gen3/frontend",
+    "@gen3/core": "file:../core",
+    "@gen3/frontend": "file:../frontend",
     "@mdx-js/loader": "^3.0.0",
     "@mdx-js/react": "^3.0.0",
     "@next/mdx": "^14.1.0",