[web] Update aliases for using ~/ instead of @

web/package/cockpit-d-installer.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 19 07:58:00 UTC 2023 - David Diaz <dgonzalez@suse.com>
+
+- Update aliases for using "~/" instead of "@"
+  (gh#yast/d-installer#400).
+
 -------------------------------------------------------------------
 Wed Jan 18 08:06:05 UTC 2023 - Josef Reidinger <jreidinger@suse.com>
 

web/src/App.jsx

@@ -22,12 +22,12 @@
 import React, { useEffect, useState } from "react";
 import { Outlet } from "react-router-dom";
 
-import { useInstallerClient } from "@context/installer";
-import { STARTUP, INSTALL } from "@client/phase";
-import { BUSY } from "@client/status";
+import { useInstallerClient } from "~/context/installer";
+import { STARTUP, INSTALL } from "~/client/phase";
+import { BUSY } from "~/client/status";
 
-import { Layout, Title, LoadingEnvironment, DBusError } from "@components/layout";
-import { InstallationProgress, InstallationFinished } from "@components/core";
+import { Layout, Title, LoadingEnvironment, DBusError } from "~/components/layout";
+import { InstallationProgress, InstallationFinished } from "~/components/core";
 
 function App() {
   const client = useInstallerClient();

web/src/App.test.jsx

@@ -21,27 +21,27 @@
 
 import React from "react";
 import { act, screen } from "@testing-library/react";
-import { installerRender, mockComponent, mockLayout } from "@/test-utils";
+import { installerRender, mockComponent, mockLayout } from "~/test-utils";
 import App from "./App";
-import { createClient } from "@client";
-import { STARTUP, CONFIG, INSTALL } from "@client/phase";
-import { IDLE, BUSY } from "@client/status";
+import { createClient } from "~/client";
+import { STARTUP, CONFIG, INSTALL } from "~/client/phase";
+import { IDLE, BUSY } from "~/client/status";
 
-jest.mock("@client");
+jest.mock("~/client");
 
 jest.mock('react-router-dom', () => ({
   Outlet: mockComponent("Content"),
 }));
 
-jest.mock("@components/layout/Layout", () => mockLayout());
+jest.mock("~/components/layout/Layout", () => mockLayout());
 
 // Mock some components,
 // See https://www.chakshunyu.com/blog/how-to-mock-a-react-component-in-jest/#default-export
-jest.mock("@components/layout/DBusError", () => mockComponent("D-BusError Mock"));
-jest.mock("@components/layout/LoadingEnvironment", () => mockComponent("LoadingEnvironment Mock"));
-jest.mock("@components/questions/Questions", () => mockComponent("Questions Mock"));
-jest.mock("@components/core/InstallationProgress", () => mockComponent("InstallationProgress Mock"));
-jest.mock("@components/core/InstallationFinished", () => mockComponent("InstallationFinished Mock"));
+jest.mock("~/components/layout/DBusError", () => mockComponent("D-BusError Mock"));
+jest.mock("~/components/layout/LoadingEnvironment", () => mockComponent("LoadingEnvironment Mock"));
+jest.mock("~/components/questions/Questions", () => mockComponent("Questions Mock"));
+jest.mock("~/components/core/InstallationProgress", () => mockComponent("InstallationProgress Mock"));
+jest.mock("~/components/core/InstallationFinished", () => mockComponent("InstallationFinished Mock"));
 
 const callbacks = {};
 const getStatusFn = jest.fn();

web/src/Main.jsx

@@ -21,7 +21,7 @@
 
 import React from "react";
 import { Outlet } from "react-router-dom";
-import { Questions } from "@components/questions";
+import { Questions } from "~/components/questions";
 
 function Main() {
   return (

web/src/Main.test.jsx

@@ -21,11 +21,11 @@
 
 import React from "react";
 import { screen } from "@testing-library/react";
-import { installerRender, mockComponent } from "@/test-utils";
+import { installerRender, mockComponent } from "~/test-utils";
 
-import Main from "@/Main";
+import Main from "~/Main";
 
-jest.mock("@components/questions/Questions", () => mockComponent("Questions Mock"));
+jest.mock("~/components/questions/Questions", () => mockComponent("Questions Mock"));
 jest.mock('react-router-dom', () => ({
   Outlet: mockComponent("Content"),
 }));

web/src/assets/styles/index.scss

@@ -1,11 +1,11 @@
-@use "@assets/styles/variables.scss";
+@use "~/assets/styles/variables.scss";
 // TODO: merge app and global
-@use "@assets/styles/global.scss";
-@use "@assets/styles/app.scss";
-@use "@assets/styles/layout.scss";
-@use "@assets/styles/utilities.scss";
-@use "@assets/styles/composition.scss";
-@use "@assets/styles/blocks.scss";
+@use "~/assets/styles/global.scss";
+@use "~/assets/styles/app.scss";
+@use "~/assets/styles/layout.scss";
+@use "~/assets/styles/utilities.scss";
+@use "~/assets/styles/composition.scss";
+@use "~/assets/styles/blocks.scss";
 
 // PatternFly overrides
-@use "@assets/styles/patternfly-overrides.scss";
+@use "~/assets/styles/patternfly-overrides.scss";

web/src/components/core/About.jsx

@@ -20,10 +20,10 @@
  */
 
 import React, { useState } from "react";
-import { noop } from "@/utils";
+import { noop } from "~/utils";
 import { Button, Text } from "@patternfly/react-core";
-import { Icon } from "@components/layout";
-import { Popup } from "@components/core";
+import { Icon } from "~/components/layout";
+import { Popup } from "~/components/core";
 
 export default function About({ onClickCallback = noop }) {
   const [isOpen, setIsOpen] = useState(false);

web/src/components/core/About.test.jsx

@@ -22,7 +22,7 @@
 import React from "react";
 
 import { screen, waitFor, within } from "@testing-library/react";
-import { plainRender } from "@/test-utils";
+import { plainRender } from "~/test-utils";
 
 import About from "./About";
 

web/src/components/core/ChangeProductButton.jsx

@@ -22,9 +22,9 @@
 import React from "react";
 import { Button } from "@patternfly/react-core";
 import { useNavigate } from "react-router-dom";
-import { useSoftware } from "@context/software";
-import { Icon } from "@components/layout";
-import { noop } from "@/utils";
+import { useSoftware } from "~/context/software";
+import { Icon } from "~/components/layout";
+import { noop } from "~/utils";
 
 export default function ChangeProductButton({ onClickCallback = noop }) {
   const { products } = useSoftware();

web/src/components/core/ChangeProductButton.test.jsx

@@ -21,16 +21,16 @@
 
 import React from "react";
 import { screen, waitFor } from "@testing-library/react";
-import { plainRender } from "@/test-utils";
-import { createClient } from "@client";
-import { ChangeProductButton } from "@components/core";
+import { plainRender } from "~/test-utils";
+import { createClient } from "~/client";
+import { ChangeProductButton } from "~/components/core";
 
 let mockProducts;
 const mockNavigateFn = jest.fn();
 
-jest.mock("@client");
-jest.mock("@context/software", () => ({
-  ...jest.requireActual("@context/software"),
+jest.mock("~/client");
+jest.mock("~/context/software", () => ({
+  ...jest.requireActual("~/context/software"),
   useSoftware: () => {
     return {
       products: mockProducts,

web/src/components/core/Fieldset.jsx

@@ -22,7 +22,7 @@
 // @ts-check
 
 import React from "react";
-import { classNames } from "@/utils";
+import { classNames } from "~/utils";
 
 import "./fieldset.scss";
 

web/src/components/core/Fieldset.test.jsx

@@ -21,8 +21,8 @@
 
 import React from "react";
 import { screen, within } from "@testing-library/react";
-import { installerRender } from "@/test-utils";
-import { Fieldset } from "@components/core";
+import { installerRender } from "~/test-utils";
+import { Fieldset } from "~/components/core";
 
 const ComplexLegend = () => {
   return (

web/src/components/core/InstallButton.jsx

@@ -20,10 +20,10 @@
  */
 
 import React, { useState } from "react";
-import { useInstallerClient } from "@context/installer";
+import { useInstallerClient } from "~/context/installer";
 
 import { Button, Text } from "@patternfly/react-core";
-import { Popup } from "@components/core";
+import { Popup } from "~/components/core";
 
 const InstallConfirmationPopup = ({ onAccept, onClose }) => (
   <Popup

web/src/components/core/InstallButton.test.jsx

@@ -21,13 +21,13 @@
 
 import React from "react";
 import { screen, waitFor } from "@testing-library/react";
-import { installerRender } from "@/test-utils";
-import { createClient } from "@client";
-import { InstallButton } from "@components/core";
+import { installerRender } from "~/test-utils";
+import { createClient } from "~/client";
+import { InstallButton } from "~/components/core";
 
 const startInstallationFn = jest.fn().mockName("startInstallation");
 
-jest.mock("@client", () => ({
+jest.mock("~/client", () => ({
   createClient: jest.fn()
 }));
 

web/src/components/core/InstallationFinished.jsx

@@ -29,8 +29,8 @@ import {
   EmptyStateBody
 } from "@patternfly/react-core";
 
-import { Center, Icon, Title as SectionTitle, PageIcon, MainActions } from "@components/layout";
-import { useInstallerClient } from "@context/installer";
+import { Center, Icon, Title as SectionTitle, PageIcon, MainActions } from "~/components/layout";
+import { useInstallerClient } from "~/context/installer";
 
 function InstallationFinished() {
   const client = useInstallerClient();

web/src/components/core/InstallationFinished.test.jsx

@@ -22,13 +22,13 @@
 import React from "react";
 
 import { screen } from "@testing-library/react";
-import { installerRender, mockLayout } from "@/test-utils";
-import { createClient } from "@client";
+import { installerRender, mockLayout } from "~/test-utils";
+import { createClient } from "~/client";
 
 import InstallationFinished from "./InstallationFinished";
 
-jest.mock("@client");
-jest.mock("@components/layout/Layout", () => mockLayout());
+jest.mock("~/client");
+jest.mock("~/components/layout/Layout", () => mockLayout());
 
 const rebootSystemFn = jest.fn();
 

web/src/components/core/InstallationProgress.jsx

@@ -22,8 +22,8 @@
 import React from "react";
 
 import ProgressReport from "./ProgressReport";
-import { Center, Icon, Title, PageIcon } from "@components/layout";
-import { Questions } from "@components/questions";
+import { Center, Icon, Title, PageIcon } from "~/components/layout";
+import { Questions } from "~/components/questions";
 
 function InstallationProgress() {
   return (

web/src/components/core/InstallationProgress.test.jsx

@@ -22,12 +22,12 @@
 import React from "react";
 
 import { screen } from "@testing-library/react";
-import { installerRender, mockComponent, mockLayout } from "@/test-utils";
+import { installerRender, mockComponent, mockLayout } from "~/test-utils";
 
 import InstallationProgress from "./InstallationProgress";
 
-jest.mock("@components/layout/Layout", () => mockLayout());
-jest.mock("@components/core/ProgressReport", () => mockComponent("ProgressReport Mock"));
+jest.mock("~/components/layout/Layout", () => mockLayout());
+jest.mock("~/components/core/ProgressReport", () => mockComponent("ProgressReport Mock"));
 
 describe("InstallationProgress", () => {
   it("uses 'Installing' as title", async () => {

web/src/components/core/KebabMenu.jsx

@@ -21,7 +21,7 @@
 
 import React, { useState } from "react";
 import { Dropdown, DropdownToggle } from "@patternfly/react-core";
-import { Icon } from "@components/layout";
+import { Icon } from "~/components/layout";
 
 export default function KebabMenu({ items, position = "right", id = Date.now(), ...props }) {
   const [isOpen, setIsOpen] = useState(false);

web/src/components/core/LogsButton.jsx

@@ -20,11 +20,11 @@
  */
 
 import React, { useState } from "react";
-import { useInstallerClient } from "@context/installer";
-import { useCancellablePromise } from "@/utils";
+import { useInstallerClient } from "~/context/installer";
+import { useCancellablePromise } from "~/utils";
 
 import { Alert, Button } from "@patternfly/react-core";
-import { Icon } from "@components/layout";
+import { Icon } from "~/components/layout";
 
 const FILENAME = "y2logs.tar.xz";
 const FILETYPE = "application/x-xz";

web/src/components/core/LogsButton.test.jsx

@@ -21,11 +21,11 @@
 
 import React from "react";
 import { screen } from "@testing-library/react";
-import { installerRender } from "@/test-utils";
-import { createClient } from "@client";
-import { LogsButton } from "@components/core";
+import { installerRender } from "~/test-utils";
+import { createClient } from "~/client";
+import { LogsButton } from "~/components/core";
 
-jest.mock("@client");
+jest.mock("~/client");
 
 const originalCreateElement = document.createElement;
 

web/src/components/core/PasswordAndConfirmationInput.test.jsx

@@ -21,7 +21,7 @@
 
 import React from "react";
 import { screen } from "@testing-library/react";
-import { plainRender } from "@/test-utils";
+import { plainRender } from "~/test-utils";
 import PasswordAndConfirmationInput from "./PasswordAndConfirmationInput";
 
 describe("when the passwords do not match", () => {

web/src/components/core/Popup.jsx

@@ -21,7 +21,7 @@
 
 import React from "react";
 import { Button, Modal } from "@patternfly/react-core";
-import { partition } from "@/utils";
+import { partition } from "~/utils";
 
 /**
  * Wrapper component for holding Popup actions

web/src/components/core/Popup.test.jsx

@@ -22,9 +22,9 @@
 import React from "react";
 
 import { screen, within } from "@testing-library/react";
-import { installerRender } from "@/test-utils";
+import { installerRender } from "~/test-utils";
 
-import { Popup } from "@components/core";
+import { Popup } from "~/components/core";
 
 let isOpen;
 const confirmFn = jest.fn();

web/src/components/core/ProgressReport.jsx

@@ -20,8 +20,8 @@
  */
 
 import React, { useState, useEffect } from "react";
-import { useCancellablePromise } from "@/utils";
-import { useInstallerClient } from "@context/installer";
+import { useCancellablePromise } from "~/utils";
+import { useInstallerClient } from "~/context/installer";
 
 import { Progress, Text } from "@patternfly/react-core";
 

web/src/components/core/ProgressReport.test.jsx

@@ -22,12 +22,12 @@
 import React from "react";
 
 import { act, screen } from "@testing-library/react";
-import { installerRender, createCallbackMock } from "@/test-utils";
-import { createClient } from "@client";
+import { installerRender, createCallbackMock } from "~/test-utils";
+import { createClient } from "~/client";
 
-import { ProgressReport } from "@components/core";
+import { ProgressReport } from "~/components/core";
 
-jest.mock("@client");
+jest.mock("~/client");
 
 let callbacks;
 let onManagerProgressChange = jest.fn();

web/src/components/core/Section.jsx

@@ -30,8 +30,8 @@ import {
   Tooltip
 } from "@patternfly/react-core";
 
-import { Icon } from '@components/layout';
-import { ValidationErrors } from "@components/core";
+import { Icon } from '~/components/layout';
+import { ValidationErrors } from "~/components/core";
 
 /**
  * Helper method for rendering section icon
@@ -91,7 +91,7 @@ const renderIcon = (name, size = 32) => {
  * @param {string} [props.actionIconName="settings"] - name for the icon for linking to section settings, when needed
  * @param {React.ReactNode} [props.actionTooltip] - text to be shown as a tooltip when user hovers action icon, if present
  * @param {React.MouseEventHandler} [props.onActionClick] - callback to be triggered when user clicks on action icon, if present
- * @param {import("@client/mixins").ValidationError[]} [props.errors] - Validation errors to be shown before the title
+ * @param {import("~/client/mixins").ValidationError[]} [props.errors] - Validation errors to be shown before the title
  * @param {JSX.Element} [props.children] - the section content
  */
 export default function Section({