Merge branch 'feat--export-to-excel-in-grid' of https://github.com/eq…

…uinor/fusion-workspace into feat--export-to-excel-in-grid
equinor · Sep 19, 2023 · b12c5cd · b12c5cd
2 parents c7c51d3 + 189b9d6
commit b12c5cd
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Fusion Workspace
 
 ![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/equinor/fusion-workspace/ci.yml) ![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/equinor/fusion-workspace/publish.yml?logo=npm&label=Deployment) ![GitHub issues by-label](https://img.shields.io/github/issues/equinor/fusion-workspace/bug?label=%F0%9F%90%9B%20bug%20issues&color=red)
- ![GitHub issues](https://img.shields.io/github/issues/equinor/fusion-workspace) ![GitHub pull requests](https://img.shields.io/github/issues-pr-raw/equinor/fusion-workspace)
+![GitHub issues](https://img.shields.io/github/issues/equinor/fusion-workspace) ![GitHub pull requests](https://img.shields.io/github/issues-pr-raw/equinor/fusion-workspace)
 
 > Fusion Workspace is a library built with a controller-based structure in mind. Core functionality tab navigation, data handling, and allowing you to register controllers that react around page change / config change and data changes.
 

diff --git a/apps/test-app/src/index.tsx b/apps/test-app/src/index.tsx
@@ -14,7 +14,13 @@ export function App() {
         getRows: async ({ success, request }, filter) => {
           success({ rowData: [{ id: '123' }, { id: '125' }, { id: '9342' }, { id: '1212' }], rowCount: 4 });
         },
-        excelExport: async (filterState) => new Promise((res, rej) => setTimeout(() => {res(); console.log("løøøøøøø")}, 2000)),
+        excelExport: async (filterState) =>
+          new Promise((res, rej) =>
+            setTimeout(() => {
+              res();
+              console.log('løøøøøøø');
+            }, 2000)
+          ),
       }}
       sidesheetOptions={{
         type: 'default',

diff --git a/package.json b/package.json
@@ -2,6 +2,7 @@
   "name": "workspace",
   "version": "0.0.0",
   "license": "MIT",
+  "type": "module",
   "scripts": {
     "preinstall": "npx only-allow pnpm",
     "first-time-setup": "npm i -g pnpm@8.0.0 turbo && pnpm i && pnpm test",
@@ -24,9 +25,5 @@
     "turbo": "^1.9.3",
     "typescript": "~5.0.2",
     "typescript-plugin-styled-components": "^2.0.0"
-  },
-  "workspaces": [
-    "packages/**",
-    "apps/**"
-  ]
+  }
 }
diff --git a/packages/power-bi/package.json b/packages/power-bi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@equinor/workspace-powerbi",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "type": "module",
   "sideEffects": false,
   "license": "MIT",

diff --git a/packages/power-bi/src/lib/utils/getActiveFilterValues.ts b/packages/power-bi/src/lib/utils/getActiveFilterValues.ts
@@ -8,7 +8,8 @@ export const getActiveFilterValues = async (filters: PowerBiFilter[]) => {
   const activeFilterValues = {} as Record<string, (string | number | boolean)[]>;
 
   filters.forEach(async (filter) => {
-    const { filters: slicerFilters } = await filter.slicer.getSlicerState();
+    const a = await filter.slicer.getSlicerState().catch((_) => {});
+    const slicerFilters = a ? a.filters : [];
     activeFilterValues[filter.type] = [];
     slicerFilters.forEach((slicerFilter: SlicerFilter) => {
       activeFilterValues[filter.type] = slicerFilter?.values || [];

diff --git a/packages/workspace-fusion/src/modules/grid/components/GridOptionsPopover.tsx b/packages/workspace-fusion/src/modules/grid/components/GridOptionsPopover.tsx
@@ -53,8 +53,20 @@ export const GridOptionPopover = ({ anchor, excelExport, filterState }: GridOpti
           </Popover.Header>
           <Popover.Content style={{ overflow: 'hidden' }}>
             <ButtContainer>
-              {isError && <DumpsterFireDialog  text={typeof error === 'string' ? error : 'We encountered an issue fetching the data. Please try again later.'} />}
-              <Button disabled={excelExport == undefined} style={{ width: '130px' }} onClick={!isLoading ? handleExportToExcel : undefined}>
+              {isError && (
+                <DumpsterFireDialog
+                  text={
+                    typeof error === 'string'
+                      ? error
+                      : 'We encountered an issue fetching the data. Please try again later.'
+                  }
+                />
+              )}
+              <Button
+                disabled={excelExport == undefined}
+                style={{ width: '130px' }}
+                onClick={!isLoading ? handleExportToExcel : undefined}
+              >
                 {isLoading ? <Progress.Dots color={'neutral'} /> : 'Export to Excel'}
               </Button>
             </ButtContainer>

diff --git a/packages/workspace-fusion/src/modules/grid/components/GridWrapper.tsx b/packages/workspace-fusion/src/modules/grid/components/GridWrapper.tsx
@@ -13,7 +13,7 @@ import { GridOptionPopover } from './GridOptionsPopover';
 export type GridWrapperProps<
   TData extends Record<PropertyKey, unknown>,
   TContext extends Record<PropertyKey, unknown> = never,
-  TFilter = undefined
+  TFilter = undefined,
 > = {
   config: GridConfig<TData, TFilter>;
   getIdentifier: GetIdentifier<TData>;
@@ -22,7 +22,7 @@ export type GridWrapperProps<
 export const GridWrapper = <
   TData extends Record<PropertyKey, unknown>,
   TContext extends Record<PropertyKey, unknown> = never,
-  TFilter = undefined
+  TFilter = undefined,
 >({
   config,
   getIdentifier,
@@ -54,7 +54,9 @@ export const GridWrapper = <
 
   useEffect(() => {
     const icon: HeaderIcon = {
-      Icon: ({ anchor }) => <GridOptionPopover anchor={anchor} filterState={filterState} excelExport={config.excelExport} />,
+      Icon: ({ anchor }) => (
+        <GridOptionPopover anchor={anchor} filterState={filterState} excelExport={config.excelExport} />
+      ),
       name: 'grid-settings',
       placement: 'right',
       type: 'button',