[#14] moved conf stats and added summary

linagora · Jun 25, 2024 · 70e3e7a · 70e3e7a
1 parent 81deb65
commit 70e3e7a
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 45 deletions.
diff --git a/src/components/ConfStats.tsx b/src/components/ConfStats.tsx
@@ -15,46 +15,51 @@ export function ConfStats({ config }: { config: llngConfig }) {
       ? Object.keys(config.casAppMetaDataOptions).length
       : 0);
   return (
-    <div className="main">
-      <div className="box" style={{ maxWidth: "350px" }}>
-        <strong>
-          {t("appNum")} ({appNum})
-        </strong>
-        <PieChart
-          paddingAngle={18}
-          data={[
-            {
-              title: t("saml"),
-              value: config.samlSPMetaDataXML
-                ? Object.keys(config.samlSPMetaDataXML).length
-                : 0,
-              color: "#E38627",
-            },
-            {
-              title: t("oidc"),
-              value: config.oidcRPMetaDataOptions
-                ? Object.keys(config.oidcRPMetaDataOptions).length
-                : 0,
-              color: "#C13C37",
-            },
-            {
-              title: t("cas"),
-              value: config.casAppMetaDataOptions
-                ? Object.keys(config.casAppMetaDataOptions).length
-                : 0,
-              color: "#6A2135",
-            },
-          ]}
-          label={({ dataEntry }) => dataEntry.title + " : " + dataEntry.value}
-          labelStyle={() => ({
-            fontSize: "5px",
-            fontFamily: "sans-serif",
-          })}
-          lineWidth={30}
-          labelPosition={110}
-          radius={30}
-        />
-      </div>
+    <div>
+      <strong>
+        {t("appNum")} ({appNum})
+      </strong>
+      <PieChart
+        paddingAngle={15}
+        data={[
+          {
+            title: t("saml"),
+            value: config.samlSPMetaDataXML
+              ? Object.keys(config.samlSPMetaDataXML).length
+              : 0,
+            color: "#E38627",
+          },
+          {
+            title: t("virtualHost"),
+            value: config.locationRules
+              ? Object.keys(config.locationRules).length
+              : 0,
+            color: "#d65600",
+          },
+          {
+            title: t("oidc"),
+            value: config.oidcRPMetaDataOptions
+              ? Object.keys(config.oidcRPMetaDataOptions).length
+              : 0,
+            color: "#C13C37",
+          },
+          {
+            title: t("cas"),
+            value: config.casAppMetaDataOptions
+              ? Object.keys(config.casAppMetaDataOptions).length
+              : 0,
+            color: "#6A2135",
+          },
+        ]}
+        label={({ dataEntry }) => dataEntry.title + " : " + dataEntry.value}
+        labelStyle={() => ({
+          fontSize: "5px",
+          fontFamily: "sans-serif",
+        })}
+        lineWidth={30}
+        labelPosition={110}
+        radius={20}
+      />
     </div>
   );
 }
diff --git a/src/dashboards/HomePage.css b/src/dashboards/HomePage.css
@@ -1,6 +1,7 @@
 .infoTable {
   border: 1px solid #acacac;
   width: 100%;
+  margin: 10px;
   text-align: left;
   max-width: 100%;
   flex-wrap: wrap;
@@ -17,7 +18,7 @@ th {
 .desc {
   display: flex;
   flex-direction: row;
-  align-content: space-between;
+  align-content: space-evenly;
   margin: 2%;
 }
 

diff --git a/src/dashboards/HomePage.tsx b/src/dashboards/HomePage.tsx
@@ -204,10 +204,21 @@ export function HomePage() {
                 </tbody>
               </table>
             </div>
-          </div>
-          <div>
-            <strong className="title2">{t("Latest conf stats")}</strong>
-            <ConfStats config={config.data.config} />
+            <div>
+              <table className="infoTable">
+                <tbody>
+                  <tr>
+                    <th>{t("cfgLog")}</th>
+                  </tr>
+                  <tr>
+                    <td>{config.data.config.cfgLog}</td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
+            <div className="statBox">
+              <ConfStats config={config.data.config} />
+            </div>
           </div>
           <div
             style={{