Merge pull request #42 from OCA-UFCG/chore/powerbi-panels-pagination

refact: update powerbi pages mapping
fix: update source instead title

Author: cilasmarques

src/app/data-panel/[id]/page.tsx

@@ -11,13 +11,11 @@ export default async function DataPanel({
   searchParams,
 }: {
   params: { id: string };
-  searchParams: { [key: string]: string | string[] | undefined };
+  searchParams: { pageName?: string };
 }) {
   const { panels } = await getContent(["panels"]);
-  const selectedPanel = panels.find((panel: any) =>
-    searchParams.page
-      ? panel.fields.id === `${params.id}?page=${searchParams.page}`
-      : panel.fields.id === params.id,
+  const selectedPanel = panels.find(
+    (panel: any) => panel.fields.title === params.id,
   );
 
   if (!selectedPanel) {
@@ -27,7 +25,10 @@ export default async function DataPanel({
   return (
     <HubTemplate>
       <Container>
-        <PowerBIContainer panel={selectedPanel} />
+        <PowerBIContainer
+          panel={selectedPanel}
+          pageName={searchParams.pageName}
+        />
       </Container>
     </HubTemplate>
   );

src/components/PanelCard/PanelCard.tsx

@@ -13,11 +13,11 @@ import {
 } from "./PanelCard.styles";
 
 const PanelCard = ({ data }: { data: { fields: ReportData } }) => {
-  const { macroTheme, id, description, thumb } = data.fields;
+  const { macroTheme, title, description, thumb } = data.fields;
 
   return (
     <Wrapper>
-      <Link target="_blank" href={`/data-panel/${id}`}>
+      <Link href={`/data-panel/${title}`}>
         <ThumbContainer>
           <Thumb
             src={`https:${thumb.fields.file.url}`}

src/components/PanelCard/Section/PanelSection.tsx

@@ -17,9 +17,8 @@ const PanelSection = ({
   header?: { fields: SectionHeader };
   panels?: { fields: ReportData }[];
 }) => {
-  const { title, id, subtitle } = header?.fields || {
+  const { title, subtitle } = header?.fields || {
     title: "",
-    id: "",
     subtitle: "",
   };
 
@@ -37,7 +36,7 @@ const PanelSection = ({
     .filter((item) => item.fields.macroPainel === true);
 
   return (
-    <Wrapper full={"false"} id={id}>
+    <Wrapper full={"false"} id={title}>
       <Header>
         <Title>{title}</Title>
         <Subtitle>{subtitle}</Subtitle>

src/components/PowerBIContainer/PowerBiContainer.tsx

@@ -9,7 +9,13 @@ import {
   Text,
 } from "./PowerBiContainer.styles";
 
-const PowerBIContainer = ({ panel }: { panel: { fields: ReportData } }) => {
+const PowerBIContainer = ({
+  panel,
+  pageName,
+}: {
+  panel: { fields: ReportData };
+  pageName?: string;
+}) => {
   const { macroTheme, title, source } = panel.fields;
 
   return (
@@ -22,7 +28,7 @@ const PowerBIContainer = ({ panel }: { panel: { fields: ReportData } }) => {
         <Title>{macroTheme}</Title>
       </Header>
       <iframe
-        src={source}
+        src={pageName ? `${source}&pageName=${pageName}` : source}
         title={title}
         width="1220px"
         height="100%"

src/utils/interfaces.ts

@@ -60,10 +60,9 @@ export interface IPublication {
 }
 
 export interface ReportData {
-  macroTheme: string;
-  id: string;
   title: string;
   source: string;
+  macroTheme: string;
   macroPainel: boolean;
   description: string;
   thumb: {