Merge branch 'main' of https://github.com/equinor/cc-components

equinor · Aug 14, 2023 · 9f7ce69 · 9f7ce69
2 parents 576db3e + 7367162
commit 9f7ce69
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/libs/shared/src/packages/sidesheet/src/lib/sidesheet/tabs/material/AvailableItemCell.tsx b/libs/shared/src/packages/sidesheet/src/lib/sidesheet/tabs/material/AvailableItemCell.tsx
@@ -2,19 +2,19 @@ import { Tooltip, Icon } from '@equinor/eds-core-react';
 import { check, clear } from '@equinor/eds-icons';
 Icon.add({ check, clear });
 type AvailableItemCellProps = {
-  available: string | null;
+  available: boolean | null;
 };
 export const AvailableItemCell = ({
   available,
 }: AvailableItemCellProps): JSX.Element | null => {
   if (available === null) {
     return null;
   }
-  const refTitle = available === 'Y' ? 'Available' : 'Not Available';
+  const refTitle = available ? 'Available' : 'Not Available';
 
   return (
     <Tooltip title={refTitle}>
-      {available === 'Y' ? (
+      {available ? (
         <Icon color="green" name="check" />
       ) : (
         <Icon color="red" name="clear" />

diff --git a/libs/shared/src/packages/sidesheet/src/lib/sidesheet/tabs/material/columns.tsx b/libs/shared/src/packages/sidesheet/src/lib/sidesheet/tabs/material/columns.tsx
@@ -7,7 +7,7 @@ export const columns: ColDef<MaterialBase>[] = [
   {
     field: 'Available',
     valueGetter: (pkg) => pkg.data?.available,
-    cellRenderer: (props: ICellRendererProps<MaterialBase, string | null>) => {
+    cellRenderer: (props: ICellRendererProps<MaterialBase, boolean | null>) => {
       return <AvailableItemCell available={props.value} />;
     },
     minWidth: 120,

diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
   "packageManager": "pnpm@8.0.0",
   "scripts": {
     "preinstall": "npx only-allow pnpm",
-    "first-time-setup": "npm i -g vite pnpm@8.0.0 @equinor/fusion-framework-cli turbo && pnpm i && pnpm build",
+    "first-time-setup": "npm i -g vite pnpm@8.0.0 @equinor/fusion-framework-cli turbo && pnpm i && pnpm ci:build",
     "serve": "turbo run dev --filter",
     "ci:build": "turbo run build --output-logs errors-only",
     "build": "turbo run build --output-logs errors-only --parallel",