fix: fix placeholder layout and missing case when authentication failed

Author: csm-thu

src/charts/DashboardPlaceholder/useDashboardPlaceholder.js

@@ -14,14 +14,11 @@ const DEFAULT_LABELS = {
   inProgress: { label: 'Scenario run in progress...' },
   hasErrors: { label: 'An error occured during the scenario run' },
   hasUnknownStatus: {
-    label: 'This scenario has an unknown state, if the problem persists, please, contact your administrator',
+    label: 'This scenario has an unknown state. If the problem persists, please contact your administrator.',
   },
   resultsDisplayDisabled: 'Display of results is disabled',
   downloadButton: 'Download logs',
-  errors: {
-    unknown: 'Unknown error',
-    details: 'Something went wrong when fetching PowerBI reports info',
-  },
+  noTokenForBI: 'Authentication failed. If the problem persists, please contact your administrator.',
 };
 
 const forgeDashboardPlaceholder = ({
@@ -32,6 +29,7 @@ const forgeDashboardPlaceholder = ({
   labels: tmpLabels,
   scenario,
   scenarioDTO,
+  hasTokenForBI,
 }) => {
   const labels = { ...DEFAULT_LABELS, ...tmpLabels };
 
@@ -44,21 +42,20 @@ const forgeDashboardPlaceholder = ({
 
   if (alwaysShowReports && !disabled) return null;
   if (noScenario) return <DashboardPlaceholderLayout label={labels.noScenario.label} title={labels.noScenario.title} />;
-  if (noRun) return <DashboardPlaceholderLayout label={labels.noRun.label} title={labels.noRun.title} />;
-  if (runInProgress)
-    return <DashboardPlaceholderLayout label={labels.inProgress.label} title={labels.inProgress.title} inProgress />;
+  if (noRun) return <DashboardPlaceholderLayout label={labels.noRun.label} />;
+  if (runInProgress) return <DashboardPlaceholderLayout label={labels.inProgress.label} inProgress />;
   if (hasError)
     return (
       <DashboardPlaceholderLayout
         label={labels.hasErrors.label}
-        title={labels.hasErrors.title}
         downloadLogsFile={downloadLogsFile}
         downloadLabel={labels.downloadButton}
       />
     );
   if (hasUnknownStatus) return <DashboardPlaceholderLayout label={labels.hasUnknownStatus.label} />;
   if (disabled) return <DashboardPlaceholderLayout label={labels.resultsDisplayDisabled} />;
   if (noDashboardConfigured) return <DashboardPlaceholderLayout label={labels.noDashboard.label} />;
+  if (!hasTokenForBI) return <DashboardPlaceholderLayout label={labels.noTokenForBI} />;
   return null;
 };
 

src/charts/PowerBIReport/PowerBIReport.js

@@ -92,6 +92,7 @@ export const PowerBIReport = ({
   );
 
   const disabled = useMemo(() => reports?.status === 'DISABLED', [reports]);
+  const hasTokenFetchFailed = useMemo(() => reports?.status === 'ERROR', [reports]);
   const { placeholder } = useMemo(() => {
     return getDashboardPlaceholder({
       alwaysShowReports,
@@ -101,11 +102,13 @@ export const PowerBIReport = ({
       scenario,
       scenarioDTO,
       labels,
+      hasTokenForBI: embedConfig?.accessToken != null && embedConfig.accessToken.length > 0,
     });
   }, [
+    disabled,
+    embedConfig.accessToken,
     getDashboardPlaceholder,
     alwaysShowReports,
-    reports,
     downloadLogsFile,
     reportConfiguration,
     index,
@@ -175,7 +178,7 @@ export const PowerBIReport = ({
     (scenarioLastRunStatus === undefined || scenarioLastRunStatus === RUNNER_RUN_STATE.SUCCESSFUL) && !noScenario;
 
   const divContainerStyle = {};
-  if (disabled || (!isReady && !alwaysShowReports)) {
+  if (disabled || hasTokenFetchFailed || (!isReady && !alwaysShowReports)) {
     divContainerStyle.display = 'none';
   }
 
@@ -330,6 +333,7 @@ PowerBIReport.propTypes = {
       label: PropTypes.string,
     }),
     resultsDisplayDisabled: PropTypes.string,
+    noTokenForBI: PropTypes.string,
     downloadButton: PropTypes.string.isRequired,
     refreshTooltip: PropTypes.string.isRequired,
     errors: PropTypes.shape({

src/charts/SupersetReport/SupersetReport.js

@@ -91,8 +91,10 @@ export const SupersetReport = ({
       scenario,
       scenarioDTO,
       labels,
+      hasTokenForBI: guestToken?.status === SUPERSET_GUEST_TOKEN_STATUS.SUCCESS,
     });
   }, [
+    guestToken?.status,
     getDashboardPlaceholder,
     alwaysShowReports,
     disabled,