Migrate new-apps to apps (#3253)

src/apps/components/AllAppList/AllAppList.tsx

@@ -1,6 +1,6 @@
+import { GetV2SaleorAppsResponse } from "@dashboard/apps/marketplace.types";
+import { resolveInstallationOfMarketplaceApp } from "@dashboard/apps/utils";
 import { AppInstallationFragment } from "@dashboard/graphql";
-import { GetV2SaleorAppsResponse } from "@dashboard/new-apps/marketplace.types";
-import { resolveInstallationOfMarketplaceApp } from "@dashboard/new-apps/utils";
 import { Skeleton } from "@material-ui/lab";
 import { Box } from "@saleor/macaw-ui/next";
 import React from "react";

src/apps/components/AppAvatar/AppAvatar.tsx

@@ -1,4 +1,4 @@
-import { AppLogo } from "@dashboard/new-apps/types";
+import { AppLogo } from "@dashboard/apps/types";
 import { Box, GenericAppIcon } from "@saleor/macaw-ui/next";
 import React from "react";
 

src/apps/components/AppDetailsPage/Header.test.tsx

@@ -1,4 +1,4 @@
-import { appDetails } from "@dashboard/new-apps/fixtures";
+import { appDetails } from "@dashboard/apps/fixtures";
 import { render } from "@testing-library/react";
 import React from "react";
 

src/apps/components/AppDetailsPage/Header.tsx

@@ -1,6 +1,6 @@
+import { AppPaths } from "@dashboard/apps/urls";
 import { TopNav } from "@dashboard/components/AppLayout/TopNav";
 import { AppQuery } from "@dashboard/graphql";
-import { AppPaths } from "@dashboard/new-apps/urls";
 import { Button } from "@saleor/macaw-ui/next";
 import React from "react";
 import { FormattedMessage } from "react-intl";

src/apps/components/AppFrame/AppFrame.tsx

@@ -1,10 +1,10 @@
-import { useAllFlags } from "@dashboard/hooks/useFlags";
-import { useAppDashboardUpdates } from "@dashboard/new-apps/components/AppFrame/useAppDashboardUpdates";
+import { useAppDashboardUpdates } from "@dashboard/apps/components/AppFrame/useAppDashboardUpdates";
 import {
   AppDetailsUrlQueryParams,
   AppUrls,
   prepareFeatureFlagsList,
-} from "@dashboard/new-apps/urls";
+} from "@dashboard/apps/urls";
+import { useAllFlags } from "@dashboard/hooks/useFlags";
 import { CircularProgress } from "@material-ui/core";
 import { useTheme } from "@saleor/macaw-ui";
 import clsx from "clsx";

src/apps/components/AppFrame/appActionsHandler.test.ts

@@ -1,7 +1,7 @@
+import { AppActionsHandler } from "@dashboard/apps/components/AppFrame/appActionsHandler";
+import * as ExternalAppContext from "@dashboard/apps/components/ExternalAppContext/ExternalAppContext";
 import * as dashboardConfig from "@dashboard/config";
 import { UseNotifierResult } from "@dashboard/hooks/useNotifier";
-import { AppActionsHandler } from "@dashboard/new-apps/components/AppFrame/appActionsHandler";
-import * as ExternalAppContext from "@dashboard/new-apps/components/ExternalAppContext/ExternalAppContext";
 import { renderHook } from "@testing-library/react-hooks";
 import * as ReactIntl from "react-intl";
 import { IntlShape } from "react-intl";

src/apps/components/AppFrame/appActionsHandler.ts

@@ -1,9 +1,9 @@
+import { usePostToExtension } from "@dashboard/apps/components/AppFrame/usePostToExtension";
+import { useExternalApp } from "@dashboard/apps/components/ExternalAppContext/ExternalAppContext";
+import { AppUrls } from "@dashboard/apps/urls";
 import { getAppMountUri } from "@dashboard/config";
 import useNavigator from "@dashboard/hooks/useNavigator";
 import useNotifier from "@dashboard/hooks/useNotifier";
-import { usePostToExtension } from "@dashboard/new-apps/components/AppFrame/usePostToExtension";
-import { useExternalApp } from "@dashboard/new-apps/components/ExternalAppContext/ExternalAppContext";
-import { AppUrls } from "@dashboard/new-apps/urls";
 import {
   DispatchResponseEvent,
   NotificationAction,

src/apps/components/AppFrame/useAppActions.ts

@@ -1,5 +1,5 @@
-import { AppActionsHandler } from "@dashboard/new-apps/components/AppFrame/appActionsHandler";
-import { usePostToExtension } from "@dashboard/new-apps/components/AppFrame/usePostToExtension";
+import { AppActionsHandler } from "@dashboard/apps/components/AppFrame/appActionsHandler";
+import { usePostToExtension } from "@dashboard/apps/components/AppFrame/usePostToExtension";
 import { Actions, DispatchResponseEvent } from "@saleor/app-sdk/app-bridge";
 import React, { useState } from "react";
 

src/apps/components/AppFrame/useAppDashboardUpdates.ts

@@ -1,6 +1,6 @@
+import { usePostToExtension } from "@dashboard/apps/components/AppFrame/usePostToExtension";
+import { AppUrls } from "@dashboard/apps/urls";
 import useLocale from "@dashboard/hooks/useLocale";
-import { usePostToExtension } from "@dashboard/new-apps/components/AppFrame/usePostToExtension";
-import { AppUrls } from "@dashboard/new-apps/urls";
 import { useTheme } from "@saleor/macaw-ui";
 import { useEffect } from "react";
 

src/apps/components/AppListCard/AppListCard.test.tsx

@@ -1,12 +1,12 @@
-import * as context from "@dashboard/new-apps/context";
+import * as context from "@dashboard/apps/context";
 import {
   comingSoonApp,
   failedAppInProgress,
   pendingAppInProgress,
   releasedApp,
-} from "@dashboard/new-apps/fixtures";
-import { GetV2SaleorAppsResponse } from "@dashboard/new-apps/marketplace.types";
-import { appInstallationStatusMessages } from "@dashboard/new-apps/messages";
+} from "@dashboard/apps/fixtures";
+import { GetV2SaleorAppsResponse } from "@dashboard/apps/marketplace.types";
+import { appInstallationStatusMessages } from "@dashboard/apps/messages";
 import Wrapper from "@test/wrapper";
 import { render, screen, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
@@ -14,7 +14,7 @@ import React from "react";
 
 import AppListCard from "./AppListCard";
 
-jest.mock("@dashboard/new-apps/context", () => ({
+jest.mock("@dashboard/apps/context", () => ({
   useAppListContext: jest.fn(() => ({
     openAppSettings: jest.fn(),
     removeAppInstallation: jest.fn(),

src/apps/components/AppListCard/AppListCard.tsx

@@ -1,7 +1,7 @@
+import { useAppListContext } from "@dashboard/apps/context";
+import { GetV2SaleorAppsResponse } from "@dashboard/apps/marketplace.types";
+import { getAppDetails } from "@dashboard/apps/utils";
 import { AppInstallationFragment } from "@dashboard/graphql";
-import { useAppListContext } from "@dashboard/new-apps/context";
-import { GetV2SaleorAppsResponse } from "@dashboard/new-apps/marketplace.types";
-import { getAppDetails } from "@dashboard/new-apps/utils";
 import { Box } from "@saleor/macaw-ui/next";
 import React from "react";
 import { useIntl } from "react-intl";

src/apps/components/AppListCard/AppListCardActions.tsx

@@ -1,7 +1,7 @@
+import { appInstallationStatusMessages } from "@dashboard/apps/messages";
 import { IS_CLOUD_INSTANCE } from "@dashboard/config";
 import { AppInstallationFragment } from "@dashboard/graphql";
 import { buttonMessages } from "@dashboard/intl";
-import { appInstallationStatusMessages } from "@dashboard/new-apps/messages";
 import { Tooltip } from "@material-ui/core";
 import { Box, Button, Text } from "@saleor/macaw-ui/next";
 import React from "react";

src/apps/components/AppListCard/AppListCardDescription.tsx

@@ -1,4 +1,4 @@
-import { GetV2SaleorAppsResponse } from "@dashboard/new-apps/marketplace.types";
+import { GetV2SaleorAppsResponse } from "@dashboard/apps/marketplace.types";
 import { Box, Text } from "@saleor/macaw-ui/next";
 import React from "react";
 

src/apps/components/AppListCard/AppListCardIntegrations.tsx

@@ -1,4 +1,4 @@
-import { GetV2SaleorAppsResponse } from "@dashboard/new-apps/marketplace.types";
+import { GetV2SaleorAppsResponse } from "@dashboard/apps/marketplace.types";
 import { useTheme } from "@saleor/macaw-ui";
 import { Box, Text } from "@saleor/macaw-ui/next";
 import React from "react";

src/apps/components/AppListCard/AppListCardLinks.tsx

@@ -1,5 +1,5 @@
+import { AppLink } from "@dashboard/apps/types";
 import Link from "@dashboard/components/Link";
-import { AppLink } from "@dashboard/new-apps/types";
 import { Box, Text } from "@saleor/macaw-ui/next";
 import React from "react";
 

src/apps/components/AppListCard/ErrorInstallAction.tsx

@@ -1,6 +1,6 @@
+import { appInstallationStatusMessages } from "@dashboard/apps/messages";
 import { AppInstallationFragment } from "@dashboard/graphql";
 import { buttonMessages } from "@dashboard/intl";
-import { appInstallationStatusMessages } from "@dashboard/new-apps/messages";
 import { Typography } from "@material-ui/core";
 import {
   Button,

src/apps/components/AppListPage/AppListPage.stories.tsx

@@ -1,4 +1,4 @@
-import { installedAppsList } from "@dashboard/new-apps/fixtures";
+import { installedAppsList } from "@dashboard/apps/fixtures";
 import Decorator from "@dashboard/storybook/Decorator";
 import { storiesOf } from "@storybook/react";
 import React from "react";

src/apps/components/AppListPage/AppListPage.tsx

@@ -1,7 +1,7 @@
+import { AppUrls } from "@dashboard/apps/urls";
 import { TopNav } from "@dashboard/components/AppLayout/TopNav";
 import useNavigator from "@dashboard/hooks/useNavigator";
 import { sectionNames } from "@dashboard/intl";
-import { AppUrls } from "@dashboard/new-apps/urls";
 import { ListProps } from "@dashboard/types";
 import { Box, Text } from "@saleor/macaw-ui/next";
 import React, { useCallback } from "react";

src/apps/components/AppListPage/types.ts

@@ -1,8 +1,8 @@
+import { GetV2SaleorAppsResponse } from "@dashboard/apps/marketplace.types";
 import {
   AppInstallationFragment,
   AppListItemFragment,
 } from "@dashboard/graphql";
-import { GetV2SaleorAppsResponse } from "@dashboard/new-apps/marketplace.types";
 
 export interface AppListPageSections {
   appsInstallations?: AppInstallationFragment[];

src/apps/components/AppListPage/utils.test.ts

@@ -1,15 +1,15 @@
-import {
-  AppListItemFragment,
-  AppTypeEnum,
-  PermissionEnum,
-} from "@dashboard/graphql";
 import {
   appsInProgress,
   comingSoonApp,
   installedAppsList,
   releasedApp,
-} from "@dashboard/new-apps/fixtures";
-import { GetV2SaleorAppsResponse } from "@dashboard/new-apps/marketplace.types";
+} from "@dashboard/apps/fixtures";
+import { GetV2SaleorAppsResponse } from "@dashboard/apps/marketplace.types";
+import {
+  AppListItemFragment,
+  AppTypeEnum,
+  PermissionEnum,
+} from "@dashboard/graphql";
 
 import { AppListPageSections } from "./types";
 import {

src/apps/components/AppListPage/utils.ts

@@ -1,9 +1,9 @@
+import { GetV2SaleorAppsResponse } from "@dashboard/apps/marketplace.types";
+import { AppInstallation, InstalledApp } from "@dashboard/apps/types";
 import {
   AppInstallationFragment,
   AppListItemFragment,
 } from "@dashboard/graphql";
-import { GetV2SaleorAppsResponse } from "@dashboard/new-apps/marketplace.types";
-import { AppInstallation, InstalledApp } from "@dashboard/new-apps/types";
 
 import { AppListPageSections } from "./types";
 

src/apps/components/AppManifestTableDisplay/AppManifestTableDisplay.tsx

@@ -1,4 +1,4 @@
-import { appsMessages } from "@dashboard/new-apps/messages";
+import { appsMessages } from "@dashboard/apps/messages";
 import { Typography } from "@material-ui/core";
 import { CopyIcon, Tooltip } from "@saleor/macaw-ui";
 import clsx from "clsx";

src/apps/components/AppPage/AppPageNav.tsx

@@ -1,7 +1,7 @@
+import { AppAvatar } from "@dashboard/apps/components/AppAvatar/AppAvatar";
+import { AppUrls } from "@dashboard/apps/urls";
 import { TopNavLink, TopNavWrapper } from "@dashboard/components/AppLayout";
 import { LinkState } from "@dashboard/components/Link";
-import { AppAvatar } from "@dashboard/new-apps/components/AppAvatar/AppAvatar";
-import { AppUrls } from "@dashboard/new-apps/urls";
 import { Box, Button, Text } from "@saleor/macaw-ui/next";
 import React from "react";
 import { FormattedMessage } from "react-intl";

src/apps/components/ExternalAppContext/ExternalAppContext.tsx

@@ -1,6 +1,6 @@
+import { AppUrls } from "@dashboard/apps/urls";
 import { AppExtensionTargetEnum } from "@dashboard/graphql";
 import useNavigator from "@dashboard/hooks/useNavigator";
-import { AppUrls } from "@dashboard/new-apps/urls";
 import React from "react";
 
 import { AppDialog } from "../AppDialog";

src/apps/components/ExternalAppContext/context.ts

@@ -1,5 +1,5 @@
+import { AppDetailsUrlMountQueryParams } from "@dashboard/apps/urls";
 import { AppExtensionTargetEnum } from "@dashboard/graphql";
-import { AppDetailsUrlMountQueryParams } from "@dashboard/new-apps/urls";
 import React from "react";
 
 export interface AppData {

src/apps/components/InstallWithManifestFormButton/InstallWithManifestFormButton.tsx

@@ -1,5 +1,5 @@
+import { appsMessages } from "@dashboard/apps/messages";
 import { buttonMessages } from "@dashboard/intl";
-import { appsMessages } from "@dashboard/new-apps/messages";
 import { TextField } from "@material-ui/core";
 import { Box, Button } from "@saleor/macaw-ui/next";
 import React, { useState } from "react";

src/apps/components/InstalledAppList/InstalledAppList.tsx

@@ -1,4 +1,4 @@
-import { AppInstallation, InstalledApp } from "@dashboard/new-apps/types";
+import { AppInstallation, InstalledApp } from "@dashboard/apps/types";
 import { ListProps } from "@dashboard/types";
 import { Skeleton } from "@material-ui/lab";
 import { List } from "@saleor/macaw-ui/next";