modify rendering insights at frontend

kortirso · Jul 4, 2024 · edbfbfe · edbfbfe
1 parent c960def
commit edbfbfe
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/app/javascript/components/Company/Company.jsx b/app/javascript/components/Company/Company.jsx
@@ -30,11 +30,11 @@ export const Company = ({
     const fetchInsights = async () => await insightsRequest(uuid);
 
     Promise.all([fetchInsights()]).then(([insightsData]) => {
-      const insightTypes = insightsData.length > 0 ? Object.keys(insightsData[0].values) : [];
-      const ratioType = insightsData.length > 0 ? insightsData[0].ratio_type : null;
+      const insightTypes = insightsData.data.length > 0 ? Object.keys(insightsData.data[0].values) : [];
+      const ratioType = insightsData.ratioType || null;
       setPageState({
         ...pageState,
-        entities: insightsData,
+        entities: insightsData.data,
         insightTypes: insightTypes,
         ratioType: ratioType,
       });

diff --git a/app/javascript/components/Company/requests/insightsRequest.jsx b/app/javascript/components/Company/requests/insightsRequest.jsx
@@ -4,5 +4,8 @@ export const insightsRequest = async (companyUuid) => {
   const result = await apiRequest({
     url: `/api/frontend/companies/${companyUuid}/insights.json`,
   });
-  return result.insights.data.map((element) => element.attributes);
+  return {
+    data: result.insights.data.map((element) => element.attributes),
+    ratioType: result.insights.ratio_type
+  };
 };
diff --git a/app/javascript/components/Repository/Repository.jsx b/app/javascript/components/Repository/Repository.jsx
@@ -38,11 +38,11 @@ export const Repository = ({
 
     Promise.all([fetchInsights(), fetchRepositoryInsights()]).then(
       ([insightsData, repositoryInsightsData]) => {
-        const insightTypes = insightsData.length > 0 ? Object.keys(insightsData[0].values) : [];
-        const ratioType = insightsData.length > 0 ? insightsData[0].ratio_type : null;
+        const insightTypes = insightsData.data.length > 0 ? Object.keys(insightsData.data[0].values) : [];
+        const ratioType = insightsData.ratioType || null;
         setPageState({
           ...pageState,
-          entities: insightsData,
+          entities: insightsData.data,
           insights:
             Object.keys(repositoryInsightsData).length === 0 ? undefined : repositoryInsightsData,
           insightTypes: insightTypes,

diff --git a/app/javascript/components/Repository/requests/insightsRequest.jsx b/app/javascript/components/Repository/requests/insightsRequest.jsx
@@ -4,5 +4,8 @@ export const insightsRequest = async (repositoryUuid) => {
   const result = await apiRequest({
     url: `/api/frontend/repositories/${repositoryUuid}/insights.json`,
   });
-  return result.insights.data.map((element) => element.attributes);
+  return {
+    data: result.insights.data.map((element) => element.attributes),
+    ratioType: result.insights.ratio_type
+  };
 };