webui: adding PRETTY_NAME to use in title instead of anaconda generic…

… title
rhinstaller · Jun 12, 2023 · 5b4d670 · 5b4d670
1 parent c34a4fb
commit 5b4d670
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 4 deletions.
diff --git a/ui/webui/src/components/app.jsx b/ui/webui/src/components/app.jsx
@@ -34,7 +34,7 @@ import { StorageClient } from "../apis/storage.js";
 import { PayloadsClient } from "../apis/payloads";
 
 import { readBuildstamp, getIsFinal } from "../helpers/betanag.js";
-import { readConf } from "../helpers/conf.js";
+import { readConf, readPrettyName } from "../helpers/conf.js";
 
 const _ = cockpit.gettext;
 
@@ -46,6 +46,7 @@ export const Application = () => {
     const [notifications, setNotifications] = useState({});
     const [isHelpExpanded, setIsHelpExpanded] = useState(false);
     const [helpContent, setHelpContent] = useState("");
+    const [prettyName, setIsPrettyName] = useState("");
 
     useEffect(() => {
         cockpit.file("/run/anaconda/bus.address").watch(address => {
@@ -69,6 +70,10 @@ export const Application = () => {
             buildstamp => setBeta(!getIsFinal(buildstamp)),
             ex => console.error("Failed to parse anaconda buildstamp file")
         );
+
+        readPrettyName().then(
+            setIsPrettyName,
+        );
     }, []);
 
     const onAddNotification = (notificationProps) => {
@@ -95,7 +100,7 @@ export const Application = () => {
     }
     console.info("conf: ", conf);
 
-    const title = _("Anaconda installer");
+    const title = _(prettyName) + _(" installation");
 
     const page = (
         <Page

diff --git a/ui/webui/src/components/localization/InstallationLanguage.jsx b/ui/webui/src/components/localization/InstallationLanguage.jsx
@@ -15,7 +15,7 @@
  * along with This program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-import React from "react";
+import React, { useEffect, useState } from "react";
 import cockpit from "cockpit";
 
 import {
@@ -56,6 +56,8 @@ import { AnacondaPage } from "../AnacondaPage.jsx";
 
 import "./InstallationLanguage.scss";
 
+import { readPrettyName } from "../../helpers/conf.js";
+
 const _ = cockpit.gettext;
 
 const getLanguageEnglishName = lang => lang["english-name"].v;
@@ -317,9 +319,16 @@ LanguageSelector.contextType = AddressContext;
 export const InstallationLanguage = ({ idPrefix, setIsFormValid, onAddErrorNotification }) => {
     const [nativeName, setNativeName] = React.useState(false);
     const { setLanguage } = React.useContext(LanguageContext);
+    const [prettyName, setIsPrettyName] = useState("");
+
+    useEffect(() => {
+        readPrettyName().then(
+            setIsPrettyName,
+        );
+    }, []);
 
     return (
-        <AnacondaPage title={_("Welcome to the Anaconda installer")}>
+        <AnacondaPage title={_("Welcome to ") + _(prettyName)}>
             <Title
               headingLevel="h3"
             >

diff --git a/ui/webui/src/helpers/conf.js b/ui/webui/src/helpers/conf.js
@@ -79,3 +79,14 @@ export const readConf = () => {
             .then(parseIni)
             .finally(confFile.close);
 };
+
+export const readPrettyName = () => {
+    const confFile = cockpit?.file("/etc/os-release");
+    return (
+        confFile
+                .read()
+                .then((content) => content.split(/\r?\n/)?.find((item) => item?.includes("PRETTY_NAME"))
+                        .split("=")[1].replace(/['"]+/g, ""))
+                .finally(confFile.close)
+    );
+};