Updated Power BI Package to be fusion-independent

Removed deps to fusion libraries Implemented fallback component handler to report error boundary.
equinor · Feb 15, 2024 · 3dfc414 · 3dfc414
1 parent 3e14c47
commit 3dfc414
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 32 deletions.
diff --git a/packages/power-bi/package.json b/packages/power-bi/package.json
@@ -29,7 +29,6 @@
     "@equinor/eds-core-react": "^0.28.0",
     "@equinor/eds-icons": "^0.18.0",
     "@equinor/eds-tokens": "^0.9.0",
-    "@equinor/fusion-react-person": "^0.7.0",
     "@tanstack/react-query": "^4.24.4",
     "markdown-to-jsx": "^7.1.9",
     "powerbi-client": "^2.22.2",

diff --git a/packages/power-bi/src/lib/components/PowerBi.tsx b/packages/power-bi/src/lib/components/PowerBi.tsx
@@ -3,21 +3,25 @@ import { Loading } from './loading';
 import { chevron_down, chevron_up } from '@equinor/eds-icons';
 import { Icon } from '@equinor/eds-core-react';
 import { QueryClient, QueryClientProvider, QueryErrorResetBoundary } from '@tanstack/react-query';
-import { ErrorBoundary } from 'react-error-boundary';
-import { FusionEmbedConfig, FusionPowerBiToken, ReportAccessInfo } from '../types';
-import { ErrorComponent } from './error/ErrorComponent';
+import { ErrorBoundary, FallbackProps } from 'react-error-boundary';
+import { FusionEmbedConfig, FusionPowerBiToken } from '../types';
+
 import { PowerBiController } from '../classes';
 import { IBasicFilter } from 'index';
 import { Report } from './report/Report';
+import React from 'react';
 
 Icon.add({ chevron_down, chevron_up });
 
+export type ErrorComponentProps = {
+  reportUri: string;
+} & FallbackProps;
+
 export interface PowerBiProps {
   reportUri: string;
   getToken: (reportUri: string, signal?: AbortSignal) => Promise<FusionPowerBiToken>;
   getEmbedInfo: (reportUri: string, token: string, signal?: AbortSignal) => Promise<FusionEmbedConfig>;
-  getErrorMessage: (reportUri: string) => Promise<string>;
-  getAccessInfo: (reportUri: string) => Promise<ReportAccessInfo>;
+  ErrorComponent: React.ComponentType<ErrorComponentProps>;
   filters?: IBasicFilter;
   bookmark?: string;
   controller: PowerBiController;
@@ -26,21 +30,15 @@ export interface PowerBiProps {
 const client = new QueryClient();
 
 export const PowerBi = (props: PowerBiProps) => {
+  const { reportUri, ErrorComponent } = props;
   return (
     <QueryClientProvider client={client}>
       <Suspense fallback={<Loading />}>
         <QueryErrorResetBoundary>
           {({ reset }) => (
             <ErrorBoundary
               onReset={reset}
-              fallbackRender={(e) => (
-                <ErrorComponent
-                  {...e}
-                  getAccessInfo={props.getAccessInfo}
-                  getErrorMessage={props.getErrorMessage}
-                  reportUri={props.reportUri}
-                />
-              )}
+              FallbackComponent={(errorProps) => <ErrorComponent {...errorProps} reportUri={reportUri} />}
             >
               <Report {...props} />
             </ErrorBoundary>

diff --git a/packages/power-bi/src/lib/types/access.ts b/packages/power-bi/src/lib/types/access.ts
diff --git a/packages/power-bi/src/lib/types/index.ts b/packages/power-bi/src/lib/types/index.ts
@@ -3,7 +3,6 @@ export * from './error';
 export * from './filter';
 export * from './observable';
 export * from './slicer';
-export * from './access';
 
 export type FusionPowerBiToken = {
   token: string;

diff --git a/packages/workspace-fusion/src/lib/integrations/power-bi/power-bi.ts b/packages/workspace-fusion/src/lib/integrations/power-bi/power-bi.ts
@@ -2,6 +2,7 @@
  * Integrations folder for exporting types from the integration
  * namespace: @equinor/workspace-fusion/power-bi
  */
+import { FallbackProps } from 'react-error-boundary';
 
 import {
   ActiveFilter,
@@ -56,6 +57,10 @@ type EmbedConfiguration = {
   reportId: string;
 };
 
+export type ErrorComponentProps = {
+  reportUri: string;
+} & FallbackProps;
+
 type PowerBiConfig = {
   reportUri: string;
   getEmbed: (reportUri: string, token: string, signal?: AbortSignal) => Promise<EmbedConfiguration>;
@@ -70,8 +75,7 @@ type PowerBiConfig = {
    * }
    * ```
    */
-  getAccessInfo: (reportUri: string, signal?: AbortSignal) => Promise<ReportAccessInfo>;
-  getErrorMessage: (reportUri: string, signal?: AbortSignal) => Promise<string>;
+  ErrorComponent: React.ComponentType<ErrorComponentProps>;
   filters?: FilterConfig;
   ReportMetaData?: (props: ReportMetaDataProps) => JSX.Element;
   getClassification?: (reportUri: string, signal?: AbortSignal) => Promise<string>;

diff --git a/packages/workspace-fusion/src/modules/power-bi/index.tsx b/packages/workspace-fusion/src/modules/power-bi/index.tsx
@@ -169,13 +169,12 @@ const PowerBiWrapper = (powerBiConfig: PowerBiConfig & { controller: PowerBiCont
 
   return (
     <PowerBI
-      getErrorMessage={powerBiConfig.getErrorMessage}
       controller={powerBiConfig.controller}
       getToken={powerBiConfig.getToken}
       getEmbedInfo={powerBiConfig.getEmbed}
-      getAccessInfo={powerBiConfig.getAccessInfo}
       reportUri={powerBiConfig.reportUri}
       filters={createBasicFilter(powerBiConfig.filters)}
+      ErrorComponent={powerBiConfig.ErrorComponent}
     />
   );
 };