Merge pull request #485 from zesu22/bug/variable-image

[ADDED] util method for env variable boolean check
mosip · Nov 28, 2023 · e4b68b8 · e4b68b8
2 parents c278030 + 26756c5
commit e4b68b8
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 6 deletions.
diff --git a/oidc-ui/src/components/Background.js b/oidc-ui/src/components/Background.js
@@ -1,6 +1,7 @@
 import React, { useState, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { configurationKeys } from "../constants/clientConstants";
+import { getBooleanValue } from "../services/utilService";
 
 export default function Background({
   heading,
@@ -31,7 +32,7 @@ export default function Background({
   // check if background logo is needed or not,
   // create div according to the environment variable
   const backgroundLogoDiv =
-    process.env.REACT_APP_BACKGROUND_LOGO === "true" ? (
+    getBooleanValue(process.env.REACT_APP_BACKGROUND_LOGO) ? (
       <div className="flex justify-center m-10 lg:mt-20 mb:mt-0 lg:w-1/2 md:w-1/2 md:block sm:w-1/2 sm:block hidden w-5/6 mt-20 mb-10 md:mb-0">
         <img
           className="background-logo object-contain rtl:scale-x-[-1]"

diff --git a/oidc-ui/src/components/Consent.js b/oidc-ui/src/components/Consent.js
@@ -8,6 +8,7 @@ import { LoadingStates, LoadingStates as states } from "../constants/states";
 import FormAction from "./FormAction";
 import langConfigService from "./../services/langConfigService";
 import ModalPopup from "../common/ModalPopup";
+import { getBooleanValue } from "../services/utilService";
 
 export default function Consent({
   authService,
@@ -45,7 +46,11 @@ export default function Consent({
   const [timeLeft, setTimeLeft] = useState(null);
   const [cancelPopup, setCancelPopup] = useState(false);
 
-  const slideToggleClass = process.env.REACT_APP_NO_OUTLINE_TOGGLE === "true" ? "toggle-no-outline" : "toggle-outline";
+  const slideToggleClass = getBooleanValue(
+    process.env.REACT_APP_NO_OUTLINE_TOGGLE
+  )
+    ? "toggle-no-outline"
+    : "toggle-outline";
 
   const hasAllElement = (mainArray, subArray) =>
     subArray.every((ele) => mainArray.includes(ele));
@@ -402,7 +407,7 @@ export default function Consent({
   // check if background logo is needed or not,
   // create div according to the environment variable
   const backgroundLogoDiv =
-    process.env.REACT_APP_BACKGROUND_LOGO === "true" ? (
+    getBooleanValue(process.env.REACT_APP_BACKGROUND_LOGO) ? (
       <div className="flex justify-center m-10 lg:mt-20 mb:mt-0 lg:w-1/2 md:w-1/2 md:block sm:w-1/2 sm:block hidden w-5/6 mt-20 mb-10 md:mb-0">
         <img
           className="background-logo object-contain rtl:scale-x-[-1]"

diff --git a/oidc-ui/src/components/EsignetDetails.js b/oidc-ui/src/components/EsignetDetails.js
@@ -1,6 +1,7 @@
 import { useTranslation } from "react-i18next";
 import { useEffect, useState } from "react";
 import { LoadingStates as states } from "../constants/states";
+import { getBooleanValue } from "../services/utilService";
 
 export default function EsignetDetails({ i18nKeyPrefix = "esignetDetails" }) {
   const { t } = useTranslation("translation", { keyPrefix: i18nKeyPrefix });
@@ -30,7 +31,7 @@ export default function EsignetDetails({ i18nKeyPrefix = "esignetDetails" }) {
   // check if background logo is needed or not,
   // create div according to the environment variable
   const backgroundLogoDiv =
-    process.env.REACT_APP_BACKGROUND_LOGO === "true" ? (
+    getBooleanValue(process.env.REACT_APP_BACKGROUND_LOGO) ? (
       <div className="flex justify-center m-10 lg:mt-20 mb:mt-0 lg:w-1/2 md:w-1/2 md:block sm:w-1/2 sm:block hidden w-5/6 mt-20 mb-10 md:mb-0">
         <img
           className="background-logo object-contain rtl:scale-x-[-1]"

diff --git a/oidc-ui/src/components/Footer.js b/oidc-ui/src/components/Footer.js
@@ -1,7 +1,8 @@
 import { useTranslation } from "react-i18next";
+import { getBooleanValue } from "../services/utilService";
 
 export default function Footer({ i18nKeyPrefix = "footer" }) {
-  const footerCheck = process.env.REACT_APP_FOOTER === "true";
+  const footerCheck = getBooleanValue(process.env.REACT_APP_FOOTER);
 
   const { t } = useTranslation("translation", {
     keyPrefix: i18nKeyPrefix,

diff --git a/oidc-ui/src/components/NavHeader.js b/oidc-ui/src/components/NavHeader.js
@@ -1,6 +1,7 @@
 import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import Select from "react-select";
+import { getBooleanValue } from "../services/utilService";
 
 export default function NavHeader({ langOptions, i18nKeyPrefix = "header" }) {
   const { t, i18n } = useTranslation("translation", {
@@ -12,7 +13,7 @@ export default function NavHeader({ langOptions, i18nKeyPrefix = "header" }) {
     i18n.changeLanguage(e.value);
   };
 
-  const removeIndicatorPipe = process.env.REACT_APP_REMOVE_INDICATOR_PIPE === "true";
+  const removeIndicatorPipe = getBooleanValue(process.env.REACT_APP_REMOVE_INDICATOR_PIPE);
 
   const customStyles = {
       control: (base) => ({

diff --git a/oidc-ui/src/services/utilService.js b/oidc-ui/src/services/utilService.js
@@ -0,0 +1,8 @@
+const getBooleanValue = (inputValue) => {
+    if (typeof(inputValue) === 'undefined' || inputValue === null || inputValue === '') {
+        return false;
+    }
+    return /^true$/i.test(inputValue);
+}
+
+export { getBooleanValue };