diff --git a/src/new-apps/components/AllAppList/AllAppList.tsx b/src/apps/components/AllAppList/AllAppList.tsx similarity index 93% rename from src/new-apps/components/AllAppList/AllAppList.tsx rename to src/apps/components/AllAppList/AllAppList.tsx index 02af564d7..5efed94b9 100644 --- a/src/new-apps/components/AllAppList/AllAppList.tsx +++ b/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"; diff --git a/src/new-apps/components/AllAppList/index.ts b/src/apps/components/AllAppList/index.ts similarity index 100% rename from src/new-apps/components/AllAppList/index.ts rename to src/apps/components/AllAppList/index.ts diff --git a/src/new-apps/components/AppActivateDialog/AppActivateDialog.test.tsx b/src/apps/components/AppActivateDialog/AppActivateDialog.test.tsx similarity index 100% rename from src/new-apps/components/AppActivateDialog/AppActivateDialog.test.tsx rename to src/apps/components/AppActivateDialog/AppActivateDialog.test.tsx diff --git a/src/new-apps/components/AppActivateDialog/AppActivateDialog.tsx b/src/apps/components/AppActivateDialog/AppActivateDialog.tsx similarity index 100% rename from src/new-apps/components/AppActivateDialog/AppActivateDialog.tsx rename to src/apps/components/AppActivateDialog/AppActivateDialog.tsx diff --git a/src/new-apps/components/AppActivateDialog/index.ts b/src/apps/components/AppActivateDialog/index.ts similarity index 100% rename from src/new-apps/components/AppActivateDialog/index.ts rename to src/apps/components/AppActivateDialog/index.ts diff --git a/src/new-apps/components/AppActivateDialog/messages.ts b/src/apps/components/AppActivateDialog/messages.ts similarity index 100% rename from src/new-apps/components/AppActivateDialog/messages.ts rename to src/apps/components/AppActivateDialog/messages.ts diff --git a/src/new-apps/components/AppAvatar/AppAvatar.tsx b/src/apps/components/AppAvatar/AppAvatar.tsx similarity index 94% rename from src/new-apps/components/AppAvatar/AppAvatar.tsx rename to src/apps/components/AppAvatar/AppAvatar.tsx index 7f442b05b..2e81b4e17 100644 --- a/src/new-apps/components/AppAvatar/AppAvatar.tsx +++ b/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"; diff --git a/src/new-apps/components/AppDeactivateDialog/AppDeactivateDialog.stories.tsx b/src/apps/components/AppDeactivateDialog/AppDeactivateDialog.stories.tsx similarity index 100% rename from src/new-apps/components/AppDeactivateDialog/AppDeactivateDialog.stories.tsx rename to src/apps/components/AppDeactivateDialog/AppDeactivateDialog.stories.tsx diff --git a/src/new-apps/components/AppDeactivateDialog/AppDeactivateDialog.test.tsx b/src/apps/components/AppDeactivateDialog/AppDeactivateDialog.test.tsx similarity index 100% rename from src/new-apps/components/AppDeactivateDialog/AppDeactivateDialog.test.tsx rename to src/apps/components/AppDeactivateDialog/AppDeactivateDialog.test.tsx diff --git a/src/new-apps/components/AppDeactivateDialog/AppDeactivateDialog.tsx b/src/apps/components/AppDeactivateDialog/AppDeactivateDialog.tsx similarity index 100% rename from src/new-apps/components/AppDeactivateDialog/AppDeactivateDialog.tsx rename to src/apps/components/AppDeactivateDialog/AppDeactivateDialog.tsx diff --git a/src/new-apps/components/AppDeactivateDialog/index.ts b/src/apps/components/AppDeactivateDialog/index.ts similarity index 100% rename from src/new-apps/components/AppDeactivateDialog/index.ts rename to src/apps/components/AppDeactivateDialog/index.ts diff --git a/src/new-apps/components/AppDeactivateDialog/messages.ts b/src/apps/components/AppDeactivateDialog/messages.ts similarity index 100% rename from src/new-apps/components/AppDeactivateDialog/messages.ts rename to src/apps/components/AppDeactivateDialog/messages.ts diff --git a/src/new-apps/components/AppDeleteDialog/AppDeleteDialog.stories.tsx b/src/apps/components/AppDeleteDialog/AppDeleteDialog.stories.tsx similarity index 100% rename from src/new-apps/components/AppDeleteDialog/AppDeleteDialog.stories.tsx rename to src/apps/components/AppDeleteDialog/AppDeleteDialog.stories.tsx diff --git a/src/new-apps/components/AppDeleteDialog/AppDeleteDialog.test.tsx b/src/apps/components/AppDeleteDialog/AppDeleteDialog.test.tsx similarity index 100% rename from src/new-apps/components/AppDeleteDialog/AppDeleteDialog.test.tsx rename to src/apps/components/AppDeleteDialog/AppDeleteDialog.test.tsx diff --git a/src/new-apps/components/AppDeleteDialog/AppDeleteDialog.tsx b/src/apps/components/AppDeleteDialog/AppDeleteDialog.tsx similarity index 100% rename from src/new-apps/components/AppDeleteDialog/AppDeleteDialog.tsx rename to src/apps/components/AppDeleteDialog/AppDeleteDialog.tsx diff --git a/src/new-apps/components/AppDeleteDialog/index.ts b/src/apps/components/AppDeleteDialog/index.ts similarity index 100% rename from src/new-apps/components/AppDeleteDialog/index.ts rename to src/apps/components/AppDeleteDialog/index.ts diff --git a/src/new-apps/components/AppDeleteDialog/messages.ts b/src/apps/components/AppDeleteDialog/messages.ts similarity index 100% rename from src/new-apps/components/AppDeleteDialog/messages.ts rename to src/apps/components/AppDeleteDialog/messages.ts diff --git a/src/new-apps/components/AppDetailsPage/AboutCard.tsx b/src/apps/components/AppDetailsPage/AboutCard.tsx similarity index 100% rename from src/new-apps/components/AppDetailsPage/AboutCard.tsx rename to src/apps/components/AppDetailsPage/AboutCard.tsx diff --git a/src/new-apps/components/AppDetailsPage/AppDetailsPage.stories.tsx b/src/apps/components/AppDetailsPage/AppDetailsPage.stories.tsx similarity index 100% rename from src/new-apps/components/AppDetailsPage/AppDetailsPage.stories.tsx rename to src/apps/components/AppDetailsPage/AppDetailsPage.stories.tsx diff --git a/src/new-apps/components/AppDetailsPage/AppDetailsPage.test.tsx b/src/apps/components/AppDetailsPage/AppDetailsPage.test.tsx similarity index 100% rename from src/new-apps/components/AppDetailsPage/AppDetailsPage.test.tsx rename to src/apps/components/AppDetailsPage/AppDetailsPage.test.tsx diff --git a/src/new-apps/components/AppDetailsPage/AppDetailsPage.tsx b/src/apps/components/AppDetailsPage/AppDetailsPage.tsx similarity index 100% rename from src/new-apps/components/AppDetailsPage/AppDetailsPage.tsx rename to src/apps/components/AppDetailsPage/AppDetailsPage.tsx diff --git a/src/new-apps/components/AppDetailsPage/DataPrivacyCard.tsx b/src/apps/components/AppDetailsPage/DataPrivacyCard.tsx similarity index 100% rename from src/new-apps/components/AppDetailsPage/DataPrivacyCard.tsx rename to src/apps/components/AppDetailsPage/DataPrivacyCard.tsx diff --git a/src/new-apps/components/AppDetailsPage/Header.test.tsx b/src/apps/components/AppDetailsPage/Header.test.tsx similarity index 98% rename from src/new-apps/components/AppDetailsPage/Header.test.tsx rename to src/apps/components/AppDetailsPage/Header.test.tsx index 338d7d797..efef23a49 100644 --- a/src/new-apps/components/AppDetailsPage/Header.test.tsx +++ b/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"; diff --git a/src/new-apps/components/AppDetailsPage/Header.tsx b/src/apps/components/AppDetailsPage/Header.tsx similarity index 95% rename from src/new-apps/components/AppDetailsPage/Header.tsx rename to src/apps/components/AppDetailsPage/Header.tsx index d4ee25a6c..5e5655b70 100644 --- a/src/new-apps/components/AppDetailsPage/Header.tsx +++ b/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"; diff --git a/src/new-apps/components/AppDetailsPage/HeaderOptions.tsx b/src/apps/components/AppDetailsPage/HeaderOptions.tsx similarity index 100% rename from src/new-apps/components/AppDetailsPage/HeaderOptions.tsx rename to src/apps/components/AppDetailsPage/HeaderOptions.tsx diff --git a/src/new-apps/components/AppDetailsPage/PermissionsCard.tsx b/src/apps/components/AppDetailsPage/PermissionsCard.tsx similarity index 100% rename from src/new-apps/components/AppDetailsPage/PermissionsCard.tsx rename to src/apps/components/AppDetailsPage/PermissionsCard.tsx diff --git a/src/new-apps/components/AppDetailsPage/index.ts b/src/apps/components/AppDetailsPage/index.ts similarity index 100% rename from src/new-apps/components/AppDetailsPage/index.ts rename to src/apps/components/AppDetailsPage/index.ts diff --git a/src/new-apps/components/AppDetailsPage/messages.ts b/src/apps/components/AppDetailsPage/messages.ts similarity index 100% rename from src/new-apps/components/AppDetailsPage/messages.ts rename to src/apps/components/AppDetailsPage/messages.ts diff --git a/src/new-apps/components/AppDetailsPage/styles.ts b/src/apps/components/AppDetailsPage/styles.ts similarity index 100% rename from src/new-apps/components/AppDetailsPage/styles.ts rename to src/apps/components/AppDetailsPage/styles.ts diff --git a/src/new-apps/components/AppDialog/AppDialog.tsx b/src/apps/components/AppDialog/AppDialog.tsx similarity index 100% rename from src/new-apps/components/AppDialog/AppDialog.tsx rename to src/apps/components/AppDialog/AppDialog.tsx diff --git a/src/new-apps/components/AppDialog/index.ts b/src/apps/components/AppDialog/index.ts similarity index 100% rename from src/new-apps/components/AppDialog/index.ts rename to src/apps/components/AppDialog/index.ts diff --git a/src/new-apps/components/AppDialog/styles.ts b/src/apps/components/AppDialog/styles.ts similarity index 100% rename from src/new-apps/components/AppDialog/styles.ts rename to src/apps/components/AppDialog/styles.ts diff --git a/src/new-apps/components/AppFrame/AppFrame.tsx b/src/apps/components/AppFrame/AppFrame.tsx similarity index 94% rename from src/new-apps/components/AppFrame/AppFrame.tsx rename to src/apps/components/AppFrame/AppFrame.tsx index b917b09e0..7f1cccd59 100644 --- a/src/new-apps/components/AppFrame/AppFrame.tsx +++ b/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"; diff --git a/src/new-apps/components/AppFrame/appActionsHandler.test.ts b/src/apps/components/AppFrame/appActionsHandler.test.ts similarity index 97% rename from src/new-apps/components/AppFrame/appActionsHandler.test.ts rename to src/apps/components/AppFrame/appActionsHandler.test.ts index e0d29cff3..83d6e8b2b 100644 --- a/src/new-apps/components/AppFrame/appActionsHandler.test.ts +++ b/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"; diff --git a/src/new-apps/components/AppFrame/appActionsHandler.ts b/src/apps/components/AppFrame/appActionsHandler.ts similarity index 95% rename from src/new-apps/components/AppFrame/appActionsHandler.ts rename to src/apps/components/AppFrame/appActionsHandler.ts index ece0d2d8a..c8677a139 100644 --- a/src/new-apps/components/AppFrame/appActionsHandler.ts +++ b/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, diff --git a/src/new-apps/components/AppFrame/index.ts b/src/apps/components/AppFrame/index.ts similarity index 100% rename from src/new-apps/components/AppFrame/index.ts rename to src/apps/components/AppFrame/index.ts diff --git a/src/new-apps/components/AppFrame/styles.ts b/src/apps/components/AppFrame/styles.ts similarity index 100% rename from src/new-apps/components/AppFrame/styles.ts rename to src/apps/components/AppFrame/styles.ts diff --git a/src/new-apps/components/AppFrame/useAppActions.ts b/src/apps/components/AppFrame/useAppActions.ts similarity index 91% rename from src/new-apps/components/AppFrame/useAppActions.ts rename to src/apps/components/AppFrame/useAppActions.ts index 38747c096..bcecefb5f 100644 --- a/src/new-apps/components/AppFrame/useAppActions.ts +++ b/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"; diff --git a/src/new-apps/components/AppFrame/useAppDashboardUpdates.ts b/src/apps/components/AppFrame/useAppDashboardUpdates.ts similarity index 88% rename from src/new-apps/components/AppFrame/useAppDashboardUpdates.ts rename to src/apps/components/AppFrame/useAppDashboardUpdates.ts index d2a4ecfa9..6e49c75bb 100644 --- a/src/new-apps/components/AppFrame/useAppDashboardUpdates.ts +++ b/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"; diff --git a/src/new-apps/components/AppFrame/usePostToExtension.ts b/src/apps/components/AppFrame/usePostToExtension.ts similarity index 100% rename from src/new-apps/components/AppFrame/usePostToExtension.ts rename to src/apps/components/AppFrame/usePostToExtension.ts diff --git a/src/new-apps/components/AppFrame/useTokenRefresh.ts b/src/apps/components/AppFrame/useTokenRefresh.ts similarity index 100% rename from src/new-apps/components/AppFrame/useTokenRefresh.ts rename to src/apps/components/AppFrame/useTokenRefresh.ts diff --git a/src/new-apps/components/AppInProgressDeleteDialog/AppInProgressDeleteDialog.stories.tsx b/src/apps/components/AppInProgressDeleteDialog/AppInProgressDeleteDialog.stories.tsx similarity index 100% rename from src/new-apps/components/AppInProgressDeleteDialog/AppInProgressDeleteDialog.stories.tsx rename to src/apps/components/AppInProgressDeleteDialog/AppInProgressDeleteDialog.stories.tsx diff --git a/src/new-apps/components/AppInProgressDeleteDialog/AppInProgressDeleteDialog.test.tsx b/src/apps/components/AppInProgressDeleteDialog/AppInProgressDeleteDialog.test.tsx similarity index 100% rename from src/new-apps/components/AppInProgressDeleteDialog/AppInProgressDeleteDialog.test.tsx rename to src/apps/components/AppInProgressDeleteDialog/AppInProgressDeleteDialog.test.tsx diff --git a/src/new-apps/components/AppInProgressDeleteDialog/AppInProgressDeleteDialog.tsx b/src/apps/components/AppInProgressDeleteDialog/AppInProgressDeleteDialog.tsx similarity index 100% rename from src/new-apps/components/AppInProgressDeleteDialog/AppInProgressDeleteDialog.tsx rename to src/apps/components/AppInProgressDeleteDialog/AppInProgressDeleteDialog.tsx diff --git a/src/new-apps/components/AppInProgressDeleteDialog/index.ts b/src/apps/components/AppInProgressDeleteDialog/index.ts similarity index 100% rename from src/new-apps/components/AppInProgressDeleteDialog/index.ts rename to src/apps/components/AppInProgressDeleteDialog/index.ts diff --git a/src/new-apps/components/AppInProgressDeleteDialog/messages.ts b/src/apps/components/AppInProgressDeleteDialog/messages.ts similarity index 100% rename from src/new-apps/components/AppInProgressDeleteDialog/messages.ts rename to src/apps/components/AppInProgressDeleteDialog/messages.ts diff --git a/src/new-apps/components/AppInstallErrorPage/AppInstallErrorPage.tsx b/src/apps/components/AppInstallErrorPage/AppInstallErrorPage.tsx similarity index 100% rename from src/new-apps/components/AppInstallErrorPage/AppInstallErrorPage.tsx rename to src/apps/components/AppInstallErrorPage/AppInstallErrorPage.tsx diff --git a/src/new-apps/components/AppInstallErrorPage/index.ts b/src/apps/components/AppInstallErrorPage/index.ts similarity index 100% rename from src/new-apps/components/AppInstallErrorPage/index.ts rename to src/apps/components/AppInstallErrorPage/index.ts diff --git a/src/new-apps/components/AppInstallErrorPage/messages.ts b/src/apps/components/AppInstallErrorPage/messages.ts similarity index 100% rename from src/new-apps/components/AppInstallErrorPage/messages.ts rename to src/apps/components/AppInstallErrorPage/messages.ts diff --git a/src/new-apps/components/AppInstallErrorPage/styles.ts b/src/apps/components/AppInstallErrorPage/styles.ts similarity index 100% rename from src/new-apps/components/AppInstallErrorPage/styles.ts rename to src/apps/components/AppInstallErrorPage/styles.ts diff --git a/src/new-apps/components/AppInstallPage/AppInstallPage.stories.tsx b/src/apps/components/AppInstallPage/AppInstallPage.stories.tsx similarity index 100% rename from src/new-apps/components/AppInstallPage/AppInstallPage.stories.tsx rename to src/apps/components/AppInstallPage/AppInstallPage.stories.tsx diff --git a/src/new-apps/components/AppInstallPage/AppInstallPage.tsx b/src/apps/components/AppInstallPage/AppInstallPage.tsx similarity index 100% rename from src/new-apps/components/AppInstallPage/AppInstallPage.tsx rename to src/apps/components/AppInstallPage/AppInstallPage.tsx diff --git a/src/new-apps/components/AppInstallPage/index.ts b/src/apps/components/AppInstallPage/index.ts similarity index 100% rename from src/new-apps/components/AppInstallPage/index.ts rename to src/apps/components/AppInstallPage/index.ts diff --git a/src/new-apps/components/AppInstallPage/messages.ts b/src/apps/components/AppInstallPage/messages.ts similarity index 100% rename from src/new-apps/components/AppInstallPage/messages.ts rename to src/apps/components/AppInstallPage/messages.ts diff --git a/src/new-apps/components/AppInstallPage/styles.ts b/src/apps/components/AppInstallPage/styles.ts similarity index 100% rename from src/new-apps/components/AppInstallPage/styles.ts rename to src/apps/components/AppInstallPage/styles.ts diff --git a/src/new-apps/components/AppListCard/AppListCard.test.tsx b/src/apps/components/AppListCard/AppListCard.test.tsx similarity index 95% rename from src/new-apps/components/AppListCard/AppListCard.test.tsx rename to src/apps/components/AppListCard/AppListCard.test.tsx index b0e2cde95..dd389dc92 100644 --- a/src/new-apps/components/AppListCard/AppListCard.test.tsx +++ b/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(), diff --git a/src/new-apps/components/AppListCard/AppListCard.tsx b/src/apps/components/AppListCard/AppListCard.tsx similarity index 90% rename from src/new-apps/components/AppListCard/AppListCard.tsx rename to src/apps/components/AppListCard/AppListCard.tsx index 35a925e81..951c01a24 100644 --- a/src/new-apps/components/AppListCard/AppListCard.tsx +++ b/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"; diff --git a/src/new-apps/components/AppListCard/AppListCardActions.tsx b/src/apps/components/AppListCard/AppListCardActions.tsx similarity index 97% rename from src/new-apps/components/AppListCard/AppListCardActions.tsx rename to src/apps/components/AppListCard/AppListCardActions.tsx index 15e2f922f..f935f3e80 100644 --- a/src/new-apps/components/AppListCard/AppListCardActions.tsx +++ b/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"; diff --git a/src/new-apps/components/AppListCard/AppListCardDescription.tsx b/src/apps/components/AppListCard/AppListCardDescription.tsx similarity index 93% rename from src/new-apps/components/AppListCard/AppListCardDescription.tsx rename to src/apps/components/AppListCard/AppListCardDescription.tsx index c39bfe951..184ce7c4d 100644 --- a/src/new-apps/components/AppListCard/AppListCardDescription.tsx +++ b/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"; diff --git a/src/new-apps/components/AppListCard/AppListCardIntegrations.tsx b/src/apps/components/AppListCard/AppListCardIntegrations.tsx similarity index 94% rename from src/new-apps/components/AppListCard/AppListCardIntegrations.tsx rename to src/apps/components/AppListCard/AppListCardIntegrations.tsx index f14078d5f..aa92a5d18 100644 --- a/src/new-apps/components/AppListCard/AppListCardIntegrations.tsx +++ b/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"; diff --git a/src/new-apps/components/AppListCard/AppListCardLinks.tsx b/src/apps/components/AppListCard/AppListCardLinks.tsx similarity index 93% rename from src/new-apps/components/AppListCard/AppListCardLinks.tsx rename to src/apps/components/AppListCard/AppListCardLinks.tsx index 2165ec22f..e6651484a 100644 --- a/src/new-apps/components/AppListCard/AppListCardLinks.tsx +++ b/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"; diff --git a/src/new-apps/components/AppListCard/AppLogo.tsx b/src/apps/components/AppListCard/AppLogo.tsx similarity index 100% rename from src/new-apps/components/AppListCard/AppLogo.tsx rename to src/apps/components/AppListCard/AppLogo.tsx diff --git a/src/new-apps/components/AppListCard/ErrorInstallAction.tsx b/src/apps/components/AppListCard/ErrorInstallAction.tsx similarity index 95% rename from src/new-apps/components/AppListCard/ErrorInstallAction.tsx rename to src/apps/components/AppListCard/ErrorInstallAction.tsx index 9f5aa6d04..7cd89d90b 100644 --- a/src/new-apps/components/AppListCard/ErrorInstallAction.tsx +++ b/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, diff --git a/src/new-apps/components/AppListCard/index.ts b/src/apps/components/AppListCard/index.ts similarity index 100% rename from src/new-apps/components/AppListCard/index.ts rename to src/apps/components/AppListCard/index.ts diff --git a/src/new-apps/components/AppListCard/messages.ts b/src/apps/components/AppListCard/messages.ts similarity index 100% rename from src/new-apps/components/AppListCard/messages.ts rename to src/apps/components/AppListCard/messages.ts diff --git a/src/new-apps/components/AppListCard/styles.ts b/src/apps/components/AppListCard/styles.ts similarity index 100% rename from src/new-apps/components/AppListCard/styles.ts rename to src/apps/components/AppListCard/styles.ts diff --git a/src/new-apps/components/AppListPage/AppListPage.stories.tsx b/src/apps/components/AppListPage/AppListPage.stories.tsx similarity index 89% rename from src/new-apps/components/AppListPage/AppListPage.stories.tsx rename to src/apps/components/AppListPage/AppListPage.stories.tsx index f3fa9dec9..469e053f1 100644 --- a/src/new-apps/components/AppListPage/AppListPage.stories.tsx +++ b/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"; diff --git a/src/new-apps/components/AppListPage/AppListPage.tsx b/src/apps/components/AppListPage/AppListPage.tsx similarity index 98% rename from src/new-apps/components/AppListPage/AppListPage.tsx rename to src/apps/components/AppListPage/AppListPage.tsx index 04f0f20ca..32e785189 100644 --- a/src/new-apps/components/AppListPage/AppListPage.tsx +++ b/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"; diff --git a/src/new-apps/components/AppListPage/index.ts b/src/apps/components/AppListPage/index.ts similarity index 100% rename from src/new-apps/components/AppListPage/index.ts rename to src/apps/components/AppListPage/index.ts diff --git a/src/new-apps/components/AppListPage/messages.ts b/src/apps/components/AppListPage/messages.ts similarity index 100% rename from src/new-apps/components/AppListPage/messages.ts rename to src/apps/components/AppListPage/messages.ts diff --git a/src/new-apps/components/AppListPage/styles.ts b/src/apps/components/AppListPage/styles.ts similarity index 100% rename from src/new-apps/components/AppListPage/styles.ts rename to src/apps/components/AppListPage/styles.ts diff --git a/src/new-apps/components/AppListPage/types.ts b/src/apps/components/AppListPage/types.ts similarity index 82% rename from src/new-apps/components/AppListPage/types.ts rename to src/apps/components/AppListPage/types.ts index 0cc5079c6..e2ab44ee2 100644 --- a/src/new-apps/components/AppListPage/types.ts +++ b/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[]; diff --git a/src/new-apps/components/AppListPage/utils.test.ts b/src/apps/components/AppListPage/utils.test.ts similarity index 98% rename from src/new-apps/components/AppListPage/utils.test.ts rename to src/apps/components/AppListPage/utils.test.ts index ef7e50474..6cc67656d 100644 --- a/src/new-apps/components/AppListPage/utils.test.ts +++ b/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 { diff --git a/src/new-apps/components/AppListPage/utils.ts b/src/apps/components/AppListPage/utils.ts similarity index 94% rename from src/new-apps/components/AppListPage/utils.ts rename to src/apps/components/AppListPage/utils.ts index 9e7c4c86f..befdf80f3 100644 --- a/src/new-apps/components/AppListPage/utils.ts +++ b/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"; diff --git a/src/new-apps/components/AppManifestTableDisplay/AppManifestTableDisplay.tsx b/src/apps/components/AppManifestTableDisplay/AppManifestTableDisplay.tsx similarity index 96% rename from src/new-apps/components/AppManifestTableDisplay/AppManifestTableDisplay.tsx rename to src/apps/components/AppManifestTableDisplay/AppManifestTableDisplay.tsx index fb693c1c7..0199e6001 100644 --- a/src/new-apps/components/AppManifestTableDisplay/AppManifestTableDisplay.tsx +++ b/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"; diff --git a/src/new-apps/components/AppManifestTableDisplay/index.ts b/src/apps/components/AppManifestTableDisplay/index.ts similarity index 100% rename from src/new-apps/components/AppManifestTableDisplay/index.ts rename to src/apps/components/AppManifestTableDisplay/index.ts diff --git a/src/new-apps/components/AppManifestTableDisplay/styles.ts b/src/apps/components/AppManifestTableDisplay/styles.ts similarity index 100% rename from src/new-apps/components/AppManifestTableDisplay/styles.ts rename to src/apps/components/AppManifestTableDisplay/styles.ts diff --git a/src/new-apps/components/AppPage/AppPage.stories.tsx b/src/apps/components/AppPage/AppPage.stories.tsx similarity index 100% rename from src/new-apps/components/AppPage/AppPage.stories.tsx rename to src/apps/components/AppPage/AppPage.stories.tsx diff --git a/src/new-apps/components/AppPage/AppPage.tsx b/src/apps/components/AppPage/AppPage.tsx similarity index 100% rename from src/new-apps/components/AppPage/AppPage.tsx rename to src/apps/components/AppPage/AppPage.tsx diff --git a/src/new-apps/components/AppPage/AppPageNav.tsx b/src/apps/components/AppPage/AppPageNav.tsx similarity index 93% rename from src/new-apps/components/AppPage/AppPageNav.tsx rename to src/apps/components/AppPage/AppPageNav.tsx index 2e36ec903..8aa68b7f2 100644 --- a/src/new-apps/components/AppPage/AppPageNav.tsx +++ b/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"; diff --git a/src/new-apps/components/AppPage/index.ts b/src/apps/components/AppPage/index.ts similarity index 100% rename from src/new-apps/components/AppPage/index.ts rename to src/apps/components/AppPage/index.ts diff --git a/src/new-apps/components/AppPermissions/AppPermissions.tsx b/src/apps/components/AppPermissions/AppPermissions.tsx similarity index 100% rename from src/new-apps/components/AppPermissions/AppPermissions.tsx rename to src/apps/components/AppPermissions/AppPermissions.tsx diff --git a/src/new-apps/components/AppPermissions/index.ts b/src/apps/components/AppPermissions/index.ts similarity index 100% rename from src/new-apps/components/AppPermissions/index.ts rename to src/apps/components/AppPermissions/index.ts diff --git a/src/new-apps/components/AppPermissions/messages.ts b/src/apps/components/AppPermissions/messages.ts similarity index 100% rename from src/new-apps/components/AppPermissions/messages.ts rename to src/apps/components/AppPermissions/messages.ts diff --git a/src/new-apps/components/AppPermissions/styles.ts b/src/apps/components/AppPermissions/styles.ts similarity index 100% rename from src/new-apps/components/AppPermissions/styles.ts rename to src/apps/components/AppPermissions/styles.ts diff --git a/src/new-apps/components/DeactivatedText/DeactivatedText.tsx b/src/apps/components/DeactivatedText/DeactivatedText.tsx similarity index 100% rename from src/new-apps/components/DeactivatedText/DeactivatedText.tsx rename to src/apps/components/DeactivatedText/DeactivatedText.tsx diff --git a/src/new-apps/components/DeactivatedText/index.ts b/src/apps/components/DeactivatedText/index.ts similarity index 100% rename from src/new-apps/components/DeactivatedText/index.ts rename to src/apps/components/DeactivatedText/index.ts diff --git a/src/new-apps/components/DeactivatedText/styles.ts b/src/apps/components/DeactivatedText/styles.ts similarity index 100% rename from src/new-apps/components/DeactivatedText/styles.ts rename to src/apps/components/DeactivatedText/styles.ts diff --git a/src/new-apps/components/ExternalAppContext/ExternalAppContext.tsx b/src/apps/components/ExternalAppContext/ExternalAppContext.tsx similarity index 96% rename from src/new-apps/components/ExternalAppContext/ExternalAppContext.tsx rename to src/apps/components/ExternalAppContext/ExternalAppContext.tsx index 5fce570f1..12ea0a1b7 100644 --- a/src/new-apps/components/ExternalAppContext/ExternalAppContext.tsx +++ b/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"; diff --git a/src/new-apps/components/ExternalAppContext/context.ts b/src/apps/components/ExternalAppContext/context.ts similarity index 88% rename from src/new-apps/components/ExternalAppContext/context.ts rename to src/apps/components/ExternalAppContext/context.ts index 028644c92..f7e8c8988 100644 --- a/src/new-apps/components/ExternalAppContext/context.ts +++ b/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 { diff --git a/src/new-apps/components/ExternalAppContext/index.ts b/src/apps/components/ExternalAppContext/index.ts similarity index 100% rename from src/new-apps/components/ExternalAppContext/index.ts rename to src/apps/components/ExternalAppContext/index.ts diff --git a/src/new-apps/components/InstallWithManifestFormButton/InstallWithManifestFormButton.test.tsx b/src/apps/components/InstallWithManifestFormButton/InstallWithManifestFormButton.test.tsx similarity index 100% rename from src/new-apps/components/InstallWithManifestFormButton/InstallWithManifestFormButton.test.tsx rename to src/apps/components/InstallWithManifestFormButton/InstallWithManifestFormButton.test.tsx diff --git a/src/new-apps/components/InstallWithManifestFormButton/InstallWithManifestFormButton.tsx b/src/apps/components/InstallWithManifestFormButton/InstallWithManifestFormButton.tsx similarity index 97% rename from src/new-apps/components/InstallWithManifestFormButton/InstallWithManifestFormButton.tsx rename to src/apps/components/InstallWithManifestFormButton/InstallWithManifestFormButton.tsx index bba82deb3..c64486598 100644 --- a/src/new-apps/components/InstallWithManifestFormButton/InstallWithManifestFormButton.tsx +++ b/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"; diff --git a/src/new-apps/components/InstallWithManifestFormButton/index.ts b/src/apps/components/InstallWithManifestFormButton/index.ts similarity index 100% rename from src/new-apps/components/InstallWithManifestFormButton/index.ts rename to src/apps/components/InstallWithManifestFormButton/index.ts diff --git a/src/new-apps/components/InstallWithManifestFormButton/messages.ts b/src/apps/components/InstallWithManifestFormButton/messages.ts similarity index 100% rename from src/new-apps/components/InstallWithManifestFormButton/messages.ts rename to src/apps/components/InstallWithManifestFormButton/messages.ts diff --git a/src/new-apps/components/InstallWithManifestFormButton/styles.ts b/src/apps/components/InstallWithManifestFormButton/styles.ts similarity index 100% rename from src/new-apps/components/InstallWithManifestFormButton/styles.ts rename to src/apps/components/InstallWithManifestFormButton/styles.ts diff --git a/src/new-apps/components/InstalledAppList/InstalledAppList.tsx b/src/apps/components/InstalledAppList/InstalledAppList.tsx similarity index 93% rename from src/new-apps/components/InstalledAppList/InstalledAppList.tsx rename to src/apps/components/InstalledAppList/InstalledAppList.tsx index 217855cfa..2fc43b714 100644 --- a/src/new-apps/components/InstalledAppList/InstalledAppList.tsx +++ b/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"; diff --git a/src/new-apps/components/InstalledAppList/index.ts b/src/apps/components/InstalledAppList/index.ts similarity index 100% rename from src/new-apps/components/InstalledAppList/index.ts rename to src/apps/components/InstalledAppList/index.ts diff --git a/src/new-apps/components/InstalledAppList/messages.ts b/src/apps/components/InstalledAppList/messages.ts similarity index 100% rename from src/new-apps/components/InstalledAppList/messages.ts rename to src/apps/components/InstalledAppList/messages.ts diff --git a/src/new-apps/components/InstalledAppListRow/AppManifestUrl.tsx b/src/apps/components/InstalledAppListRow/AppManifestUrl.tsx similarity index 100% rename from src/new-apps/components/InstalledAppListRow/AppManifestUrl.tsx rename to src/apps/components/InstalledAppListRow/AppManifestUrl.tsx diff --git a/src/new-apps/components/InstalledAppListRow/InstalledAppListRow.test.tsx b/src/apps/components/InstalledAppListRow/InstalledAppListRow.test.tsx similarity index 95% rename from src/new-apps/components/InstalledAppListRow/InstalledAppListRow.test.tsx rename to src/apps/components/InstalledAppListRow/InstalledAppListRow.test.tsx index 9dd0ff21f..bb379e626 100644 --- a/src/new-apps/components/InstalledAppListRow/InstalledAppListRow.test.tsx +++ b/src/apps/components/InstalledAppListRow/InstalledAppListRow.test.tsx @@ -1,10 +1,7 @@ +import { AppListContext, AppListContextValues } from "@dashboard/apps/context"; +import { activeApp } from "@dashboard/apps/fixtures"; +import { InstalledApp } from "@dashboard/apps/types"; import { getAppsConfig } from "@dashboard/config"; -import { - AppListContext, - AppListContextValues, -} from "@dashboard/new-apps/context"; -import { activeApp } from "@dashboard/new-apps/fixtures"; -import { InstalledApp } from "@dashboard/new-apps/types"; import Wrapper from "@test/wrapper"; import { render, screen } from "@testing-library/react"; import userEvent from "@testing-library/user-event"; diff --git a/src/new-apps/components/InstalledAppListRow/InstalledAppListRow.tsx b/src/apps/components/InstalledAppListRow/InstalledAppListRow.tsx similarity index 92% rename from src/new-apps/components/InstalledAppListRow/InstalledAppListRow.tsx rename to src/apps/components/InstalledAppListRow/InstalledAppListRow.tsx index 49bce8ea5..2f1d9d606 100644 --- a/src/new-apps/components/InstalledAppListRow/InstalledAppListRow.tsx +++ b/src/apps/components/InstalledAppListRow/InstalledAppListRow.tsx @@ -1,10 +1,10 @@ +import { useAppListContext } from "@dashboard/apps/context"; +import { appsMessages } from "@dashboard/apps/messages"; +import { InstalledApp } from "@dashboard/apps/types"; +import { AppUrls } from "@dashboard/apps/urls"; +import { isAppInTunnel } from "@dashboard/apps/utils"; import Link from "@dashboard/components/Link"; import { TableButtonWrapper } from "@dashboard/components/TableButtonWrapper/TableButtonWrapper"; -import { useAppListContext } from "@dashboard/new-apps/context"; -import { appsMessages } from "@dashboard/new-apps/messages"; -import { InstalledApp } from "@dashboard/new-apps/types"; -import { AppUrls } from "@dashboard/new-apps/urls"; -import { isAppInTunnel } from "@dashboard/new-apps/utils"; import { Box, Button, diff --git a/src/new-apps/components/InstalledAppListRow/index.ts b/src/apps/components/InstalledAppListRow/index.ts similarity index 100% rename from src/new-apps/components/InstalledAppListRow/index.ts rename to src/apps/components/InstalledAppListRow/index.ts diff --git a/src/new-apps/components/InstalledAppListRow/messages.ts b/src/apps/components/InstalledAppListRow/messages.ts similarity index 100% rename from src/new-apps/components/InstalledAppListRow/messages.ts rename to src/apps/components/InstalledAppListRow/messages.ts diff --git a/src/new-apps/components/InstalledAppListRow/styles.ts b/src/apps/components/InstalledAppListRow/styles.ts similarity index 96% rename from src/new-apps/components/InstalledAppListRow/styles.ts rename to src/apps/components/InstalledAppListRow/styles.ts index bccd5f005..402e97e67 100644 --- a/src/new-apps/components/InstalledAppListRow/styles.ts +++ b/src/apps/components/InstalledAppListRow/styles.ts @@ -1,4 +1,4 @@ -import { InstalledApp } from "@dashboard/new-apps/types"; +import { InstalledApp } from "@dashboard/apps/types"; import { makeStyles } from "@saleor/macaw-ui"; export const useStyles = makeStyles( diff --git a/src/new-apps/components/MarketplaceAlert/MarketplaceAlert.tsx b/src/apps/components/MarketplaceAlert/MarketplaceAlert.tsx similarity index 100% rename from src/new-apps/components/MarketplaceAlert/MarketplaceAlert.tsx rename to src/apps/components/MarketplaceAlert/MarketplaceAlert.tsx diff --git a/src/new-apps/components/MarketplaceAlert/index.ts b/src/apps/components/MarketplaceAlert/index.ts similarity index 100% rename from src/new-apps/components/MarketplaceAlert/index.ts rename to src/apps/components/MarketplaceAlert/index.ts diff --git a/src/new-apps/components/MarketplaceAlert/messages.ts b/src/apps/components/MarketplaceAlert/messages.ts similarity index 100% rename from src/new-apps/components/MarketplaceAlert/messages.ts rename to src/apps/components/MarketplaceAlert/messages.ts diff --git a/src/new-apps/components/MarketplaceAlert/styles.ts b/src/apps/components/MarketplaceAlert/styles.ts similarity index 100% rename from src/new-apps/components/MarketplaceAlert/styles.ts rename to src/apps/components/MarketplaceAlert/styles.ts diff --git a/src/new-apps/components/NotInstalledAppListRow/NotInstalledAppListRow.test.tsx b/src/apps/components/NotInstalledAppListRow/NotInstalledAppListRow.test.tsx similarity index 96% rename from src/new-apps/components/NotInstalledAppListRow/NotInstalledAppListRow.test.tsx rename to src/apps/components/NotInstalledAppListRow/NotInstalledAppListRow.test.tsx index 505f66dd4..3177846af 100644 --- a/src/new-apps/components/NotInstalledAppListRow/NotInstalledAppListRow.test.tsx +++ b/src/apps/components/NotInstalledAppListRow/NotInstalledAppListRow.test.tsx @@ -1,8 +1,8 @@ -import * as context from "@dashboard/new-apps/context"; +import * as context from "@dashboard/apps/context"; import { failedAppInProgress, pendingAppInProgress, -} from "@dashboard/new-apps/fixtures"; +} from "@dashboard/apps/fixtures"; import Wrapper from "@test/wrapper"; import { render, screen } from "@testing-library/react"; import userEvent from "@testing-library/user-event"; @@ -10,7 +10,7 @@ import React from "react"; import NotInstalledAppListRow from "./NotInstalledAppListRow"; -jest.mock("@dashboard/new-apps/context", () => ({ +jest.mock("@dashboard/apps/context", () => ({ useAppListContext: jest.fn(() => ({ openAppSettings: jest.fn(), removeAppInstallation: jest.fn(), diff --git a/src/new-apps/components/NotInstalledAppListRow/NotInstalledAppListRow.tsx b/src/apps/components/NotInstalledAppListRow/NotInstalledAppListRow.tsx similarity index 95% rename from src/new-apps/components/NotInstalledAppListRow/NotInstalledAppListRow.tsx rename to src/apps/components/NotInstalledAppListRow/NotInstalledAppListRow.tsx index 1de27cdcf..5284b101b 100644 --- a/src/new-apps/components/NotInstalledAppListRow/NotInstalledAppListRow.tsx +++ b/src/apps/components/NotInstalledAppListRow/NotInstalledAppListRow.tsx @@ -1,12 +1,12 @@ -import TableButtonWrapper from "@dashboard/components/TableButtonWrapper/TableButtonWrapper"; -import { JobStatusEnum } from "@dashboard/graphql"; -import { buttonMessages } from "@dashboard/intl"; -import { useAppListContext } from "@dashboard/new-apps/context"; +import { useAppListContext } from "@dashboard/apps/context"; import { appInstallationStatusMessages, appsMessages, -} from "@dashboard/new-apps/messages"; -import { AppInstallation } from "@dashboard/new-apps/types"; +} from "@dashboard/apps/messages"; +import { AppInstallation } from "@dashboard/apps/types"; +import TableButtonWrapper from "@dashboard/components/TableButtonWrapper/TableButtonWrapper"; +import { JobStatusEnum } from "@dashboard/graphql"; +import { buttonMessages } from "@dashboard/intl"; import { CircularProgress } from "@material-ui/core"; import { Tooltip } from "@saleor/macaw-ui"; import { diff --git a/src/new-apps/components/NotInstalledAppListRow/index.ts b/src/apps/components/NotInstalledAppListRow/index.ts similarity index 100% rename from src/new-apps/components/NotInstalledAppListRow/index.ts rename to src/apps/components/NotInstalledAppListRow/index.ts diff --git a/src/new-apps/components/NotInstalledAppListRow/messages.ts b/src/apps/components/NotInstalledAppListRow/messages.ts similarity index 100% rename from src/new-apps/components/NotInstalledAppListRow/messages.ts rename to src/apps/components/NotInstalledAppListRow/messages.ts diff --git a/src/new-apps/components/NotInstalledAppListRow/styles.ts b/src/apps/components/NotInstalledAppListRow/styles.ts similarity index 97% rename from src/new-apps/components/NotInstalledAppListRow/styles.ts rename to src/apps/components/NotInstalledAppListRow/styles.ts index 9894f537f..cddf50c8e 100644 --- a/src/new-apps/components/NotInstalledAppListRow/styles.ts +++ b/src/apps/components/NotInstalledAppListRow/styles.ts @@ -1,4 +1,4 @@ -import { AppInstallation } from "@dashboard/new-apps/types"; +import { AppInstallation } from "@dashboard/apps/types"; import { makeStyles } from "@saleor/macaw-ui"; export const useStyles = makeStyles( diff --git a/src/new-apps/components/SectionHeader/SectionHeader.tsx b/src/apps/components/SectionHeader/SectionHeader.tsx similarity index 100% rename from src/new-apps/components/SectionHeader/SectionHeader.tsx rename to src/apps/components/SectionHeader/SectionHeader.tsx diff --git a/src/new-apps/components/SectionHeader/index.ts b/src/apps/components/SectionHeader/index.ts similarity index 100% rename from src/new-apps/components/SectionHeader/index.ts rename to src/apps/components/SectionHeader/index.ts diff --git a/src/new-apps/components/SectionHeader/styles.ts b/src/apps/components/SectionHeader/styles.ts similarity index 100% rename from src/new-apps/components/SectionHeader/styles.ts rename to src/apps/components/SectionHeader/styles.ts diff --git a/src/new-apps/context.ts b/src/apps/context.ts similarity index 100% rename from src/new-apps/context.ts rename to src/apps/context.ts diff --git a/src/new-apps/fixtures.ts b/src/apps/fixtures.ts similarity index 100% rename from src/new-apps/fixtures.ts rename to src/apps/fixtures.ts diff --git a/src/new-apps/hooks/useActiveAppsInstallations.ts b/src/apps/hooks/useActiveAppsInstallations.ts similarity index 98% rename from src/new-apps/hooks/useActiveAppsInstallations.ts rename to src/apps/hooks/useActiveAppsInstallations.ts index 50d53ebc4..35cf49a96 100644 --- a/src/new-apps/hooks/useActiveAppsInstallations.ts +++ b/src/apps/hooks/useActiveAppsInstallations.ts @@ -1,4 +1,5 @@ import { useApolloClient } from "@apollo/client"; +import { EXTENSION_LIST_QUERY } from "@dashboard/apps/queries"; import { AppInstallationFragment, AppsInstallationsQuery, @@ -7,7 +8,6 @@ import { useAppRetryInstallMutation, } from "@dashboard/graphql"; import useLocalStorage from "@dashboard/hooks/useLocalStorage"; -import { EXTENSION_LIST_QUERY } from "@dashboard/new-apps/queries"; import { useEffect, useRef } from "react"; interface UseActiveAppsInstallations { diff --git a/src/new-apps/hooks/useExtensions.ts b/src/apps/hooks/useExtensions.ts similarity index 100% rename from src/new-apps/hooks/useExtensions.ts rename to src/apps/hooks/useExtensions.ts diff --git a/src/new-apps/hooks/useMarketplaceApps.test.ts b/src/apps/hooks/useMarketplaceApps.test.ts similarity index 93% rename from src/new-apps/hooks/useMarketplaceApps.test.ts rename to src/apps/hooks/useMarketplaceApps.test.ts index 13a58dd86..380a87319 100644 --- a/src/new-apps/hooks/useMarketplaceApps.test.ts +++ b/src/apps/hooks/useMarketplaceApps.test.ts @@ -7,16 +7,16 @@ const mockApps = [releasedApp, comingSoonApp]; global.fetch = jest.fn(url => { if (url === "https://marketplace.com/apps") { - return Promise.resolve(({ + return Promise.resolve({ ok: true, json: jest.fn(() => Promise.resolve(mockApps)), - } as unknown) as Response); + } as unknown as Response); } if (url === "https://marketplace.com/failing-apps-endpoint") { - return Promise.resolve(({ + return Promise.resolve({ ok: false, statusText: "API error", - } as unknown) as Response); + } as unknown as Response); } return Promise.reject(new Error("API is down")); }); diff --git a/src/new-apps/hooks/useMarketplaceApps.ts b/src/apps/hooks/useMarketplaceApps.ts similarity index 93% rename from src/new-apps/hooks/useMarketplaceApps.ts rename to src/apps/hooks/useMarketplaceApps.ts index 3b8f2241d..1d2d362a5 100644 --- a/src/new-apps/hooks/useMarketplaceApps.ts +++ b/src/apps/hooks/useMarketplaceApps.ts @@ -1,4 +1,4 @@ -import { GetV2SaleorAppsResponse } from "@dashboard/new-apps/marketplace.types"; +import { GetV2SaleorAppsResponse } from "@dashboard/apps/marketplace.types"; import { useEffect, useReducer, useRef } from "react"; interface State { @@ -75,7 +75,8 @@ function useMarketplaceApps(marketplaceUrl?: string): State { throw new Error(response.statusText); } - const data = (await response.json()) as GetV2SaleorAppsResponse.SaleorApp[]; + const data = + (await response.json()) as GetV2SaleorAppsResponse.SaleorApp[]; cache.current[marketplaceUrl] = data; if (cancelRequest.current) { return; diff --git a/src/new-apps/index.tsx b/src/apps/index.tsx similarity index 94% rename from src/new-apps/index.tsx rename to src/apps/index.tsx index b21bff549..47aee34e2 100644 --- a/src/new-apps/index.tsx +++ b/src/apps/index.tsx @@ -1,9 +1,9 @@ -import { sectionNames } from "@dashboard/intl"; import { AppDetailsUrlQueryParams, AppInstallUrlQueryParams, -} from "@dashboard/new-apps/urls"; -import AppInstallView from "@dashboard/new-apps/views/AppInstall"; +} from "@dashboard/apps/urls"; +import AppInstallView from "@dashboard/apps/views/AppInstall"; +import { sectionNames } from "@dashboard/intl"; import { parse as parseQs } from "qs"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/new-apps/marketplace.types.ts b/src/apps/marketplace.types.ts similarity index 100% rename from src/new-apps/marketplace.types.ts rename to src/apps/marketplace.types.ts diff --git a/src/new-apps/messages.ts b/src/apps/messages.ts similarity index 100% rename from src/new-apps/messages.ts rename to src/apps/messages.ts diff --git a/src/new-apps/mutations.ts b/src/apps/mutations.ts similarity index 100% rename from src/new-apps/mutations.ts rename to src/apps/mutations.ts diff --git a/src/new-apps/queries.ts b/src/apps/queries.ts similarity index 100% rename from src/new-apps/queries.ts rename to src/apps/queries.ts diff --git a/src/new-apps/types.ts b/src/apps/types.ts similarity index 100% rename from src/new-apps/types.ts rename to src/apps/types.ts diff --git a/src/new-apps/urls.test.ts b/src/apps/urls.test.ts similarity index 97% rename from src/new-apps/urls.test.ts rename to src/apps/urls.test.ts index 1053f1078..bc4354a20 100644 --- a/src/new-apps/urls.test.ts +++ b/src/apps/urls.test.ts @@ -1,5 +1,5 @@ +import { AppUrls } from "@dashboard/apps/urls"; import * as config from "@dashboard/config"; -import { AppUrls } from "@dashboard/new-apps/urls"; import { ThemeType } from "@saleor/app-sdk/app-bridge"; describe("AppUrls (apps/urls.ts)", () => { diff --git a/src/new-apps/urls.ts b/src/apps/urls.ts similarity index 100% rename from src/new-apps/urls.ts rename to src/apps/urls.ts diff --git a/src/new-apps/utils.test.ts b/src/apps/utils.test.ts similarity index 100% rename from src/new-apps/utils.test.ts rename to src/apps/utils.test.ts diff --git a/src/new-apps/utils.ts b/src/apps/utils.ts similarity index 100% rename from src/new-apps/utils.ts rename to src/apps/utils.ts diff --git a/src/new-apps/views/AppDetails/AppDetails.tsx b/src/apps/views/AppDetails/AppDetails.tsx similarity index 95% rename from src/new-apps/views/AppDetails/AppDetails.tsx rename to src/apps/views/AppDetails/AppDetails.tsx index 489b7fd3b..9bd5efcca 100644 --- a/src/new-apps/views/AppDetails/AppDetails.tsx +++ b/src/apps/views/AppDetails/AppDetails.tsx @@ -1,4 +1,7 @@ import { useApolloClient } from "@apollo/client"; +import AppDeleteDialog from "@dashboard/apps/components/AppDeleteDialog"; +import { appMessages } from "@dashboard/apps/messages"; +import { EXTENSION_LIST_QUERY } from "@dashboard/apps/queries"; import NotFoundPage from "@dashboard/components/NotFoundPage"; import { useAppActivateMutation, @@ -8,9 +11,6 @@ import { } from "@dashboard/graphql"; import useNavigator from "@dashboard/hooks/useNavigator"; import useNotifier from "@dashboard/hooks/useNotifier"; -import AppDeleteDialog from "@dashboard/new-apps/components/AppDeleteDialog"; -import { appMessages } from "@dashboard/new-apps/messages"; -import { EXTENSION_LIST_QUERY } from "@dashboard/new-apps/queries"; import getAppErrorMessage from "@dashboard/utils/errors/app"; import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; import React from "react"; diff --git a/src/new-apps/views/AppDetails/index.ts b/src/apps/views/AppDetails/index.ts similarity index 100% rename from src/new-apps/views/AppDetails/index.ts rename to src/apps/views/AppDetails/index.ts diff --git a/src/new-apps/views/AppDetails/messages.ts b/src/apps/views/AppDetails/messages.ts similarity index 100% rename from src/new-apps/views/AppDetails/messages.ts rename to src/apps/views/AppDetails/messages.ts diff --git a/src/new-apps/views/AppInstall/AppInstall.tsx b/src/apps/views/AppInstall/AppInstall.tsx similarity index 94% rename from src/new-apps/views/AppInstall/AppInstall.tsx rename to src/apps/views/AppInstall/AppInstall.tsx index fff3866ff..18d11e15a 100644 --- a/src/new-apps/views/AppInstall/AppInstall.tsx +++ b/src/apps/views/AppInstall/AppInstall.tsx @@ -1,16 +1,16 @@ +import AppInstallErrorPage from "@dashboard/apps/components/AppInstallErrorPage"; +import AppInstallPage from "@dashboard/apps/components/AppInstallPage"; +import { + AppInstallUrlQueryParams, + AppUrls, + MANIFEST_ATTR, +} from "@dashboard/apps/urls"; import { WindowTitle } from "@dashboard/components/WindowTitle"; import { useAppFetchMutation, useAppInstallMutation } from "@dashboard/graphql"; import useLocalStorage from "@dashboard/hooks/useLocalStorage"; import useNavigator from "@dashboard/hooks/useNavigator"; import useNotifier from "@dashboard/hooks/useNotifier"; import { extractMutationErrors } from "@dashboard/misc"; -import AppInstallErrorPage from "@dashboard/new-apps/components/AppInstallErrorPage"; -import AppInstallPage from "@dashboard/new-apps/components/AppInstallPage"; -import { - AppInstallUrlQueryParams, - AppUrls, - MANIFEST_ATTR, -} from "@dashboard/new-apps/urls"; import getAppErrorMessage from "@dashboard/utils/errors/app"; import React, { useEffect } from "react"; import { useIntl } from "react-intl"; diff --git a/src/new-apps/views/AppInstall/index.ts b/src/apps/views/AppInstall/index.ts similarity index 100% rename from src/new-apps/views/AppInstall/index.ts rename to src/apps/views/AppInstall/index.ts diff --git a/src/new-apps/views/AppInstall/messages.ts b/src/apps/views/AppInstall/messages.ts similarity index 100% rename from src/new-apps/views/AppInstall/messages.ts rename to src/apps/views/AppInstall/messages.ts diff --git a/src/new-apps/views/AppList/AppList.tsx b/src/apps/views/AppList/AppList.tsx similarity index 90% rename from src/new-apps/views/AppList/AppList.tsx rename to src/apps/views/AppList/AppList.tsx index 93978b450..d07836aee 100644 --- a/src/new-apps/views/AppList/AppList.tsx +++ b/src/apps/views/AppList/AppList.tsx @@ -1,3 +1,17 @@ +import AppInProgressDeleteDialog from "@dashboard/apps/components/AppInProgressDeleteDialog"; +import AppListPage from "@dashboard/apps/components/AppListPage/AppListPage"; +import { AppListContext, AppListContextValues } from "@dashboard/apps/context"; +import useActiveAppsInstallations from "@dashboard/apps/hooks/useActiveAppsInstallations"; +import useMarketplaceApps from "@dashboard/apps/hooks/useMarketplaceApps"; +import { + AppListUrlDialog, + AppListUrlQueryParams, + AppUrls, +} from "@dashboard/apps/urls"; +import { + getAppInProgressName, + getMarketplaceAppsLists, +} from "@dashboard/apps/utils"; import { getAppsConfig } from "@dashboard/config"; import { AppInstallationFragment, @@ -14,23 +28,6 @@ import useLocalPaginator, { import useNavigator from "@dashboard/hooks/useNavigator"; import useNotifier from "@dashboard/hooks/useNotifier"; import { PaginatorContext } from "@dashboard/hooks/usePaginator"; -import AppInProgressDeleteDialog from "@dashboard/new-apps/components/AppInProgressDeleteDialog"; -import AppListPage from "@dashboard/new-apps/components/AppListPage/AppListPage"; -import { - AppListContext, - AppListContextValues, -} from "@dashboard/new-apps/context"; -import useActiveAppsInstallations from "@dashboard/new-apps/hooks/useActiveAppsInstallations"; -import useMarketplaceApps from "@dashboard/new-apps/hooks/useMarketplaceApps"; -import { - AppListUrlDialog, - AppListUrlQueryParams, - AppUrls, -} from "@dashboard/new-apps/urls"; -import { - getAppInProgressName, - getMarketplaceAppsLists, -} from "@dashboard/new-apps/utils"; import { ListViews } from "@dashboard/types"; import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; import { mapEdgesToItems } from "@dashboard/utils/maps"; diff --git a/src/new-apps/views/AppList/index.ts b/src/apps/views/AppList/index.ts similarity index 100% rename from src/new-apps/views/AppList/index.ts rename to src/apps/views/AppList/index.ts diff --git a/src/new-apps/views/AppList/messages.ts b/src/apps/views/AppList/messages.ts similarity index 100% rename from src/new-apps/views/AppList/messages.ts rename to src/apps/views/AppList/messages.ts diff --git a/src/new-apps/views/AppView/AppView.tsx b/src/apps/views/AppView/AppView.tsx similarity index 88% rename from src/new-apps/views/AppView/AppView.tsx rename to src/apps/views/AppView/AppView.tsx index afd5ed857..c1c609268 100644 --- a/src/new-apps/views/AppView/AppView.tsx +++ b/src/apps/views/AppView/AppView.tsx @@ -1,10 +1,10 @@ +import AppPage from "@dashboard/apps/components/AppPage"; +import { appMessages } from "@dashboard/apps/messages"; +import { AppPaths, AppUrls } from "@dashboard/apps/urls"; import NotFoundPage from "@dashboard/components/NotFoundPage"; import { useAppQuery } from "@dashboard/graphql"; import useNavigator from "@dashboard/hooks/useNavigator"; import useNotifier from "@dashboard/hooks/useNotifier"; -import AppPage from "@dashboard/new-apps/components/AppPage"; -import { appMessages } from "@dashboard/new-apps/messages"; -import { AppPaths, AppUrls } from "@dashboard/new-apps/urls"; import React, { useCallback } from "react"; import { useIntl } from "react-intl"; import { useLocation } from "react-router"; diff --git a/src/new-apps/views/AppView/index.ts b/src/apps/views/AppView/index.ts similarity index 100% rename from src/new-apps/views/AppView/index.ts rename to src/apps/views/AppView/index.ts diff --git a/src/components/Navigator/modes/default/views.ts b/src/components/Navigator/modes/default/views.ts index 85d747b3b..bc8357009 100644 --- a/src/components/Navigator/modes/default/views.ts +++ b/src/components/Navigator/modes/default/views.ts @@ -1,3 +1,4 @@ +import { AppUrls } from "@dashboard/apps/urls"; import { attributeListUrl } from "@dashboard/attributes/urls"; import { categoryListUrl } from "@dashboard/categories/urls"; import { collectionListUrl } from "@dashboard/collections/urls"; @@ -6,7 +7,6 @@ import { saleListUrl, voucherListUrl } from "@dashboard/discounts/urls"; import { UseNavigatorResult } from "@dashboard/hooks/useNavigator"; import { sectionNames } from "@dashboard/intl"; import { menuListUrl } from "@dashboard/navigation/urls"; -import { AppUrls } from "@dashboard/new-apps/urls"; import { orderDraftListUrl, orderListUrl } from "@dashboard/orders/urls"; import { pageListUrl } from "@dashboard/pages/urls"; import { permissionGroupListUrl } from "@dashboard/permissionGroups/urls"; diff --git a/src/components/Sidebar/menu/SingleItem.tsx b/src/components/Sidebar/menu/SingleItem.tsx index fdafe5192..652940700 100644 --- a/src/components/Sidebar/menu/SingleItem.tsx +++ b/src/components/Sidebar/menu/SingleItem.tsx @@ -1,7 +1,7 @@ import { extensionMountPoints, useExtensions, -} from "@dashboard/new-apps/hooks/useExtensions"; +} from "@dashboard/apps/hooks/useExtensions"; import { Box, List, sprinkles, Text } from "@saleor/macaw-ui/next"; import React from "react"; import { Link } from "react-router-dom"; diff --git a/src/components/Sidebar/menu/useMenuStructure.tsx b/src/components/Sidebar/menu/useMenuStructure.tsx index c47dcf93d..b18d94020 100644 --- a/src/components/Sidebar/menu/useMenuStructure.tsx +++ b/src/components/Sidebar/menu/useMenuStructure.tsx @@ -1,3 +1,8 @@ +import { + extensionMountPoints, + useExtensions, +} from "@dashboard/apps/hooks/useExtensions"; +import { AppPaths } from "@dashboard/apps/urls"; import { useUser } from "@dashboard/auth"; import { categoryListUrl } from "@dashboard/categories/urls"; import { collectionListUrl } from "@dashboard/collections/urls"; @@ -10,11 +15,6 @@ import { giftCardListUrl } from "@dashboard/giftCards/urls"; import { PermissionEnum } from "@dashboard/graphql"; import { commonMessages, sectionNames } from "@dashboard/intl"; import { marketplaceUrlResolver } from "@dashboard/marketplace/marketplace-url-resolver"; -import { - extensionMountPoints, - useExtensions, -} from "@dashboard/new-apps/hooks/useExtensions"; -import { AppPaths } from "@dashboard/new-apps/urls"; import { orderDraftListUrl, orderListUrl } from "@dashboard/orders/urls"; import { pageListPath } from "@dashboard/pages/urls"; import { productListUrl } from "@dashboard/products/urls"; diff --git a/src/components/Sidebar/menu/utils.ts b/src/components/Sidebar/menu/utils.ts index a04b407f3..c8f4d5a57 100644 --- a/src/components/Sidebar/menu/utils.ts +++ b/src/components/Sidebar/menu/utils.ts @@ -1,6 +1,6 @@ +import { Extension } from "@dashboard/apps/hooks/useExtensions"; +import { AppUrls } from "@dashboard/apps/urls"; import { AppExtensionMountEnum } from "@dashboard/graphql"; -import { Extension } from "@dashboard/new-apps/hooks/useExtensions"; -import { AppUrls } from "@dashboard/new-apps/urls"; import { orderDraftListUrl, orderListUrl } from "@dashboard/orders/urls"; import { matchPath } from "react-router"; diff --git a/src/custom-apps/components/CustomAppListPage/CustomAppListPage.tsx b/src/custom-apps/components/CustomAppListPage/CustomAppListPage.tsx index b025c614a..bc2cbe80a 100644 --- a/src/custom-apps/components/CustomAppListPage/CustomAppListPage.tsx +++ b/src/custom-apps/components/CustomAppListPage/CustomAppListPage.tsx @@ -1,3 +1,4 @@ +import DeactivatedText from "@dashboard/apps/components/DeactivatedText"; import { TopNav } from "@dashboard/components/AppLayout/TopNav"; import { Button } from "@dashboard/components/Button"; import { ListPageLayout } from "@dashboard/components/Layouts"; @@ -7,7 +8,6 @@ import { CustomAppUrls } from "@dashboard/custom-apps/urls"; import { AppListItemFragment } from "@dashboard/graphql"; import { sectionNames } from "@dashboard/intl"; import { renderCollection } from "@dashboard/misc"; -import DeactivatedText from "@dashboard/new-apps/components/DeactivatedText"; import { TableBody, TableCell, Typography } from "@material-ui/core"; import { DeleteIcon, IconButton, ResponsiveTable } from "@saleor/macaw-ui"; import { Box, Text } from "@saleor/macaw-ui/next"; diff --git a/src/custom-apps/views/CustomAppDetails/CustomAppDetails.tsx b/src/custom-apps/views/CustomAppDetails/CustomAppDetails.tsx index b02618b3a..6cb10534a 100644 --- a/src/custom-apps/views/CustomAppDetails/CustomAppDetails.tsx +++ b/src/custom-apps/views/CustomAppDetails/CustomAppDetails.tsx @@ -1,3 +1,6 @@ +import AppActivateDialog from "@dashboard/apps/components/AppActivateDialog"; +import AppDeactivateDialog from "@dashboard/apps/components/AppDeactivateDialog"; +import { appMessages } from "@dashboard/apps/messages"; import NotFoundPage from "@dashboard/components/NotFoundPage"; import { WindowTitle } from "@dashboard/components/WindowTitle"; import { getApiUrl } from "@dashboard/config"; @@ -23,9 +26,6 @@ import useNotifier from "@dashboard/hooks/useNotifier"; import useShop from "@dashboard/hooks/useShop"; import { commonMessages } from "@dashboard/intl"; import { extractMutationErrors, getStringOrPlaceholder } from "@dashboard/misc"; -import AppActivateDialog from "@dashboard/new-apps/components/AppActivateDialog"; -import AppDeactivateDialog from "@dashboard/new-apps/components/AppDeactivateDialog"; -import { appMessages } from "@dashboard/new-apps/messages"; import getAppErrorMessage from "@dashboard/utils/errors/app"; import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; import React from "react"; diff --git a/src/custom-apps/views/CustomAppList.tsx b/src/custom-apps/views/CustomAppList.tsx index 526bdb2de..b418053b8 100644 --- a/src/custom-apps/views/CustomAppList.tsx +++ b/src/custom-apps/views/CustomAppList.tsx @@ -1,4 +1,6 @@ import { useApolloClient } from "@apollo/client"; +import AppDeleteDialog from "@dashboard/apps/components/AppDeleteDialog"; +import { EXTENSION_LIST_QUERY } from "@dashboard/apps/queries"; import { WindowTitle } from "@dashboard/components/WindowTitle"; import { AppSortField, @@ -11,8 +13,6 @@ import useNavigator from "@dashboard/hooks/useNavigator"; import useNotifier from "@dashboard/hooks/useNotifier"; import { sectionNames } from "@dashboard/intl"; import { findById } from "@dashboard/misc"; -import AppDeleteDialog from "@dashboard/new-apps/components/AppDeleteDialog"; -import { EXTENSION_LIST_QUERY } from "@dashboard/new-apps/queries"; import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; import { mapEdgesToItems } from "@dashboard/utils/maps"; import React from "react"; diff --git a/src/customers/components/CustomerDetailsPage/CustomerDetailsPage.tsx b/src/customers/components/CustomerDetailsPage/CustomerDetailsPage.tsx index c0d94145f..b18b62904 100644 --- a/src/customers/components/CustomerDetailsPage/CustomerDetailsPage.tsx +++ b/src/customers/components/CustomerDetailsPage/CustomerDetailsPage.tsx @@ -1,3 +1,8 @@ +import { + extensionMountPoints, + mapToMenuItemsForCustomerDetails, + useExtensions, +} from "@dashboard/apps/hooks/useExtensions"; import { TopNav } from "@dashboard/components/AppLayout/TopNav"; import { Backlink } from "@dashboard/components/Backlink"; import CardMenu from "@dashboard/components/CardMenu/CardMenu"; @@ -21,11 +26,6 @@ import { import { SubmitPromise } from "@dashboard/hooks/useForm"; import useNavigator from "@dashboard/hooks/useNavigator"; import { sectionNames } from "@dashboard/intl"; -import { - extensionMountPoints, - mapToMenuItemsForCustomerDetails, - useExtensions, -} from "@dashboard/new-apps/hooks/useExtensions"; import { orderListUrl } from "@dashboard/orders/urls"; import { mapEdgesToItems, mapMetadataItemToInput } from "@dashboard/utils/maps"; import useMetadataChangeTrigger from "@dashboard/utils/metadata/useMetadataChangeTrigger"; diff --git a/src/customers/components/CustomerListPage/CustomerListPage.tsx b/src/customers/components/CustomerListPage/CustomerListPage.tsx index 05e631b36..36ee09b91 100644 --- a/src/customers/components/CustomerListPage/CustomerListPage.tsx +++ b/src/customers/components/CustomerListPage/CustomerListPage.tsx @@ -1,3 +1,9 @@ +import { + extensionMountPoints, + mapToMenuItems, + mapToMenuItemsForCustomerOverviewActions, + useExtensions, +} from "@dashboard/apps/hooks/useExtensions"; import { useUserPermissions } from "@dashboard/auth/hooks/useUserPermissions"; import { TopNav } from "@dashboard/components/AppLayout/TopNav"; import ButtonWithSelect from "@dashboard/components/ButtonWithSelect"; @@ -10,12 +16,6 @@ import { import { ListCustomersQuery } from "@dashboard/graphql"; import useNavigator from "@dashboard/hooks/useNavigator"; import { sectionNames } from "@dashboard/intl"; -import { - extensionMountPoints, - mapToMenuItems, - mapToMenuItemsForCustomerOverviewActions, - useExtensions, -} from "@dashboard/new-apps/hooks/useExtensions"; import { FilterPageProps, ListActions, diff --git a/src/giftCards/GiftCardUpdate/GiftCardHistory/GiftCardTimelineEvent.tsx b/src/giftCards/GiftCardUpdate/GiftCardHistory/GiftCardTimelineEvent.tsx index 5acb79799..936f2d75c 100644 --- a/src/giftCards/GiftCardUpdate/GiftCardHistory/GiftCardTimelineEvent.tsx +++ b/src/giftCards/GiftCardUpdate/GiftCardHistory/GiftCardTimelineEvent.tsx @@ -1,8 +1,8 @@ +import { AppPaths } from "@dashboard/apps/urls"; import Link from "@dashboard/components/Link"; import { TimelineEvent } from "@dashboard/components/Timeline"; import { customerPath } from "@dashboard/customers/urls"; import { GiftCardEventFragment, GiftCardEventsEnum } from "@dashboard/graphql"; -import { AppPaths } from "@dashboard/new-apps/urls"; import { orderUrl } from "@dashboard/orders/urls"; import { staffMemberDetailsUrl } from "@dashboard/staff/urls"; import React from "react"; diff --git a/src/giftCards/GiftCardUpdate/GiftCardUpdateInfoCard/GiftCardUpdateInfoCardContent.tsx b/src/giftCards/GiftCardUpdate/GiftCardUpdateInfoCard/GiftCardUpdateInfoCardContent.tsx index 1e3206f38..136c7672b 100644 --- a/src/giftCards/GiftCardUpdate/GiftCardUpdateInfoCard/GiftCardUpdateInfoCardContent.tsx +++ b/src/giftCards/GiftCardUpdate/GiftCardUpdateInfoCard/GiftCardUpdateInfoCardContent.tsx @@ -1,10 +1,10 @@ +import { AppUrls } from "@dashboard/apps/urls"; import CardSpacer from "@dashboard/components/CardSpacer"; import Link from "@dashboard/components/Link"; import { customerUrl } from "@dashboard/customers/urls"; import { GiftCardEventsEnum } from "@dashboard/graphql"; import useDateLocalize from "@dashboard/hooks/useDateLocalize"; import { getFullName, getStringOrPlaceholder } from "@dashboard/misc"; -import { AppUrls } from "@dashboard/new-apps/urls"; import Label from "@dashboard/orders/components/OrderHistory/Label"; import { getOrderNumberLinkObject } from "@dashboard/orders/components/OrderHistory/utils"; import { getByType } from "@dashboard/orders/components/OrderReturnPage/utils"; diff --git a/src/hooks/useLocationState.ts b/src/hooks/useLocationState.ts index 9af3b5744..6965d5670 100644 --- a/src/hooks/useLocationState.ts +++ b/src/hooks/useLocationState.ts @@ -1,4 +1,4 @@ -import { AppSections } from "@dashboard/new-apps/urls"; +import { AppSections } from "@dashboard/apps/urls"; import { matchPath, useLocation } from "react-router"; const isAppPath = (pathname: string) => diff --git a/src/index.tsx b/src/index.tsx index 1d171ed8a..de774fb9c 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -15,6 +15,9 @@ import TagManager from "react-gtm-module"; import { useIntl } from "react-intl"; import { BrowserRouter, Route, Switch } from "react-router-dom"; +import AppsSection from "./apps"; +import { ExternalAppProvider } from "./apps/components/ExternalAppContext"; +import { AppSections } from "./apps/urls"; import AttributeSection from "./attributes"; import { attributeSection } from "./attributes/urls"; import Auth, { useUser } from "./auth"; @@ -57,9 +60,6 @@ import MarketplaceSection from "./marketplace"; import { marketplaceUrl } from "./marketplace/urls"; import NavigationSection from "./navigation"; import { navigationSection } from "./navigation/urls"; -import AppsSection from "./new-apps"; -import { ExternalAppProvider } from "./new-apps/components/ExternalAppContext"; -import { AppSections } from "./new-apps/urls"; import { NotFound } from "./NotFound"; import OrdersSection from "./orders"; import PageSection from "./pages"; diff --git a/src/marketplace/index.tsx b/src/marketplace/index.tsx index 791e6fc9c..0da3150cc 100644 --- a/src/marketplace/index.tsx +++ b/src/marketplace/index.tsx @@ -1,3 +1,4 @@ +import { AppFrame } from "@dashboard/apps/components/AppFrame"; import NotFoundPage from "@dashboard/components/NotFoundPage"; import PreviewPill from "@dashboard/components/PreviewPill"; import { WindowTitle } from "@dashboard/components/WindowTitle"; @@ -6,7 +7,6 @@ import useNavigator from "@dashboard/hooks/useNavigator"; import { sectionNames } from "@dashboard/intl"; import { marketplaceUrlResolver } from "@dashboard/marketplace/marketplace-url-resolver"; import { marketplaceUrl } from "@dashboard/marketplace/urls"; -import { AppFrame } from "@dashboard/new-apps/components/AppFrame"; import { Container } from "@material-ui/core"; import React, { useMemo } from "react"; import { useIntl } from "react-intl"; diff --git a/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx b/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx index 4df321dc5..42666fe0b 100644 --- a/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx +++ b/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx @@ -1,3 +1,8 @@ +import { + extensionMountPoints, + mapToMenuItemsForOrderDetails, + useExtensions, +} from "@dashboard/apps/hooks/useExtensions"; import { TopNav } from "@dashboard/components/AppLayout/TopNav"; import CardMenu from "@dashboard/components/CardMenu"; import { CardSpacer } from "@dashboard/components/CardSpacer"; @@ -13,11 +18,6 @@ import { } from "@dashboard/graphql"; import { SubmitPromise } from "@dashboard/hooks/useForm"; import useNavigator from "@dashboard/hooks/useNavigator"; -import { - extensionMountPoints, - mapToMenuItemsForOrderDetails, - useExtensions, -} from "@dashboard/new-apps/hooks/useExtensions"; import { defaultGraphiQLQuery } from "@dashboard/orders/queries"; import { orderListUrl } from "@dashboard/orders/urls"; import { playgroundOpenHandler } from "@dashboard/utils/graphql"; diff --git a/src/orders/components/OrderListPage/OrderListPage.tsx b/src/orders/components/OrderListPage/OrderListPage.tsx index ec7155e0a..e54754d94 100644 --- a/src/orders/components/OrderListPage/OrderListPage.tsx +++ b/src/orders/components/OrderListPage/OrderListPage.tsx @@ -1,3 +1,8 @@ +import { + extensionMountPoints, + mapToMenuItems, + useExtensions, +} from "@dashboard/apps/hooks/useExtensions"; import { LimitsInfo } from "@dashboard/components/AppLayout/LimitsInfo"; import { TopNav } from "@dashboard/components/AppLayout/TopNav"; import { ButtonWithSelect } from "@dashboard/components/ButtonWithSelect"; @@ -6,11 +11,6 @@ import FilterBar from "@dashboard/components/FilterBar"; import { ListPageLayout } from "@dashboard/components/Layouts"; import { OrderListQuery, RefreshLimitsQuery } from "@dashboard/graphql"; import { sectionNames } from "@dashboard/intl"; -import { - extensionMountPoints, - mapToMenuItems, - useExtensions, -} from "@dashboard/new-apps/hooks/useExtensions"; import { OrderListUrlSortField } from "@dashboard/orders/urls"; import { FilterPageProps, diff --git a/src/products/components/ProductListPage/ProductListPage.tsx b/src/products/components/ProductListPage/ProductListPage.tsx index b05610ce9..5698d1ce9 100644 --- a/src/products/components/ProductListPage/ProductListPage.tsx +++ b/src/products/components/ProductListPage/ProductListPage.tsx @@ -1,3 +1,9 @@ +import { + extensionMountPoints, + mapToMenuItems, + mapToMenuItemsForProductOverviewActions, + useExtensions, +} from "@dashboard/apps/hooks/useExtensions"; import { LimitsInfo } from "@dashboard/components/AppLayout/LimitsInfo"; import { TopNav } from "@dashboard/components/AppLayout/TopNav"; import { ButtonWithSelect } from "@dashboard/components/ButtonWithSelect"; @@ -16,12 +22,6 @@ import { SearchAvailableInGridAttributesQuery, } from "@dashboard/graphql"; import { sectionNames } from "@dashboard/intl"; -import { - extensionMountPoints, - mapToMenuItems, - mapToMenuItemsForProductOverviewActions, - useExtensions, -} from "@dashboard/new-apps/hooks/useExtensions"; import { ChannelProps, FetchMoreProps, diff --git a/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx b/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx index d9e7abee2..7ce66a28f 100644 --- a/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx +++ b/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx @@ -1,3 +1,8 @@ +import { + extensionMountPoints, + mapToMenuItemsForProductDetails, + useExtensions, +} from "@dashboard/apps/hooks/useExtensions"; import { getReferenceAttributeEntityTypeFromAttribute, mergeAttributeValues, @@ -35,11 +40,6 @@ import { SubmitPromise } from "@dashboard/hooks/useForm"; import useNavigator from "@dashboard/hooks/useNavigator"; import useStateFromProps from "@dashboard/hooks/useStateFromProps"; import { maybe } from "@dashboard/misc"; -import { - extensionMountPoints, - mapToMenuItemsForProductDetails, - useExtensions, -} from "@dashboard/new-apps/hooks/useExtensions"; import ProductExternalMediaDialog from "@dashboard/products/components/ProductExternalMediaDialog"; import { defaultGraphiQLQuery } from "@dashboard/products/queries"; import { productImageUrl, productListUrl } from "@dashboard/products/urls"; diff --git a/src/storybook/Decorator.tsx b/src/storybook/Decorator.tsx index b5d3873e3..900c51172 100644 --- a/src/storybook/Decorator.tsx +++ b/src/storybook/Decorator.tsx @@ -1,6 +1,6 @@ +import { ExternalAppProvider } from "@dashboard/apps/components/ExternalAppContext"; import { Locale, RawLocaleProvider } from "@dashboard/components/Locale"; import { FlagsServiceProvider } from "@dashboard/hooks/useFlags/flagsService"; -import { ExternalAppProvider } from "@dashboard/new-apps/components/ExternalAppContext"; import { paletteOverrides, themeOverrides } from "@dashboard/themeOverrides"; import { ThemeProvider } from "@saleor/macaw-ui"; import React from "react"; diff --git a/testUtils/mocks/apps.ts b/testUtils/mocks/apps.ts index e3581e2ee..f61e03001 100644 --- a/testUtils/mocks/apps.ts +++ b/testUtils/mocks/apps.ts @@ -1,5 +1,5 @@ import { MockedResponse } from "@apollo/client/testing"; -import { extensionList } from "@dashboard/new-apps/queries"; +import { extensionList } from "@dashboard/apps/queries"; export const appsMocks: MockedResponse[] = [ { diff --git a/testUtils/wrapper.tsx b/testUtils/wrapper.tsx index 03a51a346..fe218e92c 100644 --- a/testUtils/wrapper.tsx +++ b/testUtils/wrapper.tsx @@ -1,7 +1,7 @@ +import { ExternalAppProvider } from "@dashboard/apps/components/ExternalAppContext"; import { Provider as DateProvider } from "@dashboard/components/Date/DateContext"; import { Locale, RawLocaleProvider } from "@dashboard/components/Locale"; import { TimezoneProvider } from "@dashboard/components/Timezone"; -import { ExternalAppProvider } from "@dashboard/new-apps/components/ExternalAppContext"; import { ThemeProvider } from "@saleor/macaw-ui"; import React from "react"; import { IntlProvider } from "react-intl";