hotfix/IO-2969-Fonts-For-Production

Signed-off-by: Dave Richer <dave@imexsystems.ca>

.platform/hooks/predeploy/00-install-fonts.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Install required packages
+dnf install -y fontconfig freetype
+
+# Move to the /tmp directory for temporary download and extraction
+cd /tmp
+
+# Download the Montserrat font zip file
+wget https://images.imex.online/fonts/montserrat.zip -O montserrat.zip
+
+# Unzip the downloaded font file
+unzip montserrat.zip -d montserrat
+
+# Move the font files to the system fonts directory
+mv montserrat/*.ttf /usr/share/fonts
+
+# Rebuild the font cache
+fc-cache -fv
+
+# Clean up
+rm -rf /tmp/montserrat /tmp/montserrat.zip
+
+echo "Montserrat fonts installed and cached successfully."

client/src/components/dashboard-components/job-lifecycle/job-lifecycle-dashboard.component.jsx

@@ -1,10 +1,10 @@
 import { Card, Table, Tag } from "antd";
-import axios from "axios";
-import React, { useEffect, useState } from "react";
-import { useTranslation } from "react-i18next";
-import dayjs from "../../../utils/day";
 import LoadingSkeleton from "../../loading-skeleton/loading-skeleton.component";
+import { useTranslation } from "react-i18next";
+import React, { useEffect, useState } from "react";
+import dayjs from "../../../utils/day";
 import DashboardRefreshRequired from "../refresh-required.component";
+import axios from "axios";
 
 const fortyFiveDaysAgo = () => dayjs().subtract(45, "day").toLocaleString();
 
@@ -46,11 +46,6 @@ export default function JobLifecycleDashboardComponent({ data, bodyshop, ...card
       dataIndex: "humanReadable",
       key: "humanReadable"
     },
-    {
-      title: t("job_lifecycle.columns.average_human_readable"),
-      dataIndex: "averageHumanReadable",
-      key: "averageHumanReadable"
-    },
     {
       title: t("job_lifecycle.columns.status_count"),
       key: "statusCount",

client/src/translations/en_us/common.json

@@ -1338,8 +1338,6 @@
     },
     "job_lifecycle": {
       "columns": {
-        "average_human_readable": "Average Human Readable",
-        "average_value": "Average Value",
         "duration": "Duration",
         "end": "End",
         "human_readable": "Human Readable",

client/src/translations/es/common.json

@@ -1338,8 +1338,6 @@
     },
     "job_lifecycle": {
       "columns": {
-        "average_human_readable": "",
-        "average_value": "",
         "duration": "",
         "end": "",
         "human_readable": "",

client/src/translations/fr/common.json

@@ -1338,8 +1338,6 @@
     },
     "job_lifecycle": {
       "columns": {
-        "average_human_readable": "",
-        "average_value": "",
         "duration": "",
         "end": "",
         "human_readable": "",

server/job/job-lifecycle.js

@@ -78,20 +78,16 @@ const jobLifecycle = async (req, res) => {
   Object.keys(flatGroupedAllDurations).forEach((status) => {
     const value = flatGroupedAllDurations[status].reduce((acc, curr) => acc + curr.value, 0);
     const humanReadable = durationToHumanReadable(moment.duration(value));
-    const percentage = finalTotal > 0 ? (value / finalTotal) * 100 : 0;
+    const percentage = (value / finalTotal) * 100;
     const color = getLifecycleStatusColor(status);
     const roundedPercentage = `${Math.round(percentage)}%`;
-    const averageValue = _.size(jobIDs) > 0 ? value / jobIDs.length : 0;
-    const averageHumanReadable = durationToHumanReadable(moment.duration(averageValue));
     finalSummations.push({
       status,
       value,
       humanReadable,
       percentage,
       color,
-      roundedPercentage,
-      averageValue,
-      averageHumanReadable
+      roundedPercentage
     });
   });
 
@@ -104,12 +100,7 @@ const jobLifecycle = async (req, res) => {
       totalStatuses: finalSummations.length,
       total: finalTotal,
       statusCounts: finalStatusCounts,
-      humanReadable: durationToHumanReadable(moment.duration(finalTotal)),
-      averageValue: _.size(jobIDs) > 0 ? finalTotal / jobIDs.length : 0,
-      averageHumanReadable:
-        _.size(jobIDs) > 0
-          ? durationToHumanReadable(moment.duration(finalTotal / jobIDs.length))
-          : durationToHumanReadable(moment.duration(0))
+      humanReadable: durationToHumanReadable(moment.duration(finalTotal))
     }
   });
 };