Merge pull request #4852 from jelly/re-use-cockpit-os-relase

WebUI: Use Cockpit's os-release implementation
rhinstaller · Jun 22, 2023 · 40445be · 40445be
2 parents ddd2883 + 1424858
commit 40445be
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 41 deletions.
diff --git a/ui/webui/src/components/app.jsx b/ui/webui/src/components/app.jsx
@@ -23,6 +23,8 @@ import {
  Page,
 } from "@patternfly/react-core";
 
+import { read_os_release as readOsRelease } from "os-release.js";
+
 import { AddressContext, LanguageContext } from "./Common.jsx";
 import { AnacondaHeader } from "./AnacondaHeader.jsx";
 import { AnacondaWizard } from "./AnacondaWizard.jsx";
@@ -35,7 +37,6 @@ import { PayloadsClient } from "../apis/payloads";
 
 import { readBuildstamp, getIsFinal } from "../helpers/betanag.js";
 import { readConf } from "../helpers/conf.js";
-import { getOsReleaseByKey } from "../helpers/product.js";
 
 export const Application = () => {
  const [address, setAddress] = useState();
@@ -70,9 +71,7 @@ export const Application = () => {
  ex => console.error("Failed to parse anaconda buildstamp file")
  );
 
- getOsReleaseByKey("PRETTY_NAME").then(
- setPrettyName
- );
+ readOsRelease().then(osRelease => setPrettyName(osRelease.PRETTY_NAME));
  }, []);
 
  const onAddNotification = (notificationProps) => {

diff --git a/ui/webui/src/components/localization/InstallationLanguage.jsx b/ui/webui/src/components/localization/InstallationLanguage.jsx
@@ -34,6 +34,7 @@ import {
 } from "@patternfly/react-core";
 
 import { EmptyStatePanel } from "cockpit-components-empty-state.jsx";
+import { read_os_release as readOsRelease } from "os-release.js";
 import { AddressContext, LanguageContext } from "../Common.jsx";
 import { setLocale } from "../../apis/boss.js";
 
@@ -53,7 +54,6 @@ import {
  setLangCookie
 } from "../../helpers/language.js";
 import { AnacondaPage } from "../AnacondaPage.jsx";
-import { getOsReleaseByKey } from "../../helpers/product.js";
 
 import "./InstallationLanguage.scss";
 
@@ -321,9 +321,7 @@ export const InstallationLanguage = ({ idPrefix, setIsFormValid, onAddErrorNotif
  const [distributionName, setDistributionName] = useState("");
 
  useEffect(() => {
- getOsReleaseByKey("NAME").then(
- setDistributionName
- );
+ readOsRelease().then(osRelease => setDistributionName(osRelease.NAME));
  }, []);
 
  return (

diff --git a/ui/webui/src/helpers/product.js b/ui/webui/src/helpers/product.js