From 04247d3f952f86eb4e0cb7de31fa7ba80452c2ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20=C5=BBuraw?= <9116238+krzysztofzuraw@users.noreply.github.com> Date: Mon, 16 Jan 2023 10:45:12 +0100 Subject: [PATCH] Migrate from @saleor alias to @dashboard (#2981) --- codegen.yml | 2 +- package-lock.json | 25 +++---- package.json | 2 +- .../AppActivateDialog/AppActivateDialog.tsx | 4 +- .../AppDeactivateDialog.tsx | 4 +- .../AppDeleteDialog/AppDeleteDialog.tsx | 4 +- .../AppDetailsPage/AppDetailsPage.stories.tsx | 2 +- .../AppDetailsPage/AppDetailsPage.tsx | 22 +++--- src/apps/components/AppFrame/AppFrame.tsx | 6 +- src/apps/components/AppFrame/useAppActions.ts | 8 +-- .../AppInProgressDeleteDialog.tsx | 4 +- .../AppInstallErrorPage.tsx | 4 +- .../AppInstallPage/AppInstallPage.stories.tsx | 2 +- .../AppInstallPage/AppInstallPage.tsx | 18 ++--- .../components/AppPage/AppPage.stories.tsx | 2 +- src/apps/components/AppPage/AppPage.tsx | 4 +- .../components/AppPageTabs/AppPageTabs.tsx | 2 +- .../AppPermissions/AppPermissions.tsx | 2 +- .../AppsInProgress/AppsInProgress.tsx | 14 ++-- .../AppsListPage/AppListPage.stories.tsx | 6 +- .../components/AppsListPage/AppsListPage.tsx | 25 ++++--- .../components/AppsSkeleton/AppsSkeleton.tsx | 4 +- .../CardContainer/CardContainer.tsx | 2 +- .../ExternalAppContext/ExternalAppContext.tsx | 6 +- .../components/ExternalAppContext/context.ts | 4 +- .../InstallWithManifestFormButton.tsx | 2 +- .../InstalledApps/InstalledApps.tsx | 24 +++---- src/apps/fixtures.ts | 2 +- src/apps/hooks/useAppsPageNavigation.ts | 4 +- src/apps/hooks/useLocationState.ts | 2 +- src/apps/hooks/useSaleorApps.ts | 2 +- src/apps/index.tsx | 4 +- src/apps/urls.test.ts | 4 +- src/apps/urls.ts | 4 +- src/apps/useExtensions.ts | 8 +-- src/apps/utils.ts | 2 +- src/apps/views/App/App.tsx | 10 +-- src/apps/views/AppDetails/AppDetails.tsx | 18 ++--- src/apps/views/AppInstall/AppInstall.tsx | 14 ++-- src/apps/views/AppSettings/AppSettings.tsx | 8 +-- src/apps/views/AppsList/AppsList.tsx | 20 +++--- .../AttributeBulkDeleteDialog.tsx | 2 +- .../AttributeDeleteDialog.tsx | 2 +- .../AttributeDetails/AttributeDetails.tsx | 22 +++--- .../AttributeDetails/NumericUnits.tsx | 12 ++-- .../components/AttributeDetails/utils.ts | 4 +- .../AttributeList/AttributeList.tsx | 28 ++++---- .../AttributeListPage/AttributeListPage.tsx | 16 ++--- .../components/AttributeListPage/filters.ts | 8 +-- .../AttributeOrganization.tsx | 6 +- .../AttributePage/AttributePage.tsx | 40 +++++------ .../AttributeProperties.tsx | 18 ++--- .../AttributeSwatchField.tsx | 20 +++--- .../AttributeValueDeleteDialog.tsx | 2 +- .../AttributeValueEditDialog.tsx | 22 +++--- .../AttributeValues/AttributeValues.tsx | 24 +++---- src/attributes/errors.ts | 4 +- src/attributes/fixtures.ts | 2 +- src/attributes/index.tsx | 4 +- src/attributes/urls.ts | 2 +- src/attributes/utils/data.ts | 14 ++-- src/attributes/utils/handlers.test.ts | 8 +-- src/attributes/utils/handlers.ts | 10 +-- .../views/AttributeCreate/AttributeCreate.tsx | 22 +++--- .../AttributeDetails/AttributeDetails.tsx | 26 +++---- .../views/AttributeList/AttributeList.tsx | 24 +++---- .../views/AttributeList/filters.test.ts | 8 +-- src/attributes/views/AttributeList/filters.ts | 8 +-- src/attributes/views/AttributeList/sort.ts | 6 +- src/auth/AuthProvider.test.tsx | 2 +- src/auth/AuthProvider.tsx | 2 +- .../LoginPage/LoginPage.stories.tsx | 4 +- src/auth/components/LoginPage/LoginPage.tsx | 14 ++-- src/auth/components/LoginPage/form.tsx | 6 +- src/auth/components/LoginPage/messages.ts | 2 +- .../NewPasswordPage.stories.tsx | 6 +- .../NewPasswordPage/NewPasswordPage.tsx | 10 +-- .../ResetPasswordPage.stories.tsx | 6 +- .../ResetPasswordPage/ResetPasswordPage.tsx | 16 ++--- .../ResetPasswordSuccessPage.stories.tsx | 4 +- .../ResetPasswordSuccessPage.tsx | 4 +- src/auth/components/SectionRoute.tsx | 2 +- src/auth/errors.ts | 2 +- src/auth/hooks/useAuthProvider.ts | 24 +++---- src/auth/misc.ts | 2 +- src/auth/types.ts | 2 +- src/auth/urls.ts | 2 +- src/auth/utils.ts | 8 +-- src/auth/views/Login.tsx | 8 +-- src/auth/views/NewPassword.tsx | 2 +- src/auth/views/ResetPassword.tsx | 10 +-- src/auth/views/ResetPasswordSuccess.tsx | 4 +- .../CategoryBackground/CategoryBackground.tsx | 16 ++--- .../CategoryCratePage.stories.tsx | 4 +- .../CategoryCreatePage/CategoryCreatePage.tsx | 20 +++--- .../components/CategoryCreatePage/form.tsx | 16 ++--- .../CategoryDeleteDialog.tsx | 6 +- .../CategoryDetailsForm.tsx | 16 ++--- .../components/CategoryList/CategoryList.tsx | 27 +++---- .../CategoryListPage.stories.tsx | 10 +-- .../CategoryListPage/CategoryListPage.tsx | 18 ++--- .../CategoryProductList.tsx | 24 +++---- .../CategoryProducts/CategoryProducts.tsx | 12 ++-- .../CategoryUpdatePage.stories.tsx | 12 ++-- .../CategoryUpdatePage/CategoryUpdatePage.tsx | 32 ++++----- .../components/CategoryUpdatePage/form.tsx | 22 +++--- src/categories/fixtures.ts | 2 +- src/categories/index.tsx | 4 +- src/categories/urls.ts | 2 +- src/categories/views/CategoryCreate.tsx | 14 ++-- src/categories/views/CategoryDetails.tsx | 30 ++++---- .../views/CategoryList/CategoryList.tsx | 32 ++++----- src/categories/views/CategoryList/filter.ts | 2 +- src/categories/views/CategoryList/sort.ts | 6 +- .../AssignmentList/AssignmentList.tsx | 4 +- .../AssignmentList/AssignmentListFooter.tsx | 6 +- .../AssignmentList/AssignmentListHeader.tsx | 4 +- .../components/AssignmentList/Item.tsx | 2 +- .../components/AssignmentList/types.ts | 2 +- .../ChannelAllocationStrategy.tsx | 8 +-- .../ChannelDeleteDialog.tsx | 10 +-- .../components/ChannelForm/ChannelForm.tsx | 40 +++++------ .../ChannelPickerDialog.tsx | 10 +-- .../ChannelStatus/ChannelStatus.tsx | 4 +- .../ShippingZones/ShippingZones.tsx | 10 +-- .../components/Warehouses/Warehouses.tsx | 10 +-- src/channels/fixtures.ts | 2 +- src/channels/index.tsx | 4 +- .../ChannelDetailsPage.stories.tsx | 8 +-- .../ChannelDetailsPage/ChannelDetailsPage.tsx | 40 +++++------ .../pages/ChannelDetailsPage/handlers.ts | 12 ++-- .../pages/ChannelDetailsPage/types.ts | 7 +- .../ChannelsListPage.stories.tsx | 6 +- .../ChannelsListPage/ChannelsListPage.tsx | 32 ++++----- src/channels/urls.ts | 2 +- src/channels/utils.ts | 14 ++-- src/channels/validation.ts | 2 +- .../views/ChannelCreate/ChannelCreate.tsx | 28 ++++---- .../views/ChannelDetails/ChannelDetails.tsx | 36 +++++----- src/channels/views/ChannelDetails/handlers.ts | 6 +- .../views/ChannelDetails/useShippingZones.ts | 10 +-- .../views/ChannelDetails/useWarehouses.ts | 10 +-- .../views/ChannelsList/ChannelsList.tsx | 14 ++-- .../CollectionCreatePage.stories.tsx | 8 +-- .../CollectionCreatePage.tsx | 30 ++++---- .../components/CollectionCreatePage/form.tsx | 22 +++--- .../CollectionDetails/CollectionDetails.tsx | 16 ++--- .../CollectionDetailsPage.stories.tsx | 12 ++-- .../CollectionDetailsPage.tsx | 30 ++++---- .../components/CollectionDetailsPage/form.tsx | 28 ++++---- .../CollectionImage/CollectionImage.tsx | 16 ++--- .../CollectionList/CollectionList.tsx | 38 +++++----- .../CollectionListPage.stories.tsx | 6 +- .../CollectionListPage/CollectionListPage.tsx | 18 ++--- .../components/CollectionListPage/filters.ts | 12 ++-- .../CollectionProducts/CollectionProducts.tsx | 30 ++++---- src/collections/fixtures.ts | 4 +- src/collections/index.tsx | 4 +- src/collections/urls.ts | 4 +- src/collections/utils.ts | 7 +- src/collections/views/CollectionCreate.tsx | 28 ++++---- src/collections/views/CollectionDetails.tsx | 50 ++++++------- .../views/CollectionList/CollectionList.tsx | 40 +++++------ .../views/CollectionList/filters.test.ts | 10 +-- .../views/CollectionList/filters.ts | 13 ++-- src/collections/views/CollectionList/sort.ts | 6 +- .../AccountPermissionGroups.tsx | 12 ++-- .../AccountPermissions/AccountPermissions.tsx | 8 +-- src/components/AccountPermissions/utils.ts | 2 +- src/components/ActionDialog/ActionDialog.tsx | 2 +- src/components/ActionDialog/DialogButtons.tsx | 2 +- src/components/AddressEdit/AddressEdit.tsx | 12 ++-- .../AddressEdit/createCountryHandler.ts | 4 +- .../AddressEdit/useAddressValidation.test.ts | 6 +- .../AddressEdit/useAddressValidation.ts | 2 +- .../AppLayout/AppChannelContext.tsx | 8 +-- src/components/AppLayout/AppChannelSelect.tsx | 6 +- src/components/AppLayout/AppLayout.tsx | 6 +- src/components/AppLayout/menuStructure.ts | 18 ++--- src/components/AppLayout/utils.ts | 8 +-- .../AssignAttributeDialog.tsx | 26 +++---- .../AssignAttributeValueDialog.tsx | 4 +- .../AssignCategoryDialog.tsx | 4 +- .../AssignCollectionDialog.tsx | 4 +- .../AssignContainerDialog.tsx | 10 +-- .../AssignProductDialog.tsx | 20 +++--- .../AssignVariantDialog.tsx | 20 +++--- src/components/AssignVariantDialog/utils.ts | 6 +- .../AttributeUnassignDialog.tsx | 2 +- src/components/Attributes/AttributeRow.tsx | 34 ++++----- src/components/Attributes/Attributes.tsx | 16 ++--- .../Attributes/BasicAttributeRow.tsx | 2 +- .../Attributes/ExtendedAttributeRow.tsx | 4 +- src/components/Attributes/SwatchRow.tsx | 12 ++-- src/components/Attributes/fixtures.ts | 2 +- src/components/Attributes/types.ts | 8 +-- src/components/Attributes/utils.ts | 18 ++--- .../AutocompleteSelectMenu.tsx | 2 +- src/components/BackButton.tsx | 4 +- src/components/Backlink/Backlink.tsx | 2 +- .../BulkAttributeUnassignDialog.tsx | 2 +- src/components/Button/Button.tsx | 2 +- .../ButtonWithSelect/ButtonWithSelect.tsx | 2 +- .../ChannelAvailabilityItemContent.tsx | 14 ++-- .../ChannelAvailabilityItemWrapper.tsx | 4 +- .../ChannelsAvailabilityCard.tsx | 10 +-- .../ChannelsAvailabilityCardWrapper.tsx | 10 +-- .../ChannelsAvailabilityCard/types.tsx | 2 +- .../ChannelsAvailabilityCard/utils.ts | 4 +- .../ChannelsAvailabilityContent.tsx | 6 +- .../ChannelsAvailabilityDialog.tsx | 4 +- ...ChannelsAvailabilityDialogChannelsList.tsx | 6 +- .../ChannelsAvailabilityDialogWrapper.tsx | 6 +- .../ChannelsAvailabilityDropdown/utils.ts | 2 +- .../ChannelsAvailabilityMenuContent.tsx | 6 +- src/components/ColorPicker/ColorPicker.tsx | 8 +-- src/components/ColumnPicker/ColumnPicker.tsx | 6 +- .../ColumnPicker/ColumnPickerButton.tsx | 2 +- .../ColumnPicker/ColumnPickerContent.tsx | 8 +-- .../CompanyAddressForm.tsx | 22 +++--- src/components/ConfirmButton.tsx | 2 +- src/components/CountryList/CountryList.tsx | 12 ++-- src/components/Datagrid/Datagrid.tsx | 2 +- src/components/Datagrid/Header.tsx | 2 +- src/components/Datagrid/cells.ts | 4 +- src/components/Datagrid/useCells.ts | 2 +- src/components/Datagrid/useColumns.ts | 4 +- src/components/Datagrid/useDatagridChange.ts | 2 +- src/components/Datagrid/useFullScreenMode.ts | 2 +- src/components/Date/Date.tsx | 2 +- .../DateTimeField/DateTimeField.tsx | 12 ++-- src/components/DateTimeTimezoneField.tsx | 4 +- src/components/DeleteButton/DeleteButton.tsx | 4 +- src/components/DemoBanner/DemoBanner.tsx | 2 +- .../EditableTableCell/EditableTableCell.tsx | 2 +- .../ErrorPage/ErrorPage.stories.tsx | 6 +- src/components/ErrorPage/ErrorPage.tsx | 4 +- .../FileUploadField/FileUploadField.tsx | 6 +- src/components/FileUploadField/fixtures.ts | 2 +- .../Filter/FilterAutocompleteField.tsx | 2 +- .../Filter/FilterContent/FilterContent.tsx | 6 +- .../FilterContent/FilterContentBody.tsx | 12 ++-- .../FilterContent/FilterContentHeader.tsx | 4 +- .../FilterContent/FilterDateTimeField.tsx | 6 +- .../Filter/FilterContent/FilterErrorsList.tsx | 4 +- .../FilterContent/FilterNumericField.tsx | 4 +- .../FilterContent/FilterSingleSelectField.tsx | 6 +- src/components/Filter/FilterContent/utils.ts | 4 +- src/components/Filter/FilterKeyValueField.tsx | 2 +- src/components/Filter/FilterOptionField.tsx | 2 +- src/components/Filter/reducer.ts | 2 +- src/components/Filter/types.ts | 4 +- src/components/FilterBar/FilterBar.tsx | 2 +- src/components/Form/ExitFormDialog.tsx | 2 +- src/components/Form/Form.tsx | 5 +- src/components/Form/types.ts | 2 +- .../Form/useExitFormDialog.test.tsx | 2 +- .../Form/useExitFormDialogProvider.tsx | 2 +- src/components/IconButton/IconButton.tsx | 2 +- .../LanguageSwitch/LanguageSwitch.tsx | 2 +- src/components/Link.tsx | 2 +- src/components/LinkChoice/LinkChoice.tsx | 4 +- src/components/Locale/Locale.tsx | 2 +- src/components/MediaTile/MediaTile.tsx | 2 +- src/components/Metadata/Metadata.test.tsx | 2 +- src/components/Metadata/Metadata.tsx | 6 +- src/components/Metadata/MetadataCard.tsx | 8 +-- src/components/Metadata/types.ts | 2 +- src/components/Metadata/utils.ts | 2 +- src/components/Money/Money.tsx | 2 +- .../MultiAutocompleteSelectField.tsx | 4 +- .../MultiAutocompleteSelectFieldContent.tsx | 12 ++-- src/components/Navigator/Navigator.tsx | 6 +- src/components/Navigator/modes/catalog.ts | 12 ++-- .../Navigator/modes/commands/actions.ts | 16 ++--- src/components/Navigator/modes/customers.ts | 8 +-- .../Navigator/modes/default/default.ts | 4 +- .../Navigator/modes/default/views.ts | 42 +++++------ src/components/Navigator/modes/index.ts | 4 +- src/components/Navigator/modes/orders.ts | 8 +-- src/components/Navigator/modes/types.ts | 4 +- .../Navigator/queries/useCatalogSearch.ts | 4 +- .../queries/useCheckIfOrderExists.ts | 4 +- src/components/Navigator/useQuickSearch.ts | 18 ++--- .../NavigatorButton/NavigatorButton.tsx | 2 +- .../NotFoundPage/NotFoundPage.stories.tsx | 2 +- src/components/NotFoundPage/NotFoundPage.tsx | 2 +- .../PageSectionHeader/PageSectionHeader.tsx | 2 +- src/components/PhoneField/PhoneField.tsx | 2 +- src/components/PriceField/usePriceField.ts | 2 +- src/components/RequirePermissions.tsx | 4 +- src/components/RichTextEditor/consts.ts | 2 +- .../SaveFilterTabDialog.tsx | 2 +- src/components/Savebar.tsx | 2 +- src/components/SearchBar/SearchBar.tsx | 4 +- src/components/SeoForm/SeoForm.tsx | 10 +-- src/components/Shop/index.tsx | 4 +- src/components/Shop/queries.ts | 4 +- .../SingleAutocompleteSelectField.tsx | 6 +- .../SingleAutocompleteSelectFieldContent.tsx | 8 +-- .../SortableChipsField/SortableChipsField.tsx | 2 +- .../SortableTable/SortableTableBody.tsx | 2 +- src/components/TableHead/TableHead.tsx | 2 +- .../TablePaginationActions.tsx | 2 +- .../TablePaginationWithContext.tsx | 2 +- src/components/TableRowLink/TableRowLink.tsx | 2 +- .../TextWithSelectField.tsx | 6 +- src/components/Timeline/Timeline.tsx | 2 +- .../Timeline/TimelineEventHeader.tsx | 2 +- .../TypeDeleteWarningDialog.tsx | 4 +- .../TypeDeleteWarningDialogContent.tsx | 8 +-- src/components/UserChip/UserChip.tsx | 6 +- .../VisibilityCard/VisibilityCard.tsx | 18 ++--- src/components/WindowTitle/index.tsx | 2 +- .../messages/MessageManagerProvider.tsx | 4 +- .../ConfigurationPage.stories.tsx | 8 +-- src/configuration/ConfigurationPage.tsx | 4 +- src/configuration/index.tsx | 66 ++++++++--------- src/configuration/types.ts | 2 +- src/configuration/utils.ts | 4 +- .../BackgroundTasksProvider.test.tsx | 2 +- .../BackgroundTasksProvider.tsx | 4 +- src/containers/BackgroundTasks/tasks.ts | 6 +- .../ServiceWorker/ServiceWorker.tsx | 4 +- .../CustomAppCreatePage.tsx | 28 ++++---- .../CustomAppDefaultToken.tsx | 6 +- .../CustomAppDetailsPage.tsx | 32 ++++----- .../CustomAppInformation.tsx | 10 +-- .../CustomAppListPage/CustomAppListPage.tsx | 20 +++--- .../CustomAppTokens/CustomAppTokens.tsx | 14 ++-- .../TokenCreateDialog/TokenCreateDialog.tsx | 18 ++--- .../TokenDeleteDialog/TokenDeleteDialog.tsx | 2 +- .../WebhookDeleteDialog.tsx | 2 +- .../WebhookDetailsPage.stories.tsx | 4 +- .../WebhookDetailsPage/WebhookDetailsPage.tsx | 32 ++++----- .../components/WebhookDetailsPage/messages.ts | 6 +- .../WebhookEvents/WebhookEvents.tsx | 16 ++--- .../components/WebhookInfo/WebhookInfo.tsx | 16 ++--- .../WebhookStatus/WebhookStatus.tsx | 6 +- .../components/WebhooksList/WebhooksList.tsx | 26 +++---- src/custom-apps/fixtures.ts | 2 +- src/custom-apps/handlers.ts | 6 +- src/custom-apps/index.tsx | 4 +- src/custom-apps/urls.ts | 2 +- src/custom-apps/utils.test.ts | 4 +- src/custom-apps/utils.tsx | 6 +- .../views/CustomAppCreate/CustomAppCreate.tsx | 16 ++--- .../CustomAppDetails/CustomAppDetails.tsx | 36 +++++----- src/custom-apps/views/CustomAppList.tsx | 20 +++--- .../views/CustomAppWebhookCreate.tsx | 12 ++-- .../views/CustomAppWebhookDetails.tsx | 10 +-- .../CustomerAddress/CustomerAddress.tsx | 10 +-- .../CustomerAddressChoiceCard.tsx | 6 +- .../CustomerAddressDialog.tsx | 34 ++++----- .../CustomerAddressListPage.stories.tsx | 2 +- .../CustomerAddressListPage.tsx | 14 ++-- .../CustomerAddresses/CustomerAddresses.tsx | 12 ++-- .../CustomerCreateAddress.tsx | 10 +-- .../CustomerCreateDetails.tsx | 10 +-- .../CustomerCreateNote/CustomerCreateNote.tsx | 10 +-- .../CustomerCreatePage.stories.tsx | 4 +- .../CustomerCreatePage/CustomerCreatePage.tsx | 34 ++++----- .../CustomerDetails/CustomerDetails.tsx | 14 ++-- .../CustomerDetailsPage.stories.tsx | 6 +- .../CustomerDetailsPage.tsx | 45 ++++++------ .../components/CustomerInfo/CustomerInfo.tsx | 14 ++-- .../components/CustomerList/CustomerList.tsx | 38 ++++++---- .../CustomerListPage.stories.tsx | 8 +-- .../CustomerListPage/CustomerListPage.tsx | 28 ++++---- .../components/CustomerListPage/filters.ts | 10 +-- .../CustomerOrders/CustomerOrders.tsx | 20 +++--- .../CustomerStats/CustomerStats.tsx | 12 ++-- src/customers/fixtures.ts | 4 +- src/customers/hooks/useCustomerDetails.ts | 2 +- src/customers/index.tsx | 4 +- .../providers/CustomerDetailsProvider.tsx | 5 +- src/customers/urls.ts | 2 +- src/customers/views/CustomerAddresses.tsx | 18 ++--- src/customers/views/CustomerCreate.tsx | 8 +-- src/customers/views/CustomerDetails.tsx | 20 +++--- .../views/CustomerList/CustomerList.tsx | 40 +++++------ .../views/CustomerList/filters.test.ts | 12 ++-- src/customers/views/CustomerList/filters.ts | 8 +-- src/customers/views/CustomerList/sort.ts | 6 +- .../DiscountCategories/DiscountCategories.tsx | 27 +++---- .../DiscountCollections.tsx | 27 +++---- .../DiscountCountrySelectDialog.tsx | 22 +++--- .../DiscountDates/DiscountDates.tsx | 14 ++-- .../DiscountProducts/DiscountProducts.tsx | 29 ++++---- .../components/DiscountProducts/styles.ts | 2 +- .../DiscountVariants/DiscountVariants.tsx | 24 +++---- .../components/DiscountVariants/styles.ts | 2 +- .../SaleCreatePage/SaleCreatePage.stories.tsx | 8 +-- .../SaleCreatePage/SaleCreatePage.tsx | 32 ++++----- .../SaleDetailsPage.stories.tsx | 14 ++-- .../SaleDetailsPage/SaleDetailsPage.tsx | 42 +++++------ .../components/SaleInfo/SaleInfo.tsx | 10 +-- .../components/SaleList/SaleList.tsx | 41 ++++++----- .../SaleListPage/SaleListPage.stories.tsx | 12 ++-- .../components/SaleListPage/SaleListPage.tsx | 20 +++--- .../components/SaleListPage/filters.ts | 10 +-- .../components/SaleSummary/SaleSummary.tsx | 22 +++--- .../components/SaleType/SaleType.tsx | 10 +-- .../components/SaleValue/SaleValue.tsx | 16 ++--- .../SaleValue/SaleValueTextField.tsx | 2 +- .../VoucherCreatePage.stories.tsx | 8 +-- .../VoucherCreatePage/VoucherCreatePage.tsx | 38 +++++----- .../components/VoucherDates/VoucherDates.tsx | 14 ++-- .../VoucherDetailsPage.stories.tsx | 12 ++-- .../VoucherDetailsPage/VoucherDetailsPage.tsx | 47 +++++++------ .../components/VoucherInfo/VoucherInfo.tsx | 12 ++-- .../VoucherLimits/VoucherLimits.tsx | 12 ++-- .../components/VoucherList/VoucherList.tsx | 41 ++++++----- .../VoucherListPage.stories.tsx | 12 ++-- .../VoucherListPage/VoucherListPage.tsx | 23 +++--- .../components/VoucherListPage/filters.ts | 10 +-- .../VoucherRequirements.tsx | 28 ++++---- .../VoucherSummary/VoucherSummary.tsx | 25 ++++--- .../components/VoucherTypes/VoucherTypes.tsx | 14 ++-- .../components/VoucherValue/VoucherValue.tsx | 30 ++++---- src/discounts/data.ts | 4 +- src/discounts/fixtures.ts | 2 +- src/discounts/handlers.ts | 20 +++--- src/discounts/index.tsx | 4 +- src/discounts/translations.ts | 2 +- src/discounts/urls.ts | 4 +- src/discounts/views/SaleCreate/SaleCreate.tsx | 30 ++++---- src/discounts/views/SaleCreate/handlers.ts | 8 +-- .../views/SaleDetails/SaleDetails.tsx | 60 ++++++++-------- src/discounts/views/SaleDetails/handlers.ts | 8 +-- src/discounts/views/SaleList/SaleList.tsx | 45 ++++++------ src/discounts/views/SaleList/filters.test.ts | 12 ++-- src/discounts/views/SaleList/filters.ts | 13 ++-- src/discounts/views/SaleList/sort.ts | 6 +- .../views/VoucherCreate/VoucherCreate.tsx | 24 +++---- src/discounts/views/VoucherCreate/handlers.ts | 13 ++-- .../views/VoucherDetails/VoucherDetails.tsx | 58 +++++++-------- .../views/VoucherDetails/handlers.ts | 15 ++-- .../views/VoucherList/VoucherList.tsx | 42 +++++------ .../views/VoucherList/filters.test.ts | 12 ++-- src/discounts/views/VoucherList/filters.ts | 13 ++-- src/discounts/views/VoucherList/sort.ts | 6 +- src/fixtures.ts | 2 +- .../GiftCardBulkCreateDialog.tsx | 14 ++-- .../GiftCardBulkCreateDialogForm.tsx | 20 +++--- .../GiftCardBulkCreateDialog/types.ts | 4 +- .../GiftCardBulkCreateDialog/utils.ts | 2 +- .../GiftCardBulkCreateSuccessDialog.tsx | 4 +- .../GiftCardCreateDialogCodeContent.tsx | 12 ++-- .../GiftCardCreateDialogContent.tsx | 10 +-- .../GiftCardCreateDialogForm.tsx | 20 +++--- .../GiftCardCreateExpirySelect.tsx | 22 +++--- .../GiftCardCreateMoneyInput.tsx | 10 +-- ...iftCardCreateRequiresActivationSection.tsx | 4 +- .../GiftCardCustomerSelectField.tsx | 12 ++-- src/giftCards/GiftCardCreateDialog/types.ts | 4 +- src/giftCards/GiftCardCreateDialog/utils.ts | 6 +- .../GiftCardExportDialogContent.tsx | 32 ++++----- .../GiftCardExportDialogContent/utils.ts | 4 +- .../GiftCardExpirySettingsCard.tsx | 6 +- .../GiftCardSettings/GiftCardSettingsPage.tsx | 22 +++--- src/giftCards/GiftCardSettings/messages.ts | 4 +- src/giftCards/GiftCardSettings/types.ts | 2 +- src/giftCards/GiftCardSettings/utils.ts | 2 +- .../GiftCardHistory/GiftCardHistory.tsx | 14 ++-- .../GiftCardHistory/GiftCardTimelineEvent.tsx | 14 ++-- .../GiftCardResendCodeDialog.tsx | 29 ++++---- .../GiftCardResendCodeDialog/utils.ts | 4 +- .../GiftCardUpdateBalanceDialog.tsx | 16 ++--- .../GiftCardUpdateDetailsBalanceSection.tsx | 6 +- .../GiftCardUpdateDetailsCard.tsx | 14 ++-- .../GiftCardUpdateExpirySelect.tsx | 10 +-- .../GiftCardUpdateInfoCard.tsx | 4 +- .../GiftCardUpdateInfoCardContent.tsx | 24 +++---- .../GiftCardUpdate/GiftCardUpdatePage.tsx | 12 ++-- .../GiftCardEnableDisableSection.tsx | 2 +- .../GiftCardUpdatePageHeader.tsx | 16 ++--- .../hooks/useGiftCardActivateToggle.ts | 6 +- src/giftCards/GiftCardUpdate/messages.ts | 4 +- .../GiftCardDetailsProvider.tsx | 5 +- .../GiftCardUpdateDialogsProvider.tsx | 8 +-- .../GiftCardUpdateFormProvider.tsx | 26 +++---- .../hooks/useGiftCardUpdateForm.ts | 2 +- src/giftCards/GiftCardUpdate/types.ts | 2 +- .../GiftCardsList/GiftCardListPage.tsx | 4 +- .../GiftCardListSearchAndFilters.tsx | 28 ++++---- .../GiftCardListSearchAndFilters/filters.ts | 12 ++-- .../GiftCardListSearchAndFilters/types.ts | 2 +- .../GiftCardsListHeader.tsx | 12 ++-- .../GiftCardsListHeaderAlert.tsx | 2 +- .../GiftCardsListHeaderAlertContent.tsx | 8 +-- .../GiftCardsListOrderInfoCard.tsx | 4 +- .../GiftCardsListTable/GiftCardsListTable.tsx | 32 ++++----- .../GiftCardsListTableFooter.tsx | 6 +- .../BulkEnableDisableSection.tsx | 10 +-- .../GiftCardsListTableHeader.tsx | 16 ++--- .../GiftCardsList/GiftCardsListTable/utils.ts | 4 +- .../GiftCardListDialogsProvider.tsx | 14 ++-- .../GiftCardListProvider.tsx | 28 ++++---- .../providers/GiftCardListProvider/sort.ts | 4 +- src/giftCards/GiftCardsList/types.ts | 2 +- .../CustomerGiftCardsCard.tsx | 28 ++++---- .../CustomerGiftCardsCardListItem.tsx | 12 ++-- .../GiftCardDeleteDialogContent.tsx | 16 ++--- .../GiftCardListPageDeleteDialog.tsx | 10 +-- .../GiftCardUpdatePageDeleteDialog.tsx | 6 +- .../useGiftCardBulkDelete.tsx | 10 +-- .../useGiftCardSingleDelete.tsx | 8 +-- .../GiftCardSendToCustomer.tsx | 18 ++--- .../GiftCardSettingsExpirySelect.tsx | 12 ++-- .../GiftCardStatusChip/GiftCardStatusChip.tsx | 2 +- .../GiftCardTagInput/GiftCardTagInput.tsx | 21 +++--- .../components/GiftCardTagInput/utils.ts | 2 +- .../TimePeriodField/TimePeriodField.tsx | 6 +- src/giftCards/index.tsx | 6 +- src/giftCards/urls.ts | 2 +- src/graphql/hooks.generated.ts | 2 +- .../HomeActivityCard/HomeActivityCard.tsx | 10 +-- .../HomeActivityCard/activityMessages.ts | 2 +- src/home/components/HomeHeader/HomeHeader.tsx | 2 +- .../HomeNotificationTable.tsx | 10 +-- .../components/HomePage/HomePage.stories.tsx | 12 ++-- src/home/components/HomePage/HomePage.tsx | 16 ++--- .../HomeProductListCard.tsx | 18 ++--- src/home/components/HomeScreen.tsx | 6 +- src/home/fixtures.ts | 2 +- src/home/views/index.tsx | 10 +-- src/hooks/makeMutation.ts | 12 ++-- src/hooks/makeQuery.ts | 8 +-- .../makeTopLevelSearch/makeTopLevelSearch.ts | 2 +- src/hooks/makeTopLevelSearch/utils.ts | 4 +- src/hooks/useAddressValidation.ts | 8 +-- src/hooks/useBackgroundTask.ts | 2 +- src/hooks/useChannels.test.ts | 2 +- src/hooks/useChannels.ts | 10 +-- src/hooks/useChannelsSearch.ts | 4 +- src/hooks/useChannelsSearchWithLoadMore.ts | 2 +- src/hooks/useChoiceSearch.ts | 2 +- src/hooks/useCurrentDate.ts | 2 +- src/hooks/useDateLocalize.ts | 2 +- src/hooks/useForm.ts | 6 +- src/hooks/useFormset.ts | 2 +- src/hooks/useHandleFormSubmit.ts | 6 +- src/hooks/useListSettings.test.ts | 4 +- src/hooks/useListSettings.ts | 2 +- src/hooks/useLocale.ts | 2 +- src/hooks/useMultiAutocomplete.ts | 4 +- src/hooks/useNavigator.ts | 2 +- src/hooks/useNotifier/useNotifier.ts | 2 +- src/hooks/useNotifier/utils.ts | 6 +- src/hooks/useOnSetDefaultVariant.ts | 6 +- src/hooks/usePaginationReset.ts | 4 +- src/hooks/usePaginator.ts | 2 +- src/hooks/useSearchQuery.ts | 2 +- src/hooks/useShop.ts | 2 +- src/hooks/useSortRedirects.ts | 4 +- src/index.tsx | 6 +- src/marketplace/index.tsx | 18 ++--- .../marketplace-url-resolver.test.ts | 2 +- src/marketplace/marketplace-url-resolver.ts | 2 +- src/misc.ts | 4 +- .../MenuCreateDialog/MenuCreateDialog.tsx | 14 ++-- .../MenuDetailsPage.stories.tsx | 6 +- .../MenuDetailsPage/MenuDetailsPage.tsx | 22 +++--- .../components/MenuDetailsPage/tree.test.ts | 2 +- .../components/MenuDetailsPage/tree.ts | 2 +- .../MenuItemDialog/MenuItemDialog.tsx | 36 +++++----- .../components/MenuItems/MenuItems.tsx | 8 +-- src/navigation/components/MenuItems/tree.ts | 2 +- .../components/MenuList/MenuList.tsx | 28 ++++---- .../MenuListPage/MenuListPage.stories.tsx | 10 +-- .../components/MenuListPage/MenuListPage.tsx | 18 ++--- .../MenuProperties/MenuProperties.tsx | 10 +-- src/navigation/fixtures.ts | 2 +- src/navigation/index.tsx | 2 +- src/navigation/types.ts | 2 +- src/navigation/urls.ts | 2 +- src/navigation/views/MenuDetails/index.tsx | 20 +++--- .../views/MenuDetails/successHandlers.ts | 4 +- src/navigation/views/MenuDetails/utils.ts | 2 +- src/navigation/views/MenuList/MenuList.tsx | 32 ++++----- src/navigation/views/MenuList/sort.ts | 6 +- .../components/AllAppList/AllAppList.tsx | 2 +- .../AppActivateDialog.stories.tsx | 2 +- .../AppActivateDialog/AppActivateDialog.tsx | 6 +- .../AppDeactivateDialog.stories.tsx | 2 +- .../AppDeactivateDialog.tsx | 6 +- .../AppDeleteDialog.stories.tsx | 2 +- .../AppDeleteDialog/AppDeleteDialog.tsx | 4 +- .../AppListCard/AppListCard.test.tsx | 4 +- .../components/AppListCard/AppListCard.tsx | 4 +- .../AppListCard/AppListCardActions.tsx | 6 +- .../AppListCard/AppListCardDescription.tsx | 2 +- .../AppListCard/AppListCardIntegrations.tsx | 2 +- .../AppListCard/AppListCardLinks.tsx | 4 +- .../AppListPage/AppListPage.stories.tsx | 4 +- .../components/AppListPage/AppListPage.tsx | 12 ++-- src/new-apps/components/AppListPage/types.ts | 4 +- .../components/AppListPage/utils.test.ts | 4 +- src/new-apps/components/AppListPage/utils.ts | 6 +- .../AppManifestTableDisplay.tsx | 2 +- .../AppPermissions/AppPermissions.tsx | 2 +- .../InstallWithManifestFormButton.tsx | 6 +- .../InstalledAppList/InstalledAppList.tsx | 6 +- .../InstalledAppListRow.test.tsx | 11 +-- .../InstalledAppListRow.tsx | 14 ++-- src/new-apps/fixtures.ts | 2 +- src/new-apps/hooks/useMarketplaceApps.ts | 2 +- src/new-apps/index.tsx | 2 +- src/new-apps/types.ts | 2 +- src/new-apps/urls.ts | 4 +- src/new-apps/utils.ts | 2 +- src/new-apps/views/AppList/AppList.tsx | 43 ++++++------ .../OrderAddressFields/OrderAddressFields.tsx | 6 +- .../OrderBulkCancelDialog.tsx | 2 +- .../OrderCancelDialog/OrderCancelDialog.tsx | 14 ++-- .../OrderCannotCancelOrderDialog.tsx | 6 +- .../OrderCardTitle/OrderCardTitle.tsx | 8 +-- .../OrderChangeWarehouseDialog.tsx | 21 +++--- .../OrderChannelSectionCard.tsx | 10 +-- .../OrderCustomer/AddrssTextError.tsx | 6 +- .../OrderCustomer/OrderCustomer.tsx | 32 ++++----- .../OrderCustomer/PickupAnnotation.tsx | 6 +- .../OrderCustomerAddressEdit.tsx | 22 +++--- .../OrderCustomerAddressesEditDialog.tsx | 38 +++++----- .../OrderCustomerAddressesSearch.tsx | 14 ++-- .../OrderCustomerAddressesEditDialog/form.tsx | 14 ++-- .../OrderCustomerAddressesEditDialog/types.ts | 2 +- .../OrderCustomerAddressesEditDialog/utils.ts | 8 +-- .../OrderCustomerChangeDialog.tsx | 6 +- .../OrderCustomerChangeDialog/form.tsx | 4 +- .../OrderCustomerNote/OrderCustomerNote.tsx | 4 +- .../OrderDetailsPage.stories.tsx | 6 +- .../OrderDetailsPage/OrderDetailsPage.tsx | 42 +++++------ .../components/OrderDetailsPage/Title.tsx | 4 +- .../components/OrderDetailsPage/utils.ts | 2 +- .../OrderDiscountCommonModal/ModalTitle.tsx | 2 +- .../OrderDiscountCommonModal.tsx | 16 ++--- .../OrderDiscountCommonModal/types.ts | 2 +- .../OrderDraftCancelDialog.tsx | 10 +-- .../OrderDraftDetails/OrderDraftDetails.tsx | 10 +-- .../OrderDraftDetailsProducts.tsx | 16 ++--- .../TableLine.test.tsx | 2 +- .../OrderDraftDetailsProducts/TableLine.tsx | 16 ++--- .../TableLineForm.tsx | 8 +-- .../useLineAlerts.ts | 4 +- .../OrderDraftDetailsSummary.tsx | 18 ++--- .../OrderDraftList/OrderDraftList.tsx | 37 +++++----- .../OrderDraftListPage.stories.tsx | 8 +-- .../OrderDraftListPage/OrderDraftListPage.tsx | 20 +++--- .../components/OrderDraftListPage/filters.ts | 9 ++- .../OrderDraftPage/OrderDraftAlert.tsx | 2 +- .../OrderDraftPage/OrderDraftPage.stories.tsx | 10 +-- .../OrderDraftPage/OrderDraftPage.tsx | 34 ++++----- .../OrderDraftPage/storybook.utils.tsx | 6 +- .../OrderFulfillLine/OrderFulfillLine.tsx | 22 +++--- .../OrderFulfillPage.stories.tsx | 6 +- .../OrderFulfillPage/OrderFulfillPage.tsx | 56 +++++++-------- .../components/OrderFulfillPage/fixtures.ts | 4 +- .../OrderFulfillStockExceededDialog.tsx | 21 +++--- .../OrderFulfillStockExceededDialogLine.tsx | 13 ++-- .../ActionButtons.tsx | 6 +- .../ExtraInfoLines.tsx | 6 +- .../OrderFulfilledProductsCard.tsx | 10 +-- .../OrderFulfillmentApproveDialog.tsx | 16 ++--- .../OrderFulfillmentCancelDialog.tsx | 18 ++--- .../OrderFulfillmentSettings.tsx | 6 +- .../OrderFulfillmentTrackingDialog.tsx | 18 ++--- .../ExtendedDiscountTimelineEvent.tsx | 10 +-- .../MoneySection.tsx | 4 +- .../OrderHistory/ExtendedTimelineEvent.tsx | 6 +- .../OrderHistory/LinkedTimelineEvent.tsx | 8 +-- .../components/OrderHistory/OrderHistory.tsx | 14 ++-- .../components/OrderHistory/messages.ts | 2 +- src/orders/components/OrderHistory/utils.tsx | 8 +-- .../OrderInvoiceEmailSendDialog.tsx | 14 ++-- .../OrderInvoiceList/OrderInvoiceList.tsx | 16 ++--- src/orders/components/OrderLimitReached.tsx | 2 +- src/orders/components/OrderList/OrderList.tsx | 34 ++++----- .../OrderListPage/OrderListPage.stories.tsx | 12 ++-- .../OrderListPage/OrderListPage.tsx | 26 +++---- .../components/OrderListPage/filters.ts | 12 ++-- .../OrderMarkAsPaidDialog.tsx | 10 +-- .../components/OrderPayment/OrderPayment.tsx | 16 ++--- src/orders/components/OrderPayment/utils.ts | 4 +- .../OrderPaymentDialog/OrderPaymentDialog.tsx | 16 ++--- .../OrderPaymentVoidDialog.tsx | 12 ++-- .../OrderPriceLabel/OrderPriceLabel.tsx | 6 +- .../OrderProductAddDialog.tsx | 33 +++++---- .../components/OrderProductAddDialog/utils.ts | 2 +- .../OrderProductsCardHeader.tsx | 2 +- .../OrderProductsTableRow.tsx | 14 ++-- .../components/OrderRefund/OrderRefund.tsx | 4 +- .../OrderRefundFulfilledProducts.tsx | 18 ++--- .../OrderRefundFulfilledProducts/messages.ts | 2 +- .../OrderRefundPage.stories.tsx | 2 +- .../OrderRefundPage/OrderRefundPage.tsx | 18 ++--- .../components/OrderRefundPage/fixtures.ts | 2 +- .../components/OrderRefundPage/form.tsx | 10 +-- .../OrderRefundReturnAmount.tsx | 20 +++--- .../OrderRefundReturnAmountValues.tsx | 4 +- .../RefundAmountInput.tsx | 10 +-- .../OrderRefundReturnAmount/utils.ts | 8 +-- .../OrderRefundUnfulfilledProducts.tsx | 18 ++--- .../OrderReturnPage/OrderReturnPage.tsx | 18 ++--- .../MaximalButton.tsx | 2 +- .../ProductErrorCell.tsx | 2 +- .../ReturnItemsCard.tsx | 22 +++--- .../components/OrderReturnPage/form.tsx | 12 ++-- .../components/OrderReturnPage/utils.tsx | 6 +- .../OrderSettings/OrderSettings.tsx | 6 +- .../OrderSettingsPage.stories.tsx | 4 +- .../OrderSettingsPage/OrderSettingsPage.tsx | 22 +++--- .../components/OrderSettingsPage/form.tsx | 6 +- .../OrderShippingMethodEditDialog.tsx | 22 +++--- .../OrderUnfulfilledProductsCard.tsx | 12 ++-- src/orders/containers/OrderOperations.tsx | 2 +- src/orders/fixtures.ts | 9 ++- src/orders/index.tsx | 4 +- src/orders/urls.ts | 2 +- src/orders/utils/data.test.ts | 4 +- src/orders/utils/data.ts | 8 +-- .../views/OrderDetails/OrderDetails.tsx | 22 +++--- .../OrderDetails/OrderDetailsMessages.tsx | 14 ++-- .../OrderDetails/OrderDraftDetails/index.tsx | 30 ++++---- .../OrderDetails/OrderNormalDetails/index.tsx | 24 +++---- .../OrderUnconfirmedDetails/index.tsx | 26 +++---- .../views/OrderDraftList/OrderDraftList.tsx | 42 +++++------ .../views/OrderDraftList/filters.test.ts | 10 +-- src/orders/views/OrderDraftList/filters.ts | 8 +-- src/orders/views/OrderDraftList/sort.ts | 6 +- .../views/OrderFulfill/OrderFulfill.tsx | 18 ++--- src/orders/views/OrderList/OrderList.tsx | 38 +++++----- src/orders/views/OrderList/filters.test.ts | 12 ++-- src/orders/views/OrderList/filters.ts | 8 +-- src/orders/views/OrderList/sort.ts | 6 +- src/orders/views/OrderRefund/OrderRefund.tsx | 14 ++-- src/orders/views/OrderReturn/OrderReturn.tsx | 16 ++--- src/orders/views/OrderReturn/utils.tsx | 8 +-- src/orders/views/OrderSettings.tsx | 10 +-- .../PageTypeAttributes/PageTypeAttributes.tsx | 28 ++++---- .../PageTypeBulkDeleteDialog.tsx | 2 +- .../PageTypeCreatePage.stories.tsx | 4 +- .../PageTypeCreatePage/PageTypeCreatePage.tsx | 26 +++---- .../PageTypeDetails/PageTypeDetails.tsx | 10 +-- .../PageTypeDetailsPage.stories.tsx | 6 +- .../PageTypeDetailsPage.tsx | 36 +++++----- .../components/PageTypeList/PageTypeList.tsx | 23 +++--- .../PageTypeListPage.stories.tsx | 8 +-- .../PageTypeListPage/PageTypeListPage.tsx | 20 +++--- src/pageTypes/fixtures.ts | 2 +- .../hooks/usePageTypeDelete/types.ts | 4 +- .../usePageTypeDelete/usePageTypeDelete.tsx | 6 +- src/pageTypes/index.tsx | 4 +- src/pageTypes/urls.ts | 2 +- src/pageTypes/views/PageTypeCreate.tsx | 12 ++-- src/pageTypes/views/PageTypeDetails.tsx | 36 +++++----- .../views/PageTypeList/PageTypeList.tsx | 36 +++++----- src/pageTypes/views/PageTypeList/filters.ts | 2 +- src/pageTypes/views/PageTypeList/sort.ts | 6 +- .../PageDetailsPage.stories.tsx | 10 +-- .../PageDetailsPage/PageDetailsPage.tsx | 40 +++++------ src/pages/components/PageDetailsPage/form.tsx | 42 +++++------ src/pages/components/PageInfo/PageInfo.tsx | 18 ++--- src/pages/components/PageList/PageList.tsx | 24 +++---- .../PageListPage/PageListPage.stories.tsx | 10 +-- .../components/PageListPage/PageListPage.tsx | 16 ++--- .../PageListPage/PageListSearchAndFilters.tsx | 22 +++--- src/pages/components/PageListPage/filters.ts | 16 ++--- .../PageOrganizeContent.tsx | 16 ++--- .../PageTypePickerDialog.tsx | 10 +-- src/pages/fixtures.ts | 2 +- src/pages/index.tsx | 4 +- src/pages/urls.ts | 2 +- src/pages/utils/data.ts | 8 +-- src/pages/utils/handlers.ts | 2 +- src/pages/utils/validation.ts | 2 +- src/pages/views/PageCreate.tsx | 32 ++++----- src/pages/views/PageDetails.tsx | 34 ++++----- src/pages/views/PageList/PageList.tsx | 38 +++++----- src/pages/views/PageList/sort.ts | 9 ++- .../AssignMembersDialog.tsx | 42 ++++++----- .../MembersErrorDialog/MembersErrorDialog.tsx | 2 +- .../PermissionGroupCreatePage.stories.tsx | 4 +- .../PermissionGroupCreatePage.tsx | 29 ++++---- .../PermissionGroupDeleteDialog.tsx | 8 +-- .../PermissionGroupDetailsPage.stories.tsx | 4 +- .../PermissionGroupDetailsPage.tsx | 36 +++++----- .../PermissionGroupInfo.tsx | 12 ++-- .../PermissionGroupList.tsx | 28 ++++---- .../PermissionGroupListPage.stories.tsx | 6 +- .../PermissionGroupListPage.tsx | 14 ++-- .../PermissionGroupMemberList.tsx | 38 +++++----- .../UnassignMembersDialog.tsx | 2 +- src/permissionGroups/fixtures.ts | 4 +- src/permissionGroups/index.tsx | 4 +- src/permissionGroups/sort.ts | 4 +- src/permissionGroups/urls.ts | 4 +- src/permissionGroups/utils.ts | 2 +- .../PermissionGroupCreate.tsx | 16 ++--- .../PermissionGroupDetails.tsx | 36 +++++----- .../PermissionGroupList.tsx | 26 +++---- .../views/PermissionGroupList/sort.ts | 6 +- .../PluginAuthorization.tsx | 14 ++-- .../PluginDetailsChannelsCard.tsx | 4 +- .../PluginDetailsChannelsCardContent.tsx | 8 +-- .../components/PluginInfo/PluginInfo.tsx | 14 ++-- .../PluginSecretFieldDialog.tsx | 22 +++--- .../PluginSettings/PluginSettings.tsx | 16 ++--- .../PluginDetailsPage.stories.tsx | 4 +- .../PluginsDetailsPage/PluginsDetailsPage.tsx | 28 ++++---- .../PluginsList/PluginAvailabilityStatus.tsx | 4 +- .../GlobalConfigPluginPopupBody.tsx | 4 +- .../PluginAvailabilityStatusPopup.tsx | 6 +- .../PluginChannelAvailabilityCell.tsx | 4 +- .../PluginChannelConfigurationCell.tsx | 4 +- .../PluginsList/PluginListTableHead.tsx | 8 +-- .../components/PluginsList/PluginsList.tsx | 18 ++--- src/plugins/components/PluginsList/utils.ts | 4 +- .../PluginsListPage.stories.tsx | 12 ++-- .../PluginsListPage/PluginsListPage.tsx | 20 +++--- .../components/PluginsListPage/filters.ts | 10 +-- src/plugins/fixtures.ts | 2 +- src/plugins/index.tsx | 4 +- src/plugins/urls.ts | 2 +- src/plugins/utils.ts | 2 +- src/plugins/views/PluginDetails.test.ts | 2 +- src/plugins/views/PluginList/PluginList.tsx | 30 ++++---- src/plugins/views/PluginList/filters.test.ts | 12 ++-- src/plugins/views/PluginList/filters.ts | 15 ++-- src/plugins/views/PluginList/sort.ts | 6 +- src/plugins/views/PluginsDetails.tsx | 20 +++--- src/plugins/views/utils.ts | 2 +- .../ProductTypeAttributes.tsx | 28 ++++---- .../ProductTypeCreatePage.stories.tsx | 8 +-- .../ProductTypeCreatePage.tsx | 36 +++++----- .../ProductTypeDetails/ProductTypeDetails.tsx | 14 ++-- .../ProductTypeDetailsPage.stories.tsx | 10 +-- .../ProductTypeDetailsPage.tsx | 44 ++++++------ .../ProductTypeList/ProductTypeList.tsx | 26 +++---- .../ProductTypeListPage.stories.tsx | 10 +-- .../ProductTypeListPage.tsx | 20 +++--- .../components/ProductTypeListPage/filters.ts | 10 +-- .../ProductTypeShipping.tsx | 4 +- .../ProductTypeTaxes/ProductTypeTaxes.tsx | 12 ++-- .../ProductTypeVariantAttributes.tsx | 33 +++++---- src/productTypes/fixtures.ts | 4 +- src/productTypes/handlers.ts | 4 +- .../useProductTypeDelete.tsx | 8 +-- .../hooks/useProductTypeOperations.ts | 2 +- src/productTypes/index.tsx | 4 +- src/productTypes/urls.ts | 4 +- src/productTypes/views/ProductTypeCreate.tsx | 12 ++-- .../views/ProductTypeList/ProductTypeList.tsx | 34 ++++----- .../views/ProductTypeList/filters.test.ts | 10 +-- .../views/ProductTypeList/filters.ts | 8 +-- .../views/ProductTypeList/sort.ts | 6 +- .../views/ProductTypeUpdate/index.tsx | 42 +++++------ .../OrderDiscountProvider.tsx | 8 +-- .../OrderLineDiscountProvider.tsx | 10 +-- .../OrderDiscountProviders/types.ts | 4 +- .../OrderDiscountProviders/utils.ts | 4 +- .../ProductCategoryAndCollectionsForm.tsx | 8 +-- .../ProductCreatePage.stories.tsx | 19 ++--- .../ProductCreatePage/ProductCreatePage.tsx | 46 ++++++------ .../components/ProductCreatePage/form.tsx | 50 ++++++------- .../ProductDetailsForm/ProductDetailsForm.tsx | 20 +++--- .../ExportDialogSettings.tsx | 12 ++-- .../ProductExportDialog.tsx | 40 +++++------ .../ProductExportDialogInfo.tsx | 36 +++++----- .../ProductExportDialog/messages.ts | 2 +- .../components/ProductExportDialog/types.ts | 2 +- .../ProductExternalMediaDialog.tsx | 12 ++-- .../components/ProductList/ProductList.tsx | 52 +++++++------- .../ProductList/ProductListAttribute.tsx | 6 +- .../ProductListPage.stories.tsx | 18 ++--- .../ProductListPage/ProductListPage.tsx | 34 ++++----- .../components/ProductListPage/filters.ts | 14 ++-- .../components/ProductMedia/ProductMedia.tsx | 16 ++--- .../ProductMediaNavigation.tsx | 4 +- .../ProductMediaPage.stories.tsx | 4 +- .../ProductMediaPage/ProductMediaPage.tsx | 24 +++---- .../ProductOrganization.tsx | 30 ++++---- .../ProductShipping/ProductShipping.tsx | 10 +-- .../ProductStocks/CardAddItemsFooter.tsx | 2 +- .../ProductStocks/ProductStocks.tsx | 38 +++++----- .../components/ProductTaxes/ProductTaxes.tsx | 12 ++-- .../ProductTypePickerDialog.tsx | 10 +-- .../ProductChannelsListingsDialog.tsx | 12 ++-- .../ProductUpdatePage.stories.tsx | 14 ++-- .../ProductUpdatePage.test.tsx | 18 ++--- .../ProductUpdatePage/ProductUpdatePage.tsx | 54 +++++++------- .../components/ProductUpdatePage/form.tsx | 36 +++++----- .../ProductUpdatePage/formChannels.ts | 6 +- .../components/ProductUpdatePage/types.ts | 26 +++---- .../ProductUpdatePage/utils.test.ts | 2 +- .../components/ProductUpdatePage/utils.ts | 6 +- .../ProductVariantAttributes.tsx | 20 +++--- .../ChannelsAvailabilityCard/CardSkeleton.tsx | 2 +- .../ChannelsListItem.tsx | 2 +- .../CreateVariantTitle.tsx | 4 +- ...tailsChannelsAvailabilityCardContainer.tsx | 4 +- .../availabilityCount.ts | 2 +- .../VariantChannelsDialog/index.tsx | 10 +-- .../ProductVariantChannels/formOpretations.ts | 10 +-- .../ProductVariantChannels/types.ts | 2 +- .../ProductVariantCheckoutSettings.tsx | 10 +-- .../ProductVariantCreatePage.stories.tsx | 6 +- .../ProductVariantCreatePage.tsx | 32 ++++----- .../ProductVariantCreatePage/form.tsx | 34 ++++----- .../ProductVariantDeleteDialog.tsx | 4 +- .../ProductVariantEndPreorderDialog.tsx | 2 +- .../ProductVariantMediaSelectDialog.tsx | 10 +-- .../ProductVariantMedia.tsx | 8 +-- .../ProductVariantName/ProductVariantName.tsx | 10 +-- .../ProductVariantNavigation.tsx | 24 +++---- .../ProductVariantPage/ProductVariantPage.tsx | 36 +++++----- .../ProductVarinatPage.stories.tsx | 8 +-- .../components/ProductVariantPage/form.tsx | 40 +++++------ .../ProductVariantPrice.tsx | 34 ++++----- .../ProductVariantSetDefault.tsx | 2 +- .../ProductVariants/ProductVariants.tsx | 20 +++--- .../datagrid/getVariantChannelsInputs.ts | 2 +- .../components/ProductVariants/utils.tsx | 22 +++--- src/products/fixtures.ts | 6 +- src/products/index.tsx | 6 +- src/products/urls.ts | 2 +- src/products/utils/data.ts | 14 ++-- src/products/utils/handlers.test.ts | 2 +- src/products/utils/handlers.ts | 6 +- src/products/utils/validation.ts | 2 +- .../views/ProductCreate/ProductCreate.tsx | 55 ++++++++------- src/products/views/ProductCreate/handlers.ts | 16 ++--- src/products/views/ProductImage.tsx | 14 ++-- .../views/ProductList/ProductList.tsx | 70 +++++++++---------- .../views/ProductList/filters.test.ts | 10 +-- src/products/views/ProductList/filters.ts | 14 ++-- src/products/views/ProductList/fixtures.ts | 16 ++--- src/products/views/ProductList/sort.ts | 6 +- src/products/views/ProductList/utils.ts | 4 +- .../views/ProductUpdate/ProductUpdate.tsx | 46 ++++++------ .../views/ProductUpdate/handlers/errors.ts | 4 +- .../views/ProductUpdate/handlers/index.ts | 6 +- .../handlers/useProductUpdateHandler.ts | 20 +++--- .../ProductUpdate/handlers/utils.test.ts | 4 +- .../views/ProductUpdate/handlers/utils.ts | 16 ++--- .../views/ProductVariant/ProductVariant.tsx | 46 ++++++------ .../views/ProductVariant/useSubmitChannels.ts | 6 +- src/products/views/ProductVariantCreate.tsx | 32 ++++----- src/searches/useAttributeSearch.ts | 4 +- src/searches/useAttributeValueSearch.ts | 6 +- .../useAvailableInGridAttributesSearch.ts | 4 +- .../useAvailablePageAttributesSearch.ts | 4 +- .../useAvailableProductAttributeSearch.ts | 4 +- src/searches/useCategorySearch.ts | 4 +- src/searches/useCollectionSearch.ts | 4 +- src/searches/useCustomerSearch.ts | 4 +- src/searches/useGiftCardTagsSearch.ts | 4 +- src/searches/useOrderVariantSearch.ts | 4 +- src/searches/usePageSearch.ts | 4 +- src/searches/usePageTypeSearch.ts | 4 +- src/searches/usePermissionGroupSearch.ts | 4 +- src/searches/useProductSearch.ts | 4 +- src/searches/useProductTypeSearch.ts | 4 +- src/searches/useShippingZonesSearch.ts | 4 +- src/searches/useStaffMemberSearch.ts | 4 +- src/searches/useWarehouseSearch.ts | 4 +- .../DeleteShippingRateDialog.tsx | 4 +- .../components/OrderValue/OrderValue.tsx | 26 +++---- .../components/OrderWeight/OrderWeight.tsx | 16 ++--- .../components/PricingCard/PricingCard.tsx | 24 +++---- .../ShippingMethodProducts.tsx | 24 +++---- .../ShippingMethodProductsAddDialog.tsx | 28 ++++---- .../ShippingMethodTaxes.tsx | 12 ++-- .../ShippingRateInfo/ShippingRateInfo.tsx | 18 ++--- .../ShippingWeightUnitForm.tsx | 14 ++-- .../ShippingZoneAddWarehouseDialog.tsx | 40 +++++------ .../ShippingZoneCountriesAssignDialog.tsx | 28 ++++---- .../handlers.ts | 2 +- .../ShippingZoneCreatePage.stories.tsx | 6 +- .../ShippingZoneCreatePage.tsx | 26 +++---- .../ShippingZoneDetailsPage.stories.tsx | 8 +-- .../ShippingZoneDetailsPage.tsx | 38 +++++----- .../ShippingZoneDetailsPage/types.ts | 2 +- .../ShippingZoneDetailsPage/utils.ts | 4 +- .../ShippingZoneInfo/ShippingZoneInfo.tsx | 12 ++-- .../ShippingZonePostalCodeRangeDialog.tsx | 12 ++-- .../ShippingZonePostalCodes.tsx | 24 +++---- .../ShippingZoneRates/ShippingZoneRates.tsx | 24 +++---- .../ShippingZoneRatesCreatePage.stories.tsx | 6 +- .../ShippingZoneRatesCreatePage.tsx | 46 ++++++------ .../ShippingZoneRatesPage.stories.tsx | 10 +-- .../ShippingZoneRatesPage.tsx | 56 +++++++-------- .../components/ShippingZoneRatesPage/types.ts | 6 +- .../ChannelsSection.tsx | 12 ++-- .../ShippingZoneSettingsCard.tsx | 8 +-- .../WarehousesSection.tsx | 8 +-- .../ShippingZonesList/ShippingZonesList.tsx | 26 +++---- .../ShippingZonesListPage.stories.tsx | 8 +-- .../ShippingZonesListPage.tsx | 24 ++++--- .../UnassignDialog/UnassignDialog.tsx | 2 +- src/shipping/errors.ts | 4 +- src/shipping/fixtures.ts | 4 +- src/shipping/handlers.ts | 14 ++-- src/shipping/index.tsx | 2 +- src/shipping/urls.ts | 6 +- src/shipping/views/RateCreate.tsx | 32 ++++----- src/shipping/views/RateUpdate.tsx | 60 ++++++++-------- src/shipping/views/ShippingZoneCreate.tsx | 14 ++-- .../views/ShippingZoneDetails/index.tsx | 40 +++++------ src/shipping/views/ShippingZonesList.tsx | 34 ++++----- src/shipping/views/reducer.tsx | 2 +- src/shipping/views/utils.tsx | 4 +- .../SiteCheckoutSettingsCard.tsx | 8 +-- .../SiteSettingsPage.stories.tsx | 6 +- .../SiteSettingsPage/SiteSettingsPage.tsx | 38 +++++----- src/siteSettings/fixtures.ts | 2 +- src/siteSettings/urls.ts | 2 +- src/siteSettings/views/index.tsx | 8 +-- .../StaffAddMemberDialog.tsx | 26 +++---- .../StaffDetailsPage.stories.tsx | 6 +- .../StaffDetailsPage/StaffDetailsPage.tsx | 49 +++++++------ src/staff/components/StaffList/StaffList.tsx | 36 +++++----- .../StaffListPage/StaffListPage.stories.tsx | 12 ++-- .../StaffListPage/StaffListPage.tsx | 26 +++---- src/staff/components/StaffListPage/filters.ts | 8 +-- .../StaffPassword/StaffPassword.tsx | 4 +- .../StaffPasswordResetDialog.tsx | 22 +++--- .../StaffPreferences/StaffPreferences.tsx | 10 +-- .../StaffProperties/StaffProperties.tsx | 12 ++-- .../components/UserStatus/UserStatus.tsx | 4 +- src/staff/fixtures.ts | 6 +- src/staff/index.tsx | 4 +- src/staff/urls.ts | 2 +- src/staff/utils.ts | 2 +- src/staff/views/StaffDetails.tsx | 26 +++---- src/staff/views/StaffList/StaffList.tsx | 45 ++++++------ src/staff/views/StaffList/filters.test.ts | 10 +-- src/staff/views/StaffList/filters.ts | 11 +-- src/staff/views/StaffList/sort.ts | 6 +- src/storybook/Decorator.tsx | 6 +- src/storybook/MockedUserProvider.tsx | 6 +- src/storybook/PaginatorContextDecorator.tsx | 4 +- .../TaxCountryDialog/TaxCountryDialog.tsx | 12 ++-- src/taxes/components/TaxInput/TaxInput.tsx | 4 +- .../components/TaxPageTitle/TaxPageTitle.tsx | 6 +- src/taxes/fixtures.ts | 2 +- src/taxes/index.tsx | 2 +- .../TaxChannelsMenu/TaxChannelsMenu.tsx | 12 ++-- .../TaxChannelsPage.stories.tsx | 8 +-- .../pages/TaxChannelsPage/TaxChannelsPage.tsx | 32 ++++----- .../TaxCountryExceptionListItem.tsx | 10 +-- .../TaxSettingsCard/TaxSettingsCard.tsx | 18 ++--- .../TaxClassesMenu/TaxClassesMenu.tsx | 14 ++-- .../TaxClassesPage/TaxClassesPage.stories.tsx | 4 +- .../pages/TaxClassesPage/TaxClassesPage.tsx | 42 +++++------ src/taxes/pages/TaxClassesPage/form.tsx | 20 +++--- .../TaxCountriesMenu/TaxCountriesMenu.tsx | 14 ++-- .../TaxCountriesPage.stories.tsx | 4 +- .../TaxCountriesPage/TaxCountriesPage.tsx | 38 +++++----- src/taxes/pages/TaxCountriesPage/form.tsx | 12 ++-- src/taxes/types.ts | 6 +- src/taxes/urls.ts | 4 +- src/taxes/utils/data.ts | 6 +- src/taxes/utils/useTaxClassFetchMore.ts | 9 ++- src/taxes/utils/useTaxUrlRedirect.ts | 4 +- src/taxes/utils/utils.ts | 2 +- src/taxes/utils/validation.ts | 2 +- src/taxes/views/TaxChannelsList.tsx | 14 ++-- src/taxes/views/TaxClassesList.tsx | 14 ++-- src/taxes/views/TaxCountriesList.tsx | 14 ++-- .../ProductContextSwitcher.tsx | 14 ++-- .../TranslationFields/TranslationFields.tsx | 24 +++---- .../TranslationFieldsLong.tsx | 4 +- .../TranslationFieldsRich.tsx | 8 +-- .../TranslationFieldsSave.tsx | 4 +- .../TranslationFieldsShort.tsx | 4 +- .../useRichTextSubmit.test.ts | 4 +- .../TranslationFields/useRichTextSubmit.ts | 6 +- .../TranslationsAttributesPage.tsx | 24 +++---- .../TranslationsCategoriesPage.tsx | 23 +++--- .../TranslationsCollectionsPage.tsx | 20 +++--- .../TranslationsEntitiesList.tsx | 8 +-- .../TranslationsEntitiesListPage.stories.tsx | 8 +-- .../TranslationsEntitiesListPage.tsx | 12 ++-- .../TranslationsLanguageList.tsx | 10 +-- .../TranslationsLanguageListPage.stories.tsx | 2 +- .../TranslationsLanguageListPage.tsx | 6 +- .../TranslationsMenuItemPage.tsx | 21 +++--- .../TranslationsPagesPage.tsx | 22 +++--- .../TranslationsProductVariantsPage.tsx | 22 +++--- .../TranslationsProductsPage.tsx | 25 ++++--- .../TranslationsSalesPage.tsx | 18 ++--- .../TranslationsShippingMethodPage.tsx | 18 ++--- .../TranslationsVouchersPage.tsx | 21 +++--- src/translations/fixtures.ts | 2 +- src/translations/index.tsx | 4 +- src/translations/types.ts | 4 +- src/translations/urls.ts | 4 +- src/translations/utils.ts | 10 +-- .../EntityLists/TranslationsAttributeList.tsx | 10 +-- .../EntityLists/TranslationsCategoryList.tsx | 10 +-- .../TranslationsCollectionList.tsx | 10 +-- .../EntityLists/TranslationsMenuItemList.tsx | 10 +-- .../EntityLists/TranslationsPageList.tsx | 10 +-- .../EntityLists/TranslationsProductList.tsx | 10 +-- .../EntityLists/TranslationsSaleList.tsx | 10 +-- .../TranslationsShippingMethodList.tsx | 10 +-- .../EntityLists/TranslationsVoucherList.tsx | 10 +-- src/translations/views/EntityLists/types.ts | 6 +- .../views/TranslationsAttributes.tsx | 22 +++--- .../views/TranslationsCategories.tsx | 16 ++--- .../views/TranslationsCollections.tsx | 12 ++-- .../views/TranslationsEntities.tsx | 8 +-- .../views/TranslationsLanguageList.tsx | 2 +- .../views/TranslationsMenuItem.tsx | 14 ++-- src/translations/views/TranslationsPages.tsx | 16 ++--- .../views/TranslationsProductVariants.tsx | 12 ++-- .../views/TranslationsProducts.tsx | 14 ++-- src/translations/views/TranslationsSales.tsx | 14 ++-- .../views/TranslationsShippingMethod.tsx | 14 ++-- .../views/TranslationsVouchers.tsx | 12 ++-- src/types.ts | 2 +- src/utils/errors/account.ts | 2 +- src/utils/errors/app.ts | 2 +- src/utils/errors/attribute.ts | 2 +- src/utils/errors/channels.ts | 2 +- src/utils/errors/common.ts | 2 +- src/utils/errors/discounts.ts | 2 +- src/utils/errors/export.ts | 2 +- src/utils/errors/index.ts | 2 +- src/utils/errors/invoice.ts | 2 +- src/utils/errors/menu.ts | 2 +- src/utils/errors/order.ts | 2 +- src/utils/errors/page.ts | 2 +- src/utils/errors/permissionGroups.ts | 2 +- src/utils/errors/plugins.ts | 2 +- src/utils/errors/product.ts | 2 +- src/utils/errors/shipping.ts | 2 +- src/utils/errors/shop.ts | 2 +- src/utils/errors/staff.ts | 2 +- src/utils/errors/stock.ts | 2 +- src/utils/errors/taxes.ts | 2 +- src/utils/errors/warehouse.ts | 2 +- src/utils/errors/webhooks.ts | 2 +- src/utils/filters/fields.ts | 6 +- src/utils/filters/filters.ts | 6 +- .../handlers/attributeValueSearchHandler.ts | 6 +- src/utils/handlers/dialogActionHandlers.ts | 4 +- src/utils/handlers/filterHandlers.ts | 6 +- src/utils/handlers/filterMetadataArray.ts | 2 +- src/utils/handlers/metadataCreateHandler.ts | 4 +- src/utils/handlers/metadataUpdateHandler.ts | 8 +-- .../multiAutocompleteSelectChangeHandler.ts | 8 +-- .../handlers/nonNegativeValueChangeHandler.ts | 2 +- src/utils/handlers/queryChangeHandler.ts | 2 +- .../singleAutocompleteSelectChangeHandler.ts | 4 +- src/utils/handlers/sortHandler.ts | 6 +- src/utils/limits.ts | 2 +- src/utils/maps.ts | 10 +-- src/utils/metadata/getMetadata.ts | 2 +- .../metadata/useMetadataChangeTrigger.ts | 2 +- src/utils/richText/useMultipleRichText.ts | 2 +- src/utils/richText/useRichText.ts | 2 +- src/utils/sort.ts | 4 +- src/utils/urls.ts | 2 +- .../WarehouseCreatePage.stories.tsx | 6 +- .../WarehouseCreatePage.tsx | 38 +++++----- .../WarehouseDeleteDialog.tsx | 2 +- .../WarehouseDetailsPage.stories.tsx | 6 +- .../WarehouseDetailsPage.tsx | 40 +++++------ .../WarehouseInfo/WarehouseInfo.tsx | 12 ++-- .../WarehouseList/WarehouseList.tsx | 30 ++++---- .../WarehouseListPage.stories.tsx | 8 +-- .../WarehouseListPage/WarehouseListPage.tsx | 26 +++---- .../WarehouseSettings/WarehouseSettings.tsx | 24 +++---- src/warehouses/fixtures.ts | 4 +- src/warehouses/index.tsx | 4 +- src/warehouses/urls.ts | 2 +- .../views/WarehouseCreate/WarehouseCreate.tsx | 18 ++--- .../WarehouseDetails/WarehouseDetails.tsx | 24 +++---- .../views/WarehouseList/WarehouseList.tsx | 42 +++++------ src/warehouses/views/WarehouseList/filters.ts | 2 +- src/warehouses/views/WarehouseList/sort.ts | 6 +- testUtils/api.ts | 2 +- testUtils/filters.ts | 4 +- testUtils/mocks/address.ts | 2 +- testUtils/mocks/apps.ts | 2 +- testUtils/mocks/pageTypes.ts | 2 +- testUtils/mocks/warehouses.ts | 2 +- testUtils/wrapper.tsx | 8 +-- tsconfig.json | 2 +- vite.config.js | 16 +---- 1193 files changed, 6927 insertions(+), 6768 deletions(-) diff --git a/codegen.yml b/codegen.yml index 294fb5418..8e3841a9b 100644 --- a/codegen.yml +++ b/codegen.yml @@ -46,7 +46,7 @@ generates: typesPath: ./types.generated config: withHooks: true - apolloReactHooksImportFrom: "@saleor/hooks/graphql" + apolloReactHooksImportFrom: "@dashboard/hooks/graphql" plugins: - add: content: /* eslint-disable */ diff --git a/package-lock.json b/package-lock.json index 8b6c76bd7..9b4714fe7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2890,6 +2890,7 @@ "version": "0.5.0", "resolved": "https://registry.npmjs.org/@floating-ui/react-dom-interactions/-/react-dom-interactions-0.5.0.tgz", "integrity": "sha512-rfON7mkHjCeogd0BSXPa8GBp1TMxEytJQqGVlCouSUonJ4POqdHsqcxRnCh0yAaGVaL/nB/J1vq28V4RdoLszg==", + "deprecated": "Package renamed to @floating-ui/react", "dependencies": { "@floating-ui/react-dom": "^0.7.0", "aria-hidden": "^1.1.3", @@ -12053,9 +12054,9 @@ } }, "node_modules/aria-hidden": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.1.tgz", - "integrity": "sha512-PN344VAf9j1EAi+jyVHOJ8XidQdPVssGco39eNcsGdM4wcsILtxrKLkbuiMfLWYROK1FjRQasMWCBttrhjnr6A==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.2.tgz", + "integrity": "sha512-6y/ogyDTk/7YAe91T3E2PR1ALVKyM2QbTio5HwM+N1Q6CMlCKhvClyIjkckBswa0f2xJhjsfzIGa1yVSe1UMVA==", "dependencies": { "tslib": "^2.0.0" }, @@ -12073,9 +12074,9 @@ } }, "node_modules/aria-hidden/node_modules/tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", + "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" }, "node_modules/aria-query": { "version": "5.1.1", @@ -52608,17 +52609,17 @@ "dev": true }, "aria-hidden": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.1.tgz", - "integrity": "sha512-PN344VAf9j1EAi+jyVHOJ8XidQdPVssGco39eNcsGdM4wcsILtxrKLkbuiMfLWYROK1FjRQasMWCBttrhjnr6A==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.2.tgz", + "integrity": "sha512-6y/ogyDTk/7YAe91T3E2PR1ALVKyM2QbTio5HwM+N1Q6CMlCKhvClyIjkckBswa0f2xJhjsfzIGa1yVSe1UMVA==", "requires": { "tslib": "^2.0.0" }, "dependencies": { "tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", + "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" } } }, diff --git a/package.json b/package.json index bfde5bc98..cb084a8b2 100644 --- a/package.json +++ b/package.json @@ -234,7 +234,7 @@ "\\.(css)$": "identity-obj-proxy", "@assets(.*)$": "/assets/$1", "@locale(.*)$": "/locale/$1", - "@saleor(?!.*macaw)(?!.*sdk)(.*)$": "/src/$1", + "@dashboard(.*)$": "/src/$1", "@test/(.*)$": "/testUtils/$1", "^lodash-es(.*)$": "lodash/$1", "^@material-ui/core$": "/node_modules/@material-ui/core", diff --git a/src/apps/components/AppActivateDialog/AppActivateDialog.tsx b/src/apps/components/AppActivateDialog/AppActivateDialog.tsx index 02a4bffa5..a79e7b706 100644 --- a/src/apps/components/AppActivateDialog/AppActivateDialog.tsx +++ b/src/apps/components/AppActivateDialog/AppActivateDialog.tsx @@ -1,7 +1,7 @@ +import ActionDialog from "@dashboard/components/ActionDialog"; +import { getStringOrPlaceholder } from "@dashboard/misc"; import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { getStringOrPlaceholder } from "@saleor/misc"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/apps/components/AppDeactivateDialog/AppDeactivateDialog.tsx b/src/apps/components/AppDeactivateDialog/AppDeactivateDialog.tsx index 0491498ee..2a8bdde94 100644 --- a/src/apps/components/AppDeactivateDialog/AppDeactivateDialog.tsx +++ b/src/apps/components/AppDeactivateDialog/AppDeactivateDialog.tsx @@ -1,7 +1,7 @@ +import ActionDialog from "@dashboard/components/ActionDialog"; +import { getStringOrPlaceholder } from "@dashboard/misc"; import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { getStringOrPlaceholder } from "@saleor/misc"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/apps/components/AppDeleteDialog/AppDeleteDialog.tsx b/src/apps/components/AppDeleteDialog/AppDeleteDialog.tsx index 71c9d0c98..7d8f1ddf5 100644 --- a/src/apps/components/AppDeleteDialog/AppDeleteDialog.tsx +++ b/src/apps/components/AppDeleteDialog/AppDeleteDialog.tsx @@ -1,7 +1,7 @@ +import ActionDialog from "@dashboard/components/ActionDialog"; +import { getStringOrPlaceholder } from "@dashboard/misc"; import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { getStringOrPlaceholder } from "@saleor/misc"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/apps/components/AppDetailsPage/AppDetailsPage.stories.tsx b/src/apps/components/AppDetailsPage/AppDetailsPage.stories.tsx index 14b319258..204cf62fc 100644 --- a/src/apps/components/AppDetailsPage/AppDetailsPage.stories.tsx +++ b/src/apps/components/AppDetailsPage/AppDetailsPage.stories.tsx @@ -1,4 +1,4 @@ -import Decorator from "@saleor/storybook/Decorator"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/apps/components/AppDetailsPage/AppDetailsPage.tsx b/src/apps/components/AppDetailsPage/AppDetailsPage.tsx index ac014d5c8..c41e4b5b5 100644 --- a/src/apps/components/AppDetailsPage/AppDetailsPage.tsx +++ b/src/apps/components/AppDetailsPage/AppDetailsPage.tsx @@ -1,15 +1,15 @@ +import { appsListPath } from "@dashboard/apps/urls"; +import { Backlink } from "@dashboard/components/Backlink"; +import { Button } from "@dashboard/components/Button"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import CardTitle from "@dashboard/components/CardTitle"; +import Container from "@dashboard/components/Container"; +import ExternalLink from "@dashboard/components/ExternalLink"; +import PageHeader from "@dashboard/components/PageHeader"; +import Skeleton from "@dashboard/components/Skeleton"; +import { AppQuery } from "@dashboard/graphql"; +import { buttonMessages, sectionNames } from "@dashboard/intl"; import { ButtonBase, Card, CardContent, Typography } from "@material-ui/core"; -import { appsListPath } from "@saleor/apps/urls"; -import { Backlink } from "@saleor/components/Backlink"; -import { Button } from "@saleor/components/Button"; -import CardSpacer from "@saleor/components/CardSpacer"; -import CardTitle from "@saleor/components/CardTitle"; -import Container from "@saleor/components/Container"; -import ExternalLink from "@saleor/components/ExternalLink"; -import PageHeader from "@saleor/components/PageHeader"; -import Skeleton from "@saleor/components/Skeleton"; -import { AppQuery } from "@saleor/graphql"; -import { buttonMessages, sectionNames } from "@saleor/intl"; import React from "react"; import SVG from "react-inlinesvg"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/apps/components/AppFrame/AppFrame.tsx b/src/apps/components/AppFrame/AppFrame.tsx index 37d76ab85..d8c61a352 100644 --- a/src/apps/components/AppFrame/AppFrame.tsx +++ b/src/apps/components/AppFrame/AppFrame.tsx @@ -2,9 +2,9 @@ import { AppDetailsUrlQueryParams, getAppDeepPathFromDashboardUrl, resolveAppIframeUrl, -} from "@saleor/apps/urls"; -import useLocale from "@saleor/hooks/useLocale"; -import useShop from "@saleor/hooks/useShop"; +} from "@dashboard/apps/urls"; +import useLocale from "@dashboard/hooks/useLocale"; +import useShop from "@dashboard/hooks/useShop"; import { useTheme } from "@saleor/macaw-ui"; import clsx from "clsx"; import React, { useEffect } from "react"; diff --git a/src/apps/components/AppFrame/useAppActions.ts b/src/apps/components/AppFrame/useAppActions.ts index 4a83c92ad..31cbc719f 100644 --- a/src/apps/components/AppFrame/useAppActions.ts +++ b/src/apps/components/AppFrame/useAppActions.ts @@ -1,3 +1,7 @@ +import { appPath } from "@dashboard/apps/urls"; +import { getAppMountUri } from "@dashboard/config"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; import { Actions, DispatchResponseEvent, @@ -5,10 +9,6 @@ import { NotificationAction, RedirectAction, } from "@saleor/app-sdk/app-bridge"; -import { appPath } from "@saleor/apps/urls"; -import { getAppMountUri } from "@saleor/config"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; import React from "react"; import { useIntl } from "react-intl"; import { useLocation } from "react-router"; diff --git a/src/apps/components/AppInProgressDeleteDialog/AppInProgressDeleteDialog.tsx b/src/apps/components/AppInProgressDeleteDialog/AppInProgressDeleteDialog.tsx index ad3e0992b..9c1e84589 100644 --- a/src/apps/components/AppInProgressDeleteDialog/AppInProgressDeleteDialog.tsx +++ b/src/apps/components/AppInProgressDeleteDialog/AppInProgressDeleteDialog.tsx @@ -1,7 +1,7 @@ +import ActionDialog from "@dashboard/components/ActionDialog"; +import { getStringOrPlaceholder } from "@dashboard/misc"; import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { getStringOrPlaceholder } from "@saleor/misc"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/apps/components/AppInstallErrorPage/AppInstallErrorPage.tsx b/src/apps/components/AppInstallErrorPage/AppInstallErrorPage.tsx index 26b009ed6..75425a5d1 100644 --- a/src/apps/components/AppInstallErrorPage/AppInstallErrorPage.tsx +++ b/src/apps/components/AppInstallErrorPage/AppInstallErrorPage.tsx @@ -1,7 +1,7 @@ import errorImg from "@assets/images/app-install-error.svg"; +import { Button } from "@dashboard/components/Button"; +import Container from "@dashboard/components/Container"; import { Grid, Typography } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import Container from "@saleor/components/Container"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/apps/components/AppInstallPage/AppInstallPage.stories.tsx b/src/apps/components/AppInstallPage/AppInstallPage.stories.tsx index 7c15c2416..df3d8813a 100644 --- a/src/apps/components/AppInstallPage/AppInstallPage.stories.tsx +++ b/src/apps/components/AppInstallPage/AppInstallPage.stories.tsx @@ -1,4 +1,4 @@ -import Decorator from "@saleor/storybook/Decorator"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/apps/components/AppInstallPage/AppInstallPage.tsx b/src/apps/components/AppInstallPage/AppInstallPage.tsx index 8ad28b827..ec8cee28e 100644 --- a/src/apps/components/AppInstallPage/AppInstallPage.tsx +++ b/src/apps/components/AppInstallPage/AppInstallPage.tsx @@ -1,15 +1,15 @@ import saleorDarkLogoSmall from "@assets/images/logo-dark-small.svg"; import plusIcon from "@assets/images/plus-icon.svg"; +import { Button } from "@dashboard/components/Button"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import CardTitle from "@dashboard/components/CardTitle"; +import Container from "@dashboard/components/Container"; +import Hr from "@dashboard/components/Hr"; +import Skeleton from "@dashboard/components/Skeleton"; +import { AppFetchMutation, AppInstallMutation } from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import { buttonMessages } from "@dashboard/intl"; import { Card, CardContent, Grid, Typography } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardSpacer from "@saleor/components/CardSpacer"; -import CardTitle from "@saleor/components/CardTitle"; -import Container from "@saleor/components/Container"; -import Hr from "@saleor/components/Hr"; -import Skeleton from "@saleor/components/Skeleton"; -import { AppFetchMutation, AppInstallMutation } from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import { buttonMessages } from "@saleor/intl"; import clsx from "clsx"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/apps/components/AppPage/AppPage.stories.tsx b/src/apps/components/AppPage/AppPage.stories.tsx index d55d43177..b2ed77233 100644 --- a/src/apps/components/AppPage/AppPage.stories.tsx +++ b/src/apps/components/AppPage/AppPage.stories.tsx @@ -1,4 +1,4 @@ -import Decorator from "@saleor/storybook/Decorator"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/apps/components/AppPage/AppPage.tsx b/src/apps/components/AppPage/AppPage.tsx index 998d3eafb..9fb5bbb9b 100644 --- a/src/apps/components/AppPage/AppPage.tsx +++ b/src/apps/components/AppPage/AppPage.tsx @@ -1,5 +1,5 @@ -import Container from "@saleor/components/Container"; -import { AppQuery } from "@saleor/graphql"; +import Container from "@dashboard/components/Container"; +import { AppQuery } from "@dashboard/graphql"; import React from "react"; import { AppFrame } from "../AppFrame"; diff --git a/src/apps/components/AppPageTabs/AppPageTabs.tsx b/src/apps/components/AppPageTabs/AppPageTabs.tsx index 782936ddd..4e4d3161d 100644 --- a/src/apps/components/AppPageTabs/AppPageTabs.tsx +++ b/src/apps/components/AppPageTabs/AppPageTabs.tsx @@ -1,4 +1,4 @@ -import { AppPagePathSegment } from "@saleor/apps/hooks/useAppsPageNavigation"; +import { AppPagePathSegment } from "@dashboard/apps/hooks/useAppsPageNavigation"; import { PageTab, PageTabs } from "@saleor/macaw-ui"; import React, { ComponentProps } from "react"; import { useIntl } from "react-intl"; diff --git a/src/apps/components/AppPermissions/AppPermissions.tsx b/src/apps/components/AppPermissions/AppPermissions.tsx index a18e8bc89..06021babc 100644 --- a/src/apps/components/AppPermissions/AppPermissions.tsx +++ b/src/apps/components/AppPermissions/AppPermissions.tsx @@ -1,4 +1,4 @@ -import { AppPermissionFragment } from "@saleor/graphql"; +import { AppPermissionFragment } from "@dashboard/graphql"; import { IconButton, makeStyles, diff --git a/src/apps/components/AppsInProgress/AppsInProgress.tsx b/src/apps/components/AppsInProgress/AppsInProgress.tsx index 25feac9a3..5ac2fd494 100644 --- a/src/apps/components/AppsInProgress/AppsInProgress.tsx +++ b/src/apps/components/AppsInProgress/AppsInProgress.tsx @@ -1,3 +1,10 @@ +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import { IconButton } from "@dashboard/components/IconButton"; +import { TableButtonWrapper } from "@dashboard/components/TableButtonWrapper/TableButtonWrapper"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { AppsInstallationsQuery, JobStatusEnum } from "@dashboard/graphql"; +import { renderCollection } from "@dashboard/misc"; import { Card, CircularProgress as Progress, @@ -5,12 +12,6 @@ import { TableCell, Typography, } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import { IconButton } from "@saleor/components/IconButton"; -import { TableButtonWrapper } from "@saleor/components/TableButtonWrapper/TableButtonWrapper"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { AppsInstallationsQuery, JobStatusEnum } from "@saleor/graphql"; import { DeleteIcon, Indicator, @@ -18,7 +19,6 @@ import { Tooltip, TooltipMountWrapper, } from "@saleor/macaw-ui"; -import { renderCollection } from "@saleor/misc"; import clsx from "clsx"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/apps/components/AppsListPage/AppListPage.stories.tsx b/src/apps/components/AppsListPage/AppListPage.stories.tsx index 0674ba431..1d931d51d 100644 --- a/src/apps/components/AppsListPage/AppListPage.stories.tsx +++ b/src/apps/components/AppsListPage/AppListPage.stories.tsx @@ -4,9 +4,9 @@ import { searchPageProps, sortPageProps, tabPageProps, -} from "@saleor/fixtures"; -import Decorator from "@saleor/storybook/Decorator"; -import { PaginatorContextDecorator } from "@saleor/storybook/PaginatorContextDecorator"; +} from "@dashboard/fixtures"; +import Decorator from "@dashboard/storybook/Decorator"; +import { PaginatorContextDecorator } from "@dashboard/storybook/PaginatorContextDecorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/apps/components/AppsListPage/AppsListPage.tsx b/src/apps/components/AppsListPage/AppsListPage.tsx index a639caf98..0cd05b817 100644 --- a/src/apps/components/AppsListPage/AppsListPage.tsx +++ b/src/apps/components/AppsListPage/AppsListPage.tsx @@ -1,15 +1,18 @@ -import { AppPageTabs } from "@saleor/apps/components/AppPageTabs/AppPageTabs"; -import { useAppsPageNavigation } from "@saleor/apps/hooks/useAppsPageNavigation"; -import { useSaleorApps } from "@saleor/apps/hooks/useSaleorApps"; -import CardSpacer from "@saleor/components/CardSpacer"; -import Container from "@saleor/components/Container"; -import PageHeader from "@saleor/components/PageHeader"; -import { AppListItemFragment, AppsInstallationsQuery } from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { sectionNames } from "@saleor/intl"; +import { AppPageTabs } from "@dashboard/apps/components/AppPageTabs/AppPageTabs"; +import { useAppsPageNavigation } from "@dashboard/apps/hooks/useAppsPageNavigation"; +import { useSaleorApps } from "@dashboard/apps/hooks/useSaleorApps"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import Container from "@dashboard/components/Container"; +import PageHeader from "@dashboard/components/PageHeader"; +import { + AppListItemFragment, + AppsInstallationsQuery, +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { sectionNames } from "@dashboard/intl"; +import { marketplaceUrlResolver } from "@dashboard/marketplace/marketplace-url-resolver"; +import { ListProps } from "@dashboard/types"; import { Button, makeStyles } from "@saleor/macaw-ui"; -import { marketplaceUrlResolver } from "@saleor/marketplace/marketplace-url-resolver"; -import { ListProps } from "@saleor/types"; import React, { useEffect, useMemo } from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/apps/components/AppsSkeleton/AppsSkeleton.tsx b/src/apps/components/AppsSkeleton/AppsSkeleton.tsx index cc0cda997..e9894e894 100644 --- a/src/apps/components/AppsSkeleton/AppsSkeleton.tsx +++ b/src/apps/components/AppsSkeleton/AppsSkeleton.tsx @@ -1,6 +1,6 @@ +import Skeleton from "@dashboard/components/Skeleton"; +import TableRowLink from "@dashboard/components/TableRowLink"; import { TableCell } from "@material-ui/core"; -import Skeleton from "@saleor/components/Skeleton"; -import TableRowLink from "@saleor/components/TableRowLink"; import React from "react"; import { useStyles } from "../../styles"; diff --git a/src/apps/components/CardContainer/CardContainer.tsx b/src/apps/components/CardContainer/CardContainer.tsx index f0e815e2d..e04689419 100644 --- a/src/apps/components/CardContainer/CardContainer.tsx +++ b/src/apps/components/CardContainer/CardContainer.tsx @@ -1,5 +1,5 @@ +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; import { Card, CardContent } from "@material-ui/core"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; import React from "react"; import { useStyles } from "../../styles"; diff --git a/src/apps/components/ExternalAppContext/ExternalAppContext.tsx b/src/apps/components/ExternalAppContext/ExternalAppContext.tsx index 5f3e42a09..b6b8ff891 100644 --- a/src/apps/components/ExternalAppContext/ExternalAppContext.tsx +++ b/src/apps/components/ExternalAppContext/ExternalAppContext.tsx @@ -1,6 +1,6 @@ -import { appDeepUrl } from "@saleor/apps/urls"; -import { AppExtensionTargetEnum } from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; +import { appDeepUrl } from "@dashboard/apps/urls"; +import { AppExtensionTargetEnum } from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; import React from "react"; import { AppDialog } from "../AppDialog"; diff --git a/src/apps/components/ExternalAppContext/context.ts b/src/apps/components/ExternalAppContext/context.ts index c847dcb3c..f7e8c8988 100644 --- a/src/apps/components/ExternalAppContext/context.ts +++ b/src/apps/components/ExternalAppContext/context.ts @@ -1,5 +1,5 @@ -import { AppDetailsUrlMountQueryParams } from "@saleor/apps/urls"; -import { AppExtensionTargetEnum } from "@saleor/graphql"; +import { AppDetailsUrlMountQueryParams } from "@dashboard/apps/urls"; +import { AppExtensionTargetEnum } from "@dashboard/graphql"; import React from "react"; export interface AppData { diff --git a/src/apps/components/InstallWithManifestFormButton/InstallWithManifestFormButton.tsx b/src/apps/components/InstallWithManifestFormButton/InstallWithManifestFormButton.tsx index 988f50bfa..d7076fd68 100644 --- a/src/apps/components/InstallWithManifestFormButton/InstallWithManifestFormButton.tsx +++ b/src/apps/components/InstallWithManifestFormButton/InstallWithManifestFormButton.tsx @@ -1,5 +1,5 @@ +import { Button } from "@dashboard/components/Button"; import { TextField } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; import { makeStyles } from "@saleor/macaw-ui"; import React, { useState } from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/apps/components/InstalledApps/InstalledApps.tsx b/src/apps/components/InstalledApps/InstalledApps.tsx index 096c9c840..86ad44f17 100644 --- a/src/apps/components/InstalledApps/InstalledApps.tsx +++ b/src/apps/components/InstalledApps/InstalledApps.tsx @@ -1,17 +1,17 @@ +import { AppManifestTableDisplay } from "@dashboard/apps/components/AppManifestTableDisplay/AppManifestTableDisplay"; +import { InstallWithManifestFormButton } from "@dashboard/apps/components/InstallWithManifestFormButton"; +import { appUrl, createAppInstallUrl } from "@dashboard/apps/urls"; +import { isAppInTunnel } from "@dashboard/apps/utils"; +import CardTitle from "@dashboard/components/CardTitle"; +import { IconButton } from "@dashboard/components/IconButton"; +import { TableButtonWrapper } from "@dashboard/components/TableButtonWrapper/TableButtonWrapper"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { AppListItemFragment } from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { renderCollection } from "@dashboard/misc"; +import { ListProps } from "@dashboard/types"; import { Card, TableBody, TableCell, Typography } from "@material-ui/core"; -import { AppManifestTableDisplay } from "@saleor/apps/components/AppManifestTableDisplay/AppManifestTableDisplay"; -import { InstallWithManifestFormButton } from "@saleor/apps/components/InstallWithManifestFormButton"; -import { appUrl, createAppInstallUrl } from "@saleor/apps/urls"; -import { isAppInTunnel } from "@saleor/apps/utils"; -import CardTitle from "@saleor/components/CardTitle"; -import { IconButton } from "@saleor/components/IconButton"; -import { TableButtonWrapper } from "@saleor/components/TableButtonWrapper/TableButtonWrapper"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { AppListItemFragment } from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; import { ResponsiveTable, SettingsIcon } from "@saleor/macaw-ui"; -import { renderCollection } from "@saleor/misc"; -import { ListProps } from "@saleor/types"; import React, { useCallback } from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/apps/fixtures.ts b/src/apps/fixtures.ts index a095b35fc..4a88044f6 100644 --- a/src/apps/fixtures.ts +++ b/src/apps/fixtures.ts @@ -6,7 +6,7 @@ import { AppTypeEnum, JobStatusEnum, PermissionEnum, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; export const appsList: AppListItemFragment[] = [ { diff --git a/src/apps/hooks/useAppsPageNavigation.ts b/src/apps/hooks/useAppsPageNavigation.ts index 0f29f91cf..83aa9c5b1 100644 --- a/src/apps/hooks/useAppsPageNavigation.ts +++ b/src/apps/hooks/useAppsPageNavigation.ts @@ -1,5 +1,5 @@ -import { appsSection } from "@saleor/apps/urls"; -import useNavigator from "@saleor/hooks/useNavigator"; +import { appsSection } from "@dashboard/apps/urls"; +import useNavigator from "@dashboard/hooks/useNavigator"; import { useCallback, useMemo } from "react"; import useRouter from "use-react-router"; diff --git a/src/apps/hooks/useLocationState.ts b/src/apps/hooks/useLocationState.ts index e9e27183a..b72957819 100644 --- a/src/apps/hooks/useLocationState.ts +++ b/src/apps/hooks/useLocationState.ts @@ -1,4 +1,4 @@ -import { appsSection } from "@saleor/apps/urls"; +import { appsSection } from "@dashboard/apps/urls"; import { matchPath, useLocation } from "react-router"; const isAppPath = (pathname: string) => diff --git a/src/apps/hooks/useSaleorApps.ts b/src/apps/hooks/useSaleorApps.ts index e28e8bf0a..5628b2039 100644 --- a/src/apps/hooks/useSaleorApps.ts +++ b/src/apps/hooks/useSaleorApps.ts @@ -1,4 +1,4 @@ -import { marketplaceUrlResolver } from "@saleor/marketplace/marketplace-url-resolver"; +import { marketplaceUrlResolver } from "@dashboard/marketplace/marketplace-url-resolver"; import { useCallback, useState } from "react"; export interface SaleorApp { diff --git a/src/apps/index.tsx b/src/apps/index.tsx index e5414e0d6..bc306d539 100644 --- a/src/apps/index.tsx +++ b/src/apps/index.tsx @@ -1,5 +1,5 @@ -import WebhooksRoutes from "@saleor/custom-apps"; -import { sectionNames } from "@saleor/intl"; +import WebhooksRoutes from "@dashboard/custom-apps"; +import { sectionNames } from "@dashboard/intl"; import { parse as parseQs } from "qs"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/apps/urls.test.ts b/src/apps/urls.test.ts index c63fb24d7..499f967b9 100644 --- a/src/apps/urls.test.ts +++ b/src/apps/urls.test.ts @@ -1,5 +1,5 @@ -import { resolveAppIframeUrl } from "@saleor/apps/urls"; -import * as config from "@saleor/config"; +import { resolveAppIframeUrl } from "@dashboard/apps/urls"; +import * as config from "@dashboard/config"; describe("resolveAppIframeUrl", () => { afterAll(() => { diff --git a/src/apps/urls.ts b/src/apps/urls.ts index dcaba4d13..d6a4235fc 100644 --- a/src/apps/urls.ts +++ b/src/apps/urls.ts @@ -1,5 +1,5 @@ -import { getApiUrl } from "@saleor/config"; -import { stringifyQs } from "@saleor/utils/urls"; +import { getApiUrl } from "@dashboard/config"; +import { stringifyQs } from "@dashboard/utils/urls"; import urlJoin from "url-join"; import { ActiveTab, Dialog, Pagination, SingleAction } from "../types"; diff --git a/src/apps/useExtensions.ts b/src/apps/useExtensions.ts index b8f0b4a1f..944572b36 100644 --- a/src/apps/useExtensions.ts +++ b/src/apps/useExtensions.ts @@ -1,12 +1,12 @@ -import { useUserPermissions } from "@saleor/auth/hooks/useUserPermissions"; +import { useUserPermissions } from "@dashboard/auth/hooks/useUserPermissions"; import { AppExtensionMountEnum, ExtensionListQuery, PermissionEnum, useExtensionListQuery, -} from "@saleor/graphql"; -import { RelayToFlat } from "@saleor/types"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/graphql"; +import { RelayToFlat } from "@dashboard/types"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import { useExternalApp } from "./components/ExternalAppContext/"; import { AppData } from "./components/ExternalAppContext/context"; diff --git a/src/apps/utils.ts b/src/apps/utils.ts index 32d531f88..1e7623b1d 100644 --- a/src/apps/utils.ts +++ b/src/apps/utils.ts @@ -1,4 +1,4 @@ -import { AppsInstallationsQuery } from "@saleor/graphql"; +import { AppsInstallationsQuery } from "@dashboard/graphql"; const tunnelKeywords = [".ngrok.io", ".saleor.live"]; diff --git a/src/apps/views/App/App.tsx b/src/apps/views/App/App.tsx index fe16318a0..99925e97e 100644 --- a/src/apps/views/App/App.tsx +++ b/src/apps/views/App/App.tsx @@ -1,8 +1,8 @@ -import { appMessages } from "@saleor/apps/messages"; -import NotFoundPage from "@saleor/components/NotFoundPage"; -import { useAppQuery } from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; +import { appMessages } from "@dashboard/apps/messages"; +import NotFoundPage from "@dashboard/components/NotFoundPage"; +import { useAppQuery } from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; import React from "react"; import { useIntl } from "react-intl"; import { useLocation } from "react-router"; diff --git a/src/apps/views/AppDetails/AppDetails.tsx b/src/apps/views/AppDetails/AppDetails.tsx index b00ffaf91..4bf6a4261 100644 --- a/src/apps/views/AppDetails/AppDetails.tsx +++ b/src/apps/views/AppDetails/AppDetails.tsx @@ -1,18 +1,18 @@ import { useApolloClient } from "@apollo/client"; -import AppDeleteDialog from "@saleor/apps/components/AppDeleteDialog"; -import { appMessages } from "@saleor/apps/messages"; -import { EXTENSION_LIST_QUERY } from "@saleor/apps/queries"; -import NotFoundPage from "@saleor/components/NotFoundPage"; +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, useAppDeactivateMutation, useAppDeleteMutation, useAppQuery, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import getAppErrorMessage from "@saleor/utils/errors/app"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import getAppErrorMessage from "@dashboard/utils/errors/app"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/apps/views/AppInstall/AppInstall.tsx b/src/apps/views/AppInstall/AppInstall.tsx index 9845c4cfa..e19b5a580 100644 --- a/src/apps/views/AppInstall/AppInstall.tsx +++ b/src/apps/views/AppInstall/AppInstall.tsx @@ -1,10 +1,10 @@ -import { WindowTitle } from "@saleor/components/WindowTitle"; -import { useAppFetchMutation, useAppInstallMutation } from "@saleor/graphql"; -import useLocalStorage from "@saleor/hooks/useLocalStorage"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { extractMutationErrors } from "@saleor/misc"; -import getAppErrorMessage from "@saleor/utils/errors/app"; +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 getAppErrorMessage from "@dashboard/utils/errors/app"; import React, { useEffect } from "react"; import { useIntl } from "react-intl"; import { RouteComponentProps } from "react-router-dom"; diff --git a/src/apps/views/AppSettings/AppSettings.tsx b/src/apps/views/AppSettings/AppSettings.tsx index f3eacabe2..0ab1e273c 100644 --- a/src/apps/views/AppSettings/AppSettings.tsx +++ b/src/apps/views/AppSettings/AppSettings.tsx @@ -1,7 +1,7 @@ -import { appMessages } from "@saleor/apps/messages"; -import NotFoundPage from "@saleor/components/NotFoundPage"; -import { useAppQuery } from "@saleor/graphql"; -import useNotifier from "@saleor/hooks/useNotifier"; +import { appMessages } from "@dashboard/apps/messages"; +import NotFoundPage from "@dashboard/components/NotFoundPage"; +import { useAppQuery } from "@dashboard/graphql"; +import useNotifier from "@dashboard/hooks/useNotifier"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/apps/views/AppsList/AppsList.tsx b/src/apps/views/AppsList/AppsList.tsx index f01fce9c5..a57d72835 100644 --- a/src/apps/views/AppsList/AppsList.tsx +++ b/src/apps/views/AppsList/AppsList.tsx @@ -1,5 +1,5 @@ import { useApolloClient } from "@apollo/client"; -import { getAppInProgressName } from "@saleor/apps/utils"; +import { getAppInProgressName } from "@dashboard/apps/utils"; import { AppSortField, AppTypeEnum, @@ -9,19 +9,19 @@ import { useAppRetryInstallMutation, useAppsInstallationsQuery, useAppsListQuery, -} from "@saleor/graphql"; -import useListSettings from "@saleor/hooks/useListSettings"; -import useLocalStorage from "@saleor/hooks/useLocalStorage"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; +} from "@dashboard/graphql"; +import useListSettings from "@dashboard/hooks/useListSettings"; +import useLocalStorage from "@dashboard/hooks/useLocalStorage"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; import usePaginator, { createPaginationState, PageInfo, PaginatorContext, -} from "@saleor/hooks/usePaginator"; -import { ListViews } from "@saleor/types"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/hooks/usePaginator"; +import { ListViews } from "@dashboard/types"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import React, { useEffect, useRef } from "react"; import { useIntl } from "react-intl"; diff --git a/src/attributes/components/AttributeBulkDeleteDialog/AttributeBulkDeleteDialog.tsx b/src/attributes/components/AttributeBulkDeleteDialog/AttributeBulkDeleteDialog.tsx index af7a13f27..223ca0075 100644 --- a/src/attributes/components/AttributeBulkDeleteDialog/AttributeBulkDeleteDialog.tsx +++ b/src/attributes/components/AttributeBulkDeleteDialog/AttributeBulkDeleteDialog.tsx @@ -1,5 +1,5 @@ +import ActionDialog from "@dashboard/components/ActionDialog"; import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/attributes/components/AttributeDeleteDialog/AttributeDeleteDialog.tsx b/src/attributes/components/AttributeDeleteDialog/AttributeDeleteDialog.tsx index 4e9227456..f05a0bd2a 100644 --- a/src/attributes/components/AttributeDeleteDialog/AttributeDeleteDialog.tsx +++ b/src/attributes/components/AttributeDeleteDialog/AttributeDeleteDialog.tsx @@ -1,5 +1,5 @@ +import ActionDialog from "@dashboard/components/ActionDialog"; import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/attributes/components/AttributeDetails/AttributeDetails.tsx b/src/attributes/components/AttributeDetails/AttributeDetails.tsx index 12907531f..1c56d005d 100644 --- a/src/attributes/components/AttributeDetails/AttributeDetails.tsx +++ b/src/attributes/components/AttributeDetails/AttributeDetails.tsx @@ -1,19 +1,19 @@ -import { Card, CardContent, TextField } from "@material-ui/core"; -import { NumericUnits } from "@saleor/attributes/components/AttributeDetails/NumericUnits"; -import CardTitle from "@saleor/components/CardTitle"; -import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; -import FormSpacer from "@saleor/components/FormSpacer"; -import SingleSelectField from "@saleor/components/SingleSelectField"; +import { NumericUnits } from "@dashboard/attributes/components/AttributeDetails/NumericUnits"; +import CardTitle from "@dashboard/components/CardTitle"; +import ControlledCheckbox from "@dashboard/components/ControlledCheckbox"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import SingleSelectField from "@dashboard/components/SingleSelectField"; import { AttributeEntityTypeEnum, AttributeErrorFragment, AttributeInputTypeEnum, -} from "@saleor/graphql"; -import { UseFormResult } from "@saleor/hooks/useForm"; -import { commonMessages } from "@saleor/intl"; +} from "@dashboard/graphql"; +import { UseFormResult } from "@dashboard/hooks/useForm"; +import { commonMessages } from "@dashboard/intl"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getAttributeErrorMessage from "@dashboard/utils/errors/attribute"; +import { Card, CardContent, TextField } from "@material-ui/core"; import { makeStyles } from "@saleor/macaw-ui"; -import { getFormErrors } from "@saleor/utils/errors"; -import getAttributeErrorMessage from "@saleor/utils/errors/attribute"; import React from "react"; import { defineMessages, useIntl } from "react-intl"; import slugify from "slugify"; diff --git a/src/attributes/components/AttributeDetails/NumericUnits.tsx b/src/attributes/components/AttributeDetails/NumericUnits.tsx index c4800f75c..37eba81b6 100644 --- a/src/attributes/components/AttributeDetails/NumericUnits.tsx +++ b/src/attributes/components/AttributeDetails/NumericUnits.tsx @@ -1,9 +1,9 @@ -import { AttributePageFormData } from "@saleor/attributes/components/AttributePage"; -import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; -import SingleSelectField from "@saleor/components/SingleSelectField"; -import { MeasurementUnitsEnum } from "@saleor/graphql"; -import { UseFormResult } from "@saleor/hooks/useForm"; -import { commonMessages } from "@saleor/intl"; +import { AttributePageFormData } from "@dashboard/attributes/components/AttributePage"; +import ControlledCheckbox from "@dashboard/components/ControlledCheckbox"; +import SingleSelectField from "@dashboard/components/SingleSelectField"; +import { MeasurementUnitsEnum } from "@dashboard/graphql"; +import { UseFormResult } from "@dashboard/hooks/useForm"; +import { commonMessages } from "@dashboard/intl"; import { makeStyles } from "@saleor/macaw-ui"; import React, { useEffect, useMemo, useState } from "react"; import { useIntl } from "react-intl"; diff --git a/src/attributes/components/AttributeDetails/utils.ts b/src/attributes/components/AttributeDetails/utils.ts index 3ae50ffa5..e28ce478d 100644 --- a/src/attributes/components/AttributeDetails/utils.ts +++ b/src/attributes/components/AttributeDetails/utils.ts @@ -1,5 +1,5 @@ -import { Choice } from "@saleor/components/SingleSelectField"; -import { MeasurementUnitsEnum } from "@saleor/graphql"; +import { Choice } from "@dashboard/components/SingleSelectField"; +import { MeasurementUnitsEnum } from "@dashboard/graphql"; import React from "react"; import { IntlShape, MessageDescriptor } from "react-intl"; diff --git a/src/attributes/components/AttributeList/AttributeList.tsx b/src/attributes/components/AttributeList/AttributeList.tsx index 9f3fcaabd..f7e871f27 100644 --- a/src/attributes/components/AttributeList/AttributeList.tsx +++ b/src/attributes/components/AttributeList/AttributeList.tsx @@ -1,21 +1,21 @@ -import { TableBody, TableCell, TableFooter } from "@material-ui/core"; import { AttributeListUrlSortField, attributeUrl, -} from "@saleor/attributes/urls"; -import Checkbox from "@saleor/components/Checkbox"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableCellHeader from "@saleor/components/TableCellHeader"; -import TableHead from "@saleor/components/TableHead"; -import { TablePaginationWithContext } from "@saleor/components/TablePagination"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { AttributeFragment } from "@saleor/graphql"; -import { translateBoolean } from "@saleor/intl"; +} from "@dashboard/attributes/urls"; +import Checkbox from "@dashboard/components/Checkbox"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableCellHeader from "@dashboard/components/TableCellHeader"; +import TableHead from "@dashboard/components/TableHead"; +import { TablePaginationWithContext } from "@dashboard/components/TablePagination"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { AttributeFragment } from "@dashboard/graphql"; +import { translateBoolean } from "@dashboard/intl"; +import { maybe, renderCollection } from "@dashboard/misc"; +import { ListActions, ListProps, SortPage } from "@dashboard/types"; +import { getArrowDirection } from "@dashboard/utils/sort"; +import { TableBody, TableCell, TableFooter } from "@material-ui/core"; import { makeStyles } from "@saleor/macaw-ui"; -import { maybe, renderCollection } from "@saleor/misc"; -import { ListActions, ListProps, SortPage } from "@saleor/types"; -import { getArrowDirection } from "@saleor/utils/sort"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/attributes/components/AttributeListPage/AttributeListPage.tsx b/src/attributes/components/AttributeListPage/AttributeListPage.tsx index ff47c5180..c4aab3e2a 100644 --- a/src/attributes/components/AttributeListPage/AttributeListPage.tsx +++ b/src/attributes/components/AttributeListPage/AttributeListPage.tsx @@ -1,14 +1,14 @@ -import { Card } from "@material-ui/core"; import { attributeAddUrl, AttributeListUrlSortField, -} from "@saleor/attributes/urls"; -import { Backlink } from "@saleor/components/Backlink"; -import { Button } from "@saleor/components/Button"; -import FilterBar from "@saleor/components/FilterBar"; -import { configurationMenuUrl } from "@saleor/configuration"; -import { AttributeFragment } from "@saleor/graphql"; -import { sectionNames } from "@saleor/intl"; +} from "@dashboard/attributes/urls"; +import { Backlink } from "@dashboard/components/Backlink"; +import { Button } from "@dashboard/components/Button"; +import FilterBar from "@dashboard/components/FilterBar"; +import { configurationMenuUrl } from "@dashboard/configuration"; +import { AttributeFragment } from "@dashboard/graphql"; +import { sectionNames } from "@dashboard/intl"; +import { Card } from "@material-ui/core"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/attributes/components/AttributeListPage/filters.ts b/src/attributes/components/AttributeListPage/filters.ts index 8cc4a4a4c..c3d36ebb5 100644 --- a/src/attributes/components/AttributeListPage/filters.ts +++ b/src/attributes/components/AttributeListPage/filters.ts @@ -1,7 +1,7 @@ -import { IFilter } from "@saleor/components/Filter"; -import { commonMessages } from "@saleor/intl"; -import { FilterOpts } from "@saleor/types"; -import { createBooleanField } from "@saleor/utils/filters/fields"; +import { IFilter } from "@dashboard/components/Filter"; +import { commonMessages } from "@dashboard/intl"; +import { FilterOpts } from "@dashboard/types"; +import { createBooleanField } from "@dashboard/utils/filters/fields"; import { defineMessages, IntlShape } from "react-intl"; export enum AttributeFilterKeys { diff --git a/src/attributes/components/AttributeOrganization/AttributeOrganization.tsx b/src/attributes/components/AttributeOrganization/AttributeOrganization.tsx index ae1fc71ee..bb01980c3 100644 --- a/src/attributes/components/AttributeOrganization/AttributeOrganization.tsx +++ b/src/attributes/components/AttributeOrganization/AttributeOrganization.tsx @@ -1,7 +1,7 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import RadioGroupField from "@dashboard/components/RadioGroupField"; +import { AttributeTypeEnum } from "@dashboard/graphql"; import { Card, CardContent, Typography } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import RadioGroupField from "@saleor/components/RadioGroupField"; -import { AttributeTypeEnum } from "@saleor/graphql"; import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; import { defineMessages, FormattedMessage, useIntl } from "react-intl"; diff --git a/src/attributes/components/AttributePage/AttributePage.tsx b/src/attributes/components/AttributePage/AttributePage.tsx index b23dd75ea..00f9f0333 100644 --- a/src/attributes/components/AttributePage/AttributePage.tsx +++ b/src/attributes/components/AttributePage/AttributePage.tsx @@ -1,15 +1,15 @@ -import { attributeListUrl } from "@saleor/attributes/urls"; -import { ATTRIBUTE_TYPES_WITH_DEDICATED_VALUES } from "@saleor/attributes/utils/data"; -import { Backlink } from "@saleor/components/Backlink"; -import CardSpacer from "@saleor/components/CardSpacer"; -import Container from "@saleor/components/Container"; -import Form from "@saleor/components/Form"; -import Grid from "@saleor/components/Grid"; -import Metadata from "@saleor/components/Metadata/Metadata"; -import { MetadataFormData } from "@saleor/components/Metadata/types"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; -import { ListSettingsUpdate } from "@saleor/components/TablePagination"; +import { attributeListUrl } from "@dashboard/attributes/urls"; +import { ATTRIBUTE_TYPES_WITH_DEDICATED_VALUES } from "@dashboard/attributes/utils/data"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import Container from "@dashboard/components/Container"; +import Form from "@dashboard/components/Form"; +import Grid from "@dashboard/components/Grid"; +import Metadata from "@dashboard/components/Metadata/Metadata"; +import { MetadataFormData } from "@dashboard/components/Metadata/types"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; +import { ListSettingsUpdate } from "@dashboard/components/TablePagination"; import { AttributeDetailsFragment, AttributeDetailsQuery, @@ -18,15 +18,15 @@ import { AttributeInputTypeEnum, AttributeTypeEnum, MeasurementUnitsEnum, -} from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { sectionNames } from "@saleor/intl"; +} from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { sectionNames } from "@dashboard/intl"; +import { maybe } from "@dashboard/misc"; +import { ListSettings, ReorderAction } from "@dashboard/types"; +import { mapEdgesToItems, mapMetadataItemToInput } from "@dashboard/utils/maps"; +import useMetadataChangeTrigger from "@dashboard/utils/metadata/useMetadataChangeTrigger"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { maybe } from "@saleor/misc"; -import { ListSettings, ReorderAction } from "@saleor/types"; -import { mapEdgesToItems, mapMetadataItemToInput } from "@saleor/utils/maps"; -import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger"; import React from "react"; import { useIntl } from "react-intl"; import slugify from "slugify"; diff --git a/src/attributes/components/AttributeProperties/AttributeProperties.tsx b/src/attributes/components/AttributeProperties/AttributeProperties.tsx index 9520d1125..3c0525853 100644 --- a/src/attributes/components/AttributeProperties/AttributeProperties.tsx +++ b/src/attributes/components/AttributeProperties/AttributeProperties.tsx @@ -1,13 +1,13 @@ +import { ATTRIBUTE_TYPES_WITH_CONFIGURABLE_FACED_NAVIGATION } from "@dashboard/attributes/utils/data"; +import CardTitle from "@dashboard/components/CardTitle"; +import ControlledCheckbox from "@dashboard/components/ControlledCheckbox"; +import ControlledSwitch from "@dashboard/components/ControlledSwitch"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import { AttributeErrorFragment, AttributeTypeEnum } from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getAttributeErrorMessage from "@dashboard/utils/errors/attribute"; import { Card, CardContent, TextField, Typography } from "@material-ui/core"; -import { ATTRIBUTE_TYPES_WITH_CONFIGURABLE_FACED_NAVIGATION } from "@saleor/attributes/utils/data"; -import CardTitle from "@saleor/components/CardTitle"; -import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; -import ControlledSwitch from "@saleor/components/ControlledSwitch"; -import FormSpacer from "@saleor/components/FormSpacer"; -import { AttributeErrorFragment, AttributeTypeEnum } from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; -import { getFormErrors } from "@saleor/utils/errors"; -import getAttributeErrorMessage from "@saleor/utils/errors/attribute"; import React from "react"; import { defineMessages, FormattedMessage, useIntl } from "react-intl"; diff --git a/src/attributes/components/AttributeSwatchField/AttributeSwatchField.tsx b/src/attributes/components/AttributeSwatchField/AttributeSwatchField.tsx index b162ca863..a8780fb98 100644 --- a/src/attributes/components/AttributeSwatchField/AttributeSwatchField.tsx +++ b/src/attributes/components/AttributeSwatchField/AttributeSwatchField.tsx @@ -1,13 +1,13 @@ -import VerticalSpacer from "@saleor/apps/components/VerticalSpacer"; -import { inputTypeMessages } from "@saleor/attributes/components/AttributeDetails/messages"; -import { AttributeValueEditDialogFormData } from "@saleor/attributes/utils/data"; -import { ColorPicker } from "@saleor/components/ColorPicker"; -import FileUploadField from "@saleor/components/FileUploadField"; -import { RadioGroupField } from "@saleor/components/RadioGroupField"; -import { useFileUploadMutation } from "@saleor/graphql"; -import { UseFormResult } from "@saleor/hooks/useForm"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { errorMessages } from "@saleor/intl"; +import VerticalSpacer from "@dashboard/apps/components/VerticalSpacer"; +import { inputTypeMessages } from "@dashboard/attributes/components/AttributeDetails/messages"; +import { AttributeValueEditDialogFormData } from "@dashboard/attributes/utils/data"; +import { ColorPicker } from "@dashboard/components/ColorPicker"; +import FileUploadField from "@dashboard/components/FileUploadField"; +import { RadioGroupField } from "@dashboard/components/RadioGroupField"; +import { useFileUploadMutation } from "@dashboard/graphql"; +import { UseFormResult } from "@dashboard/hooks/useForm"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { errorMessages } from "@dashboard/intl"; import React, { useState } from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/attributes/components/AttributeValueDeleteDialog/AttributeValueDeleteDialog.tsx b/src/attributes/components/AttributeValueDeleteDialog/AttributeValueDeleteDialog.tsx index 0f0277a1d..5f794b19e 100644 --- a/src/attributes/components/AttributeValueDeleteDialog/AttributeValueDeleteDialog.tsx +++ b/src/attributes/components/AttributeValueDeleteDialog/AttributeValueDeleteDialog.tsx @@ -1,5 +1,5 @@ +import ActionDialog from "@dashboard/components/ActionDialog"; import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/attributes/components/AttributeValueEditDialog/AttributeValueEditDialog.tsx b/src/attributes/components/AttributeValueEditDialog/AttributeValueEditDialog.tsx index 13518cd1a..2eba3fdc0 100644 --- a/src/attributes/components/AttributeValueEditDialog/AttributeValueEditDialog.tsx +++ b/src/attributes/components/AttributeValueEditDialog/AttributeValueEditDialog.tsx @@ -1,3 +1,14 @@ +import { getAttributeValueErrorMessage } from "@dashboard/attributes/errors"; +import BackButton from "@dashboard/components/BackButton"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import Form from "@dashboard/components/Form"; +import { + AttributeErrorFragment, + AttributeInputTypeEnum, +} from "@dashboard/graphql"; +import useModalDialogErrors from "@dashboard/hooks/useModalDialogErrors"; +import { buttonMessages } from "@dashboard/intl"; +import { getFormErrors } from "@dashboard/utils/errors"; import { Dialog, DialogActions, @@ -5,18 +16,7 @@ import { DialogTitle, TextField, } from "@material-ui/core"; -import { getAttributeValueErrorMessage } from "@saleor/attributes/errors"; -import BackButton from "@saleor/components/BackButton"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import Form from "@saleor/components/Form"; -import { - AttributeErrorFragment, - AttributeInputTypeEnum, -} from "@saleor/graphql"; -import useModalDialogErrors from "@saleor/hooks/useModalDialogErrors"; -import { buttonMessages } from "@saleor/intl"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { getFormErrors } from "@saleor/utils/errors"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/attributes/components/AttributeValues/AttributeValues.tsx b/src/attributes/components/AttributeValues/AttributeValues.tsx index fce26a0e4..3d5e24190 100644 --- a/src/attributes/components/AttributeValues/AttributeValues.tsx +++ b/src/attributes/components/AttributeValues/AttributeValues.tsx @@ -1,27 +1,27 @@ -import { Card, TableCell, TableFooter, TableHead } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; import { SortableTableBody, SortableTableRow, -} from "@saleor/components/SortableTable"; -import TablePagination from "@saleor/components/TablePagination"; -import TableRowLink from "@saleor/components/TableRowLink"; +} from "@dashboard/components/SortableTable"; +import TablePagination from "@dashboard/components/TablePagination"; +import TableRowLink from "@dashboard/components/TableRowLink"; import { AttributeInputTypeEnum, AttributeValueFragment, AttributeValueListFragment, -} from "@saleor/graphql"; -import { DeleteIcon, IconButton, makeStyles } from "@saleor/macaw-ui"; -import { renderCollection, stopPropagation } from "@saleor/misc"; +} from "@dashboard/graphql"; +import { renderCollection, stopPropagation } from "@dashboard/misc"; import { ListProps, PaginateListProps, RelayToFlat, ReorderAction, -} from "@saleor/types"; +} from "@dashboard/types"; +import { Card, TableCell, TableFooter, TableHead } from "@material-ui/core"; +import { DeleteIcon, IconButton, makeStyles } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/attributes/errors.ts b/src/attributes/errors.ts index 45a0ff63b..e58131b83 100644 --- a/src/attributes/errors.ts +++ b/src/attributes/errors.ts @@ -1,5 +1,5 @@ -import { AttributeErrorCode, AttributeErrorFragment } from "@saleor/graphql"; -import getAttributeErrorMessage from "@saleor/utils/errors/attribute"; +import { AttributeErrorCode, AttributeErrorFragment } from "@dashboard/graphql"; +import getAttributeErrorMessage from "@dashboard/utils/errors/attribute"; import { defineMessages, IntlShape } from "react-intl"; const messages = defineMessages({ diff --git a/src/attributes/fixtures.ts b/src/attributes/fixtures.ts index 3c1b3c154..4f661a12a 100644 --- a/src/attributes/fixtures.ts +++ b/src/attributes/fixtures.ts @@ -5,7 +5,7 @@ import { AttributeListQuery, AttributeTypeEnum, ProductDetailsQuery, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; export const attribute: AttributeDetailsQuery["attribute"] = { __typename: "Attribute" as "Attribute", diff --git a/src/attributes/index.tsx b/src/attributes/index.tsx index db1d8f9e3..6ad20f224 100644 --- a/src/attributes/index.tsx +++ b/src/attributes/index.tsx @@ -1,5 +1,5 @@ -import { sectionNames } from "@saleor/intl"; -import { asSortParams } from "@saleor/utils/sort"; +import { sectionNames } from "@dashboard/intl"; +import { asSortParams } from "@dashboard/utils/sort"; import { parse as parseQs } from "qs"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/attributes/urls.ts b/src/attributes/urls.ts index 601b66e6b..12727008c 100644 --- a/src/attributes/urls.ts +++ b/src/attributes/urls.ts @@ -1,4 +1,4 @@ -import { stringifyQs } from "@saleor/utils/urls"; +import { stringifyQs } from "@dashboard/utils/urls"; import urlJoin from "url-join"; import { diff --git a/src/attributes/utils/data.ts b/src/attributes/utils/data.ts index afb6ca1ac..f4c5897c1 100644 --- a/src/attributes/utils/data.ts +++ b/src/attributes/utils/data.ts @@ -2,7 +2,7 @@ import { FetchResult } from "@apollo/client"; import { AttributeInput, AttributeInputData, -} from "@saleor/components/Attributes"; +} from "@dashboard/components/Attributes"; import { AttributeEntityTypeEnum, AttributeErrorFragment, @@ -20,19 +20,19 @@ import { SelectedVariantAttributeFragment, UploadErrorFragment, VariantAttributeFragment, -} from "@saleor/graphql"; -import { FormsetData } from "@saleor/hooks/useFormset"; -import { RelayToFlat } from "@saleor/types"; +} from "@dashboard/graphql"; +import { FormsetData } from "@dashboard/hooks/useFormset"; +import { RelayToFlat } from "@dashboard/types"; import { mapEdgesToItems, mapNodeToChoice, mapPagesToChoices, -} from "@saleor/utils/maps"; -import { RichTextContextValues } from "@saleor/utils/richText/context"; +} from "@dashboard/utils/maps"; +import { RichTextContextValues } from "@dashboard/utils/richText/context"; import { GetRichTextValues, RichTextGetters, -} from "@saleor/utils/richText/useMultipleRichText"; +} from "@dashboard/utils/richText/useMultipleRichText"; import { AttributePageFormData } from "../components/AttributePage"; diff --git a/src/attributes/utils/handlers.test.ts b/src/attributes/utils/handlers.test.ts index cba2e6247..cc7dade14 100644 --- a/src/attributes/utils/handlers.test.ts +++ b/src/attributes/utils/handlers.test.ts @@ -1,16 +1,16 @@ import { createAttributeMultiChangeHandler, prepareAttributesInput, -} from "@saleor/attributes/utils/handlers"; +} from "@dashboard/attributes/utils/handlers"; import { AttributeInput, AttributeInputData, -} from "@saleor/components/Attributes"; +} from "@dashboard/components/Attributes"; import { AttributeInputTypeEnum, AttributeValueDetailsFragment, -} from "@saleor/graphql"; -import { FormsetData } from "@saleor/hooks/useFormset"; +} from "@dashboard/graphql"; +import { FormsetData } from "@dashboard/hooks/useFormset"; const multipleValueAttributes: FormsetData = [ { diff --git a/src/attributes/utils/handlers.ts b/src/attributes/utils/handlers.ts index 9cd676c87..d2625e1f3 100644 --- a/src/attributes/utils/handlers.ts +++ b/src/attributes/utils/handlers.ts @@ -2,7 +2,7 @@ import { FetchResult } from "@apollo/client"; import { AttributeInput, AttributeInputData, -} from "@saleor/components/Attributes"; +} from "@dashboard/components/Attributes"; import { AttributeEntityTypeEnum, AttributeInputTypeEnum, @@ -14,14 +14,14 @@ import { PageSelectedAttributeFragment, ProductFragment, ProductVariantDetailsQuery, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import { FormsetAtomicData, FormsetChange, FormsetData, -} from "@saleor/hooks/useFormset"; -import { FetchMoreProps, ReorderEvent } from "@saleor/types"; -import { move, toggle } from "@saleor/utils/lists"; +} from "@dashboard/hooks/useFormset"; +import { FetchMoreProps, ReorderEvent } from "@dashboard/types"; +import { move, toggle } from "@dashboard/utils/lists"; import isEqual from "lodash/isEqual"; import { getFileValuesToUploadFromAttributes, isFileValueUnused } from "./data"; diff --git a/src/attributes/views/AttributeCreate/AttributeCreate.tsx b/src/attributes/views/AttributeCreate/AttributeCreate.tsx index 65110307e..c11a00ce3 100644 --- a/src/attributes/views/AttributeCreate/AttributeCreate.tsx +++ b/src/attributes/views/AttributeCreate/AttributeCreate.tsx @@ -4,22 +4,24 @@ import { useAttributeCreateMutation, useUpdateMetadataMutation, useUpdatePrivateMetadataMutation, -} from "@saleor/graphql"; -import useListSettings from "@saleor/hooks/useListSettings"; -import useLocalPageInfo, { getMaxPage } from "@saleor/hooks/useLocalPageInfo"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { getMutationErrors, getStringOrPlaceholder } from "@saleor/misc"; -import { ListViews, ReorderEvent } from "@saleor/types"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createMetadataCreateHandler from "@saleor/utils/handlers/metadataCreateHandler"; +} from "@dashboard/graphql"; +import useListSettings from "@dashboard/hooks/useListSettings"; +import useLocalPageInfo, { + getMaxPage, +} from "@dashboard/hooks/useLocalPageInfo"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { getMutationErrors, getStringOrPlaceholder } from "@dashboard/misc"; +import { ListViews, ReorderEvent } from "@dashboard/types"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createMetadataCreateHandler from "@dashboard/utils/handlers/metadataCreateHandler"; import { add, isSelected, move, remove, updateAtIndex, -} from "@saleor/utils/lists"; +} from "@dashboard/utils/lists"; import React from "react"; import { useIntl } from "react-intl"; import slugify from "slugify"; diff --git a/src/attributes/views/AttributeDetails/AttributeDetails.tsx b/src/attributes/views/AttributeDetails/AttributeDetails.tsx index 1fc547af6..151e7afc5 100644 --- a/src/attributes/views/AttributeDetails/AttributeDetails.tsx +++ b/src/attributes/views/AttributeDetails/AttributeDetails.tsx @@ -1,4 +1,4 @@ -import { attributeValueFragmentToFormData } from "@saleor/attributes/utils/data"; +import { attributeValueFragmentToFormData } from "@dashboard/attributes/utils/data"; import { useAttributeDeleteMutation, useAttributeDetailsQuery, @@ -9,20 +9,20 @@ import { useAttributeValueUpdateMutation, useUpdateMetadataMutation, useUpdatePrivateMetadataMutation, -} from "@saleor/graphql"; -import useListSettings from "@saleor/hooks/useListSettings"; +} from "@dashboard/graphql"; +import useListSettings from "@dashboard/hooks/useListSettings"; import useLocalPaginator, { useLocalPaginationState, -} from "@saleor/hooks/useLocalPaginator"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { commonMessages } from "@saleor/intl"; -import { extractMutationErrors, getStringOrPlaceholder } from "@saleor/misc"; -import { ListViews, ReorderEvent } from "@saleor/types"; -import getAttributeErrorMessage from "@saleor/utils/errors/attribute"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createMetadataUpdateHandler from "@saleor/utils/handlers/metadataUpdateHandler"; -import { move } from "@saleor/utils/lists"; +} from "@dashboard/hooks/useLocalPaginator"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { commonMessages } from "@dashboard/intl"; +import { extractMutationErrors, getStringOrPlaceholder } from "@dashboard/misc"; +import { ListViews, ReorderEvent } from "@dashboard/types"; +import getAttributeErrorMessage from "@dashboard/utils/errors/attribute"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createMetadataUpdateHandler from "@dashboard/utils/handlers/metadataUpdateHandler"; +import { move } from "@dashboard/utils/lists"; import omit from "lodash/omit"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/attributes/views/AttributeList/AttributeList.tsx b/src/attributes/views/AttributeList/AttributeList.tsx index b62cc2ad3..136cb6274 100644 --- a/src/attributes/views/AttributeList/AttributeList.tsx +++ b/src/attributes/views/AttributeList/AttributeList.tsx @@ -6,27 +6,27 @@ import { getFilterTabs, getFilterVariables, saveFilterTab, -} from "@saleor/attributes/views/AttributeList/filters"; -import DeleteFilterTabDialog from "@saleor/components/DeleteFilterTabDialog"; +} from "@dashboard/attributes/views/AttributeList/filters"; +import DeleteFilterTabDialog from "@dashboard/components/DeleteFilterTabDialog"; import SaveFilterTabDialog, { SaveFilterTabDialogFormData, -} from "@saleor/components/SaveFilterTabDialog"; +} from "@dashboard/components/SaveFilterTabDialog"; import { useAttributeBulkDeleteMutation, useAttributeListQuery, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; import usePaginator, { createPaginationState, PaginatorContext, -} from "@saleor/hooks/usePaginator"; +} from "@dashboard/hooks/usePaginator"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createFilterHandlers from "@dashboard/utils/handlers/filterHandlers"; +import createSortHandler from "@dashboard/utils/handlers/sortHandler"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; +import { getSortParams } from "@dashboard/utils/sort"; import { DeleteIcon, IconButton } from "@saleor/macaw-ui"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createFilterHandlers from "@saleor/utils/handlers/filterHandlers"; -import createSortHandler from "@saleor/utils/handlers/sortHandler"; -import { mapEdgesToItems } from "@saleor/utils/maps"; -import { getSortParams } from "@saleor/utils/sort"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/attributes/views/AttributeList/filters.test.ts b/src/attributes/views/AttributeList/filters.test.ts index 7905a4d99..f9d705a08 100644 --- a/src/attributes/views/AttributeList/filters.test.ts +++ b/src/attributes/views/AttributeList/filters.test.ts @@ -1,7 +1,7 @@ -import { createFilterStructure } from "@saleor/attributes/components/AttributeListPage"; -import { AttributeListUrlFilters } from "@saleor/attributes/urls"; -import { getFilterQueryParams } from "@saleor/utils/filters"; -import { stringifyQs } from "@saleor/utils/urls"; +import { createFilterStructure } from "@dashboard/attributes/components/AttributeListPage"; +import { AttributeListUrlFilters } from "@dashboard/attributes/urls"; +import { getFilterQueryParams } from "@dashboard/utils/filters"; +import { stringifyQs } from "@dashboard/utils/urls"; import { getExistingKeys, setFilterOptsStatus } from "@test/filters"; import { config } from "@test/intl"; import { createIntl } from "react-intl"; diff --git a/src/attributes/views/AttributeList/filters.ts b/src/attributes/views/AttributeList/filters.ts index ce139b605..46ac76cd5 100644 --- a/src/attributes/views/AttributeList/filters.ts +++ b/src/attributes/views/AttributeList/filters.ts @@ -1,10 +1,10 @@ import { AttributeFilterKeys, AttributeListFilterOpts, -} from "@saleor/attributes/components/AttributeListPage"; -import { FilterElement } from "@saleor/components/Filter"; -import { AttributeFilterInput } from "@saleor/graphql"; -import { maybe, parseBoolean } from "@saleor/misc"; +} from "@dashboard/attributes/components/AttributeListPage"; +import { FilterElement } from "@dashboard/components/Filter"; +import { AttributeFilterInput } from "@dashboard/graphql"; +import { maybe, parseBoolean } from "@dashboard/misc"; import { createFilterTabUtils, diff --git a/src/attributes/views/AttributeList/sort.ts b/src/attributes/views/AttributeList/sort.ts index d278f60f1..dde0f8cfe 100644 --- a/src/attributes/views/AttributeList/sort.ts +++ b/src/attributes/views/AttributeList/sort.ts @@ -1,6 +1,6 @@ -import { AttributeListUrlSortField } from "@saleor/attributes/urls"; -import { AttributeSortField } from "@saleor/graphql"; -import { createGetSortQueryVariables } from "@saleor/utils/sort"; +import { AttributeListUrlSortField } from "@dashboard/attributes/urls"; +import { AttributeSortField } from "@dashboard/graphql"; +import { createGetSortQueryVariables } from "@dashboard/utils/sort"; export function getSortQueryField( sort: AttributeListUrlSortField, diff --git a/src/auth/AuthProvider.test.tsx b/src/auth/AuthProvider.test.tsx index d49da4fef..1fe8605b9 100644 --- a/src/auth/AuthProvider.test.tsx +++ b/src/auth/AuthProvider.test.tsx @@ -1,4 +1,4 @@ -import { getApiUrl } from "@saleor/config"; +import { getApiUrl } from "@dashboard/config"; import { createSaleorClient, SaleorProvider } from "@saleor/sdk"; import setupApi from "@test/api"; import { act, renderHook } from "@testing-library/react-hooks"; diff --git a/src/auth/AuthProvider.tsx b/src/auth/AuthProvider.tsx index b2b55c8f1..b0f02057a 100644 --- a/src/auth/AuthProvider.tsx +++ b/src/auth/AuthProvider.tsx @@ -1,5 +1,5 @@ import { useApolloClient } from "@apollo/client"; -import useNotifier from "@saleor/hooks/useNotifier"; +import useNotifier from "@dashboard/hooks/useNotifier"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/auth/components/LoginPage/LoginPage.stories.tsx b/src/auth/components/LoginPage/LoginPage.stories.tsx index 37308a3ba..7e63a087a 100644 --- a/src/auth/components/LoginPage/LoginPage.stories.tsx +++ b/src/auth/components/LoginPage/LoginPage.stories.tsx @@ -1,5 +1,5 @@ -import CardDecorator from "@saleor/storybook/CardDecorator"; -import Decorator from "@saleor/storybook/Decorator"; +import CardDecorator from "@dashboard/storybook/CardDecorator"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/auth/components/LoginPage/LoginPage.tsx b/src/auth/components/LoginPage/LoginPage.tsx index 12f4ea7ab..3388f92e6 100644 --- a/src/auth/components/LoginPage/LoginPage.tsx +++ b/src/auth/components/LoginPage/LoginPage.tsx @@ -1,16 +1,16 @@ +import { UserContextError } from "@dashboard/auth/types"; +import { passwordResetUrl } from "@dashboard/auth/urls"; +import { Button } from "@dashboard/components/Button"; +import { FormSpacer } from "@dashboard/components/FormSpacer"; +import { AvailableExternalAuthenticationsQuery } from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import { commonMessages } from "@dashboard/intl"; import { CircularProgress, Divider, TextField, Typography, } from "@material-ui/core"; -import { UserContextError } from "@saleor/auth/types"; -import { passwordResetUrl } from "@saleor/auth/urls"; -import { Button } from "@saleor/components/Button"; -import { FormSpacer } from "@saleor/components/FormSpacer"; -import { AvailableExternalAuthenticationsQuery } from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import { commonMessages } from "@saleor/intl"; import { EyeIcon, IconButton } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/auth/components/LoginPage/form.tsx b/src/auth/components/LoginPage/form.tsx index 4eb36967c..8a7e20b34 100644 --- a/src/auth/components/LoginPage/form.tsx +++ b/src/auth/components/LoginPage/form.tsx @@ -1,6 +1,6 @@ -import { DEMO_MODE } from "@saleor/config"; -import useForm, { FormChange, SubmitPromise } from "@saleor/hooks/useForm"; -import useHandleFormSubmit from "@saleor/hooks/useHandleFormSubmit"; +import { DEMO_MODE } from "@dashboard/config"; +import useForm, { FormChange, SubmitPromise } from "@dashboard/hooks/useForm"; +import useHandleFormSubmit from "@dashboard/hooks/useHandleFormSubmit"; import React from "react"; export interface LoginFormData { diff --git a/src/auth/components/LoginPage/messages.ts b/src/auth/components/LoginPage/messages.ts index 9f7d38666..0d45cecbb 100644 --- a/src/auth/components/LoginPage/messages.ts +++ b/src/auth/components/LoginPage/messages.ts @@ -1,4 +1,4 @@ -import { UserContextError } from "@saleor/auth/types"; +import { UserContextError } from "@dashboard/auth/types"; import { defineMessages, IntlShape } from "react-intl"; export const errorMessages = defineMessages({ diff --git a/src/auth/components/NewPasswordPage/NewPasswordPage.stories.tsx b/src/auth/components/NewPasswordPage/NewPasswordPage.stories.tsx index 64bd5d438..307b105fa 100644 --- a/src/auth/components/NewPasswordPage/NewPasswordPage.stories.tsx +++ b/src/auth/components/NewPasswordPage/NewPasswordPage.stories.tsx @@ -1,6 +1,6 @@ -import { AccountErrorCode } from "@saleor/graphql"; -import CardDecorator from "@saleor/storybook//CardDecorator"; -import Decorator from "@saleor/storybook//Decorator"; +import { AccountErrorCode } from "@dashboard/graphql"; +import CardDecorator from "@dashboard/storybook//CardDecorator"; +import Decorator from "@dashboard/storybook//Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/auth/components/NewPasswordPage/NewPasswordPage.tsx b/src/auth/components/NewPasswordPage/NewPasswordPage.tsx index ad062901f..3b995fe1d 100644 --- a/src/auth/components/NewPasswordPage/NewPasswordPage.tsx +++ b/src/auth/components/NewPasswordPage/NewPasswordPage.tsx @@ -1,10 +1,10 @@ +import { Button } from "@dashboard/components/Button"; +import Form from "@dashboard/components/Form"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import getAccountErrorMessage from "@dashboard/utils/errors/account"; import { TextField, Typography } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import Form from "@saleor/components/Form"; -import FormSpacer from "@saleor/components/FormSpacer"; -import { SubmitPromise } from "@saleor/hooks/useForm"; import { SetPasswordData } from "@saleor/sdk"; -import getAccountErrorMessage from "@saleor/utils/errors/account"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/auth/components/ResetPasswordPage/ResetPasswordPage.stories.tsx b/src/auth/components/ResetPasswordPage/ResetPasswordPage.stories.tsx index 1318bbedc..4a1d1d784 100644 --- a/src/auth/components/ResetPasswordPage/ResetPasswordPage.stories.tsx +++ b/src/auth/components/ResetPasswordPage/ResetPasswordPage.stories.tsx @@ -1,6 +1,6 @@ -import CardDecorator from "@saleor/storybook/CardDecorator"; -import Decorator from "@saleor/storybook/Decorator"; -import { formError } from "@saleor/storybook/formError"; +import CardDecorator from "@dashboard/storybook/CardDecorator"; +import Decorator from "@dashboard/storybook/Decorator"; +import { formError } from "@dashboard/storybook/formError"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/auth/components/ResetPasswordPage/ResetPasswordPage.tsx b/src/auth/components/ResetPasswordPage/ResetPasswordPage.tsx index 0351b8a04..c7c01959d 100644 --- a/src/auth/components/ResetPasswordPage/ResetPasswordPage.tsx +++ b/src/auth/components/ResetPasswordPage/ResetPasswordPage.tsx @@ -1,12 +1,12 @@ +import { Button } from "@dashboard/components/Button"; +import Form from "@dashboard/components/Form"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import { IconButton } from "@dashboard/components/IconButton"; +import { getAppMountUri } from "@dashboard/config"; +import { RequestPasswordResetMutation } from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import { commonMessages } from "@dashboard/intl"; import { TextField, Typography } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import Form from "@saleor/components/Form"; -import FormSpacer from "@saleor/components/FormSpacer"; -import { IconButton } from "@saleor/components/IconButton"; -import { getAppMountUri } from "@saleor/config"; -import { RequestPasswordResetMutation } from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import { commonMessages } from "@saleor/intl"; import { ArrowRightIcon } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/auth/components/ResetPasswordSuccessPage/ResetPasswordSuccessPage.stories.tsx b/src/auth/components/ResetPasswordSuccessPage/ResetPasswordSuccessPage.stories.tsx index 6b1b90e84..4f85cf623 100644 --- a/src/auth/components/ResetPasswordSuccessPage/ResetPasswordSuccessPage.stories.tsx +++ b/src/auth/components/ResetPasswordSuccessPage/ResetPasswordSuccessPage.stories.tsx @@ -1,5 +1,5 @@ -import CardDecorator from "@saleor/storybook/CardDecorator"; -import Decorator from "@saleor/storybook/Decorator"; +import CardDecorator from "@dashboard/storybook/CardDecorator"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/auth/components/ResetPasswordSuccessPage/ResetPasswordSuccessPage.tsx b/src/auth/components/ResetPasswordSuccessPage/ResetPasswordSuccessPage.tsx index 907098d3f..2c05c6d65 100644 --- a/src/auth/components/ResetPasswordSuccessPage/ResetPasswordSuccessPage.tsx +++ b/src/auth/components/ResetPasswordSuccessPage/ResetPasswordSuccessPage.tsx @@ -1,6 +1,6 @@ +import { Button } from "@dashboard/components/Button"; +import FormSpacer from "@dashboard/components/FormSpacer"; import { Typography } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import FormSpacer from "@saleor/components/FormSpacer"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/auth/components/SectionRoute.tsx b/src/auth/components/SectionRoute.tsx index cc8d1824d..d1c6ced18 100644 --- a/src/auth/components/SectionRoute.tsx +++ b/src/auth/components/SectionRoute.tsx @@ -1,4 +1,4 @@ -import { PermissionEnum } from "@saleor/graphql"; +import { PermissionEnum } from "@dashboard/graphql"; import React from "react"; import { Route, RouteProps } from "react-router-dom"; diff --git a/src/auth/errors.ts b/src/auth/errors.ts index 3dc74024d..38fa225a6 100644 --- a/src/auth/errors.ts +++ b/src/auth/errors.ts @@ -1,5 +1,5 @@ import { ApolloError } from "@apollo/client"; -import { findValueInEnum } from "@saleor/misc"; +import { findValueInEnum } from "@dashboard/misc"; import { GraphQLError } from "graphql"; import { UserContextError } from "./types"; diff --git a/src/auth/hooks/useAuthProvider.ts b/src/auth/hooks/useAuthProvider.ts index 0427415cb..b5c80db78 100644 --- a/src/auth/hooks/useAuthProvider.ts +++ b/src/auth/hooks/useAuthProvider.ts @@ -1,22 +1,22 @@ import { ApolloClient, ApolloError } from "@apollo/client"; -import { IMessageContext } from "@saleor/components/messages"; -import { DEMO_MODE } from "@saleor/config"; -import { useUserDetailsQuery } from "@saleor/graphql"; -import useLocalStorage from "@saleor/hooks/useLocalStorage"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { commonMessages } from "@saleor/intl"; +import { IMessageContext } from "@dashboard/components/messages"; +import { DEMO_MODE } from "@dashboard/config"; +import { useUserDetailsQuery } from "@dashboard/graphql"; +import useLocalStorage from "@dashboard/hooks/useLocalStorage"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { commonMessages } from "@dashboard/intl"; +import { + isSupported as isCredentialsManagementAPISupported, + login as loginWithCredentialsManagementAPI, + saveCredentials, +} from "@dashboard/utils/credentialsManagement"; +import { getAppMountUriForRedirect } from "@dashboard/utils/urls"; import { GetExternalAccessTokenData, LoginData, useAuth, useAuthState, } from "@saleor/sdk"; -import { - isSupported as isCredentialsManagementAPISupported, - login as loginWithCredentialsManagementAPI, - saveCredentials, -} from "@saleor/utils/credentialsManagement"; -import { getAppMountUriForRedirect } from "@saleor/utils/urls"; import { useEffect, useRef, useState } from "react"; import { IntlShape } from "react-intl"; import urlJoin from "url-join"; diff --git a/src/auth/misc.ts b/src/auth/misc.ts index 8ea5b99c2..ee170f982 100644 --- a/src/auth/misc.ts +++ b/src/auth/misc.ts @@ -1,4 +1,4 @@ -import { PermissionEnum, UserFragment } from "@saleor/graphql"; +import { PermissionEnum, UserFragment } from "@dashboard/graphql"; export const hasPermission = (permission: PermissionEnum, user: UserFragment) => user.userPermissions.map(perm => perm.code).includes(permission); diff --git a/src/auth/types.ts b/src/auth/types.ts index ef13eae28..9817db1f0 100644 --- a/src/auth/types.ts +++ b/src/auth/types.ts @@ -1,4 +1,4 @@ -import { UserFragment } from "@saleor/graphql"; +import { UserFragment } from "@dashboard/graphql"; import { GetExternalAccessTokenData, GetExternalAuthUrlData, diff --git a/src/auth/urls.ts b/src/auth/urls.ts index 903e58f0e..0602c1393 100644 --- a/src/auth/urls.ts +++ b/src/auth/urls.ts @@ -1,4 +1,4 @@ -import { stringifyQs } from "@saleor/utils/urls"; +import { stringifyQs } from "@dashboard/utils/urls"; export const passwordResetPath = "/reset-password/"; export const passwordResetUrl = passwordResetPath; diff --git a/src/auth/utils.ts b/src/auth/utils.ts index d1a3fc533..45987042c 100644 --- a/src/auth/utils.ts +++ b/src/auth/utils.ts @@ -1,8 +1,8 @@ import { ApolloError, ServerError } from "@apollo/client/core"; -import { IMessage, IMessageContext } from "@saleor/components/messages"; -import { UseNotifierResult } from "@saleor/hooks/useNotifier"; -import { commonMessages } from "@saleor/intl"; -import { getMutationErrors, parseLogMessage } from "@saleor/misc"; +import { IMessage, IMessageContext } from "@dashboard/components/messages"; +import { UseNotifierResult } from "@dashboard/hooks/useNotifier"; +import { commonMessages } from "@dashboard/intl"; +import { getMutationErrors, parseLogMessage } from "@dashboard/misc"; import { IntlShape } from "react-intl"; import { isJwtError, isTokenExpired } from "./errors"; diff --git a/src/auth/views/Login.tsx b/src/auth/views/Login.tsx index 159cf8fbc..2a388854f 100644 --- a/src/auth/views/Login.tsx +++ b/src/auth/views/Login.tsx @@ -1,7 +1,7 @@ -import { useAvailableExternalAuthenticationsQuery } from "@saleor/graphql"; -import useLocalStorage from "@saleor/hooks/useLocalStorage"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { getAppMountUriForRedirect } from "@saleor/utils/urls"; +import { useAvailableExternalAuthenticationsQuery } from "@dashboard/graphql"; +import useLocalStorage from "@dashboard/hooks/useLocalStorage"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { getAppMountUriForRedirect } from "@dashboard/utils/urls"; import React, { useEffect } from "react"; import urlJoin from "url-join"; import useRouter from "use-react-router"; diff --git a/src/auth/views/NewPassword.tsx b/src/auth/views/NewPassword.tsx index ce4437086..4f3fddabc 100644 --- a/src/auth/views/NewPassword.tsx +++ b/src/auth/views/NewPassword.tsx @@ -1,4 +1,4 @@ -import useNavigator from "@saleor/hooks/useNavigator"; +import useNavigator from "@dashboard/hooks/useNavigator"; import { SetPasswordData, useAuth } from "@saleor/sdk"; import { parse as parseQs } from "qs"; import React, { useState } from "react"; diff --git a/src/auth/views/ResetPassword.tsx b/src/auth/views/ResetPassword.tsx index 5cfaf0952..4d167f607 100644 --- a/src/auth/views/ResetPassword.tsx +++ b/src/auth/views/ResetPassword.tsx @@ -1,8 +1,8 @@ -import { useRequestPasswordResetMutation } from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { commonMessages } from "@saleor/intl"; -import { extractMutationErrors } from "@saleor/misc"; -import { getAppMountUriForRedirect } from "@saleor/utils/urls"; +import { useRequestPasswordResetMutation } from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { commonMessages } from "@dashboard/intl"; +import { extractMutationErrors } from "@dashboard/misc"; +import { getAppMountUriForRedirect } from "@dashboard/utils/urls"; import React from "react"; import { useIntl } from "react-intl"; import urlJoin from "url-join"; diff --git a/src/auth/views/ResetPasswordSuccess.tsx b/src/auth/views/ResetPasswordSuccess.tsx index 20a0287e1..401ff0699 100644 --- a/src/auth/views/ResetPasswordSuccess.tsx +++ b/src/auth/views/ResetPasswordSuccess.tsx @@ -1,5 +1,5 @@ -import { getAppMountUri } from "@saleor/config"; -import useNavigator from "@saleor/hooks/useNavigator"; +import { getAppMountUri } from "@dashboard/config"; +import useNavigator from "@dashboard/hooks/useNavigator"; import React from "react"; import ResetPasswordSuccessPage from "../components/ResetPasswordSuccessPage"; diff --git a/src/categories/components/CategoryBackground/CategoryBackground.tsx b/src/categories/components/CategoryBackground/CategoryBackground.tsx index 728720a32..44f0cd928 100644 --- a/src/categories/components/CategoryBackground/CategoryBackground.tsx +++ b/src/categories/components/CategoryBackground/CategoryBackground.tsx @@ -1,12 +1,12 @@ +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import Hr from "@dashboard/components/Hr"; +import ImageUpload from "@dashboard/components/ImageUpload"; +import MediaTile from "@dashboard/components/MediaTile"; +import Skeleton from "@dashboard/components/Skeleton"; +import { CategoryDetailsFragment } from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; import { Card, CardContent, TextField } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import Hr from "@saleor/components/Hr"; -import ImageUpload from "@saleor/components/ImageUpload"; -import MediaTile from "@saleor/components/MediaTile"; -import Skeleton from "@saleor/components/Skeleton"; -import { CategoryDetailsFragment } from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/categories/components/CategoryCreatePage/CategoryCratePage.stories.tsx b/src/categories/components/CategoryCreatePage/CategoryCratePage.stories.tsx index a98950b03..53e1e19a0 100644 --- a/src/categories/components/CategoryCreatePage/CategoryCratePage.stories.tsx +++ b/src/categories/components/CategoryCreatePage/CategoryCratePage.stories.tsx @@ -1,5 +1,5 @@ -import { ProductErrorCode } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; +import { ProductErrorCode } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/categories/components/CategoryCreatePage/CategoryCreatePage.tsx b/src/categories/components/CategoryCreatePage/CategoryCreatePage.tsx index 171ab10f7..bc89ea9b6 100644 --- a/src/categories/components/CategoryCreatePage/CategoryCreatePage.tsx +++ b/src/categories/components/CategoryCreatePage/CategoryCreatePage.tsx @@ -1,13 +1,13 @@ -import { Backlink } from "@saleor/components/Backlink"; -import { CardSpacer } from "@saleor/components/CardSpacer"; -import Container from "@saleor/components/Container"; -import Metadata from "@saleor/components/Metadata"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; -import SeoForm from "@saleor/components/SeoForm"; -import { ProductErrorFragment } from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { sectionNames } from "@saleor/intl"; +import { Backlink } from "@dashboard/components/Backlink"; +import { CardSpacer } from "@dashboard/components/CardSpacer"; +import Container from "@dashboard/components/Container"; +import Metadata from "@dashboard/components/Metadata"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; +import SeoForm from "@dashboard/components/SeoForm"; +import { ProductErrorFragment } from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { sectionNames } from "@dashboard/intl"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/categories/components/CategoryCreatePage/form.tsx b/src/categories/components/CategoryCreatePage/form.tsx index ad8295f78..7025aaab9 100644 --- a/src/categories/components/CategoryCreatePage/form.tsx +++ b/src/categories/components/CategoryCreatePage/form.tsx @@ -1,17 +1,17 @@ -import { OutputData } from "@editorjs/editorjs"; -import { useExitFormDialog } from "@saleor/components/Form/useExitFormDialog"; -import { MetadataFormData } from "@saleor/components/Metadata"; +import { useExitFormDialog } from "@dashboard/components/Form/useExitFormDialog"; +import { MetadataFormData } from "@dashboard/components/Metadata"; import useForm, { CommonUseFormResult, FormChange, -} from "@saleor/hooks/useForm"; -import useHandleFormSubmit from "@saleor/hooks/useHandleFormSubmit"; -import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger"; +} from "@dashboard/hooks/useForm"; +import useHandleFormSubmit from "@dashboard/hooks/useHandleFormSubmit"; +import useMetadataChangeTrigger from "@dashboard/utils/metadata/useMetadataChangeTrigger"; import { RichTextContext, RichTextContextValues, -} from "@saleor/utils/richText/context"; -import useRichText from "@saleor/utils/richText/useRichText"; +} from "@dashboard/utils/richText/context"; +import useRichText from "@dashboard/utils/richText/useRichText"; +import { OutputData } from "@editorjs/editorjs"; import React, { useEffect } from "react"; export interface CategoryCreateFormData extends MetadataFormData { diff --git a/src/categories/components/CategoryDeleteDialog/CategoryDeleteDialog.tsx b/src/categories/components/CategoryDeleteDialog/CategoryDeleteDialog.tsx index 32e5ec689..66a92e881 100644 --- a/src/categories/components/CategoryDeleteDialog/CategoryDeleteDialog.tsx +++ b/src/categories/components/CategoryDeleteDialog/CategoryDeleteDialog.tsx @@ -1,3 +1,6 @@ +import BackButton from "@dashboard/components/BackButton"; +import { Button } from "@dashboard/components/Button"; +import { buttonMessages } from "@dashboard/intl"; import { Dialog, DialogActions, @@ -5,9 +8,6 @@ import { DialogContentText, DialogTitle, } from "@material-ui/core"; -import BackButton from "@saleor/components/BackButton"; -import { Button } from "@saleor/components/Button"; -import { buttonMessages } from "@saleor/intl"; import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/categories/components/CategoryDetailsForm/CategoryDetailsForm.tsx b/src/categories/components/CategoryDetailsForm/CategoryDetailsForm.tsx index 5126b8510..72f2b16fc 100644 --- a/src/categories/components/CategoryDetailsForm/CategoryDetailsForm.tsx +++ b/src/categories/components/CategoryDetailsForm/CategoryDetailsForm.tsx @@ -1,13 +1,13 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import RichTextEditor from "@dashboard/components/RichTextEditor"; +import { RichTextEditorLoading } from "@dashboard/components/RichTextEditor/RichTextEditorLoading"; +import { ProductErrorFragment } from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; +import { getFormErrors, getProductErrorMessage } from "@dashboard/utils/errors"; +import { useRichTextContext } from "@dashboard/utils/richText/context"; import { OutputData } from "@editorjs/editorjs"; import { Card, CardContent, TextField } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import FormSpacer from "@saleor/components/FormSpacer"; -import RichTextEditor from "@saleor/components/RichTextEditor"; -import { RichTextEditorLoading } from "@saleor/components/RichTextEditor/RichTextEditorLoading"; -import { ProductErrorFragment } from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; -import { getFormErrors, getProductErrorMessage } from "@saleor/utils/errors"; -import { useRichTextContext } from "@saleor/utils/richText/context"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/categories/components/CategoryList/CategoryList.tsx b/src/categories/components/CategoryList/CategoryList.tsx index 2a7eb6adc..bda9d0a0c 100644 --- a/src/categories/components/CategoryList/CategoryList.tsx +++ b/src/categories/components/CategoryList/CategoryList.tsx @@ -1,17 +1,20 @@ +import { + CategoryListUrlSortField, + categoryUrl, +} from "@dashboard/categories/urls"; +import Checkbox from "@dashboard/components/Checkbox"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableCellHeader from "@dashboard/components/TableCellHeader"; +import TableHead from "@dashboard/components/TableHead"; +import { TablePaginationWithContext } from "@dashboard/components/TablePagination"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { CategoryFragment } from "@dashboard/graphql"; +import { maybe, renderCollection } from "@dashboard/misc"; +import { ListActions, ListProps, SortPage } from "@dashboard/types"; +import { getArrowDirection } from "@dashboard/utils/sort"; import { TableBody, TableCell, TableFooter } from "@material-ui/core"; -import { CategoryListUrlSortField, categoryUrl } from "@saleor/categories/urls"; -import Checkbox from "@saleor/components/Checkbox"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableCellHeader from "@saleor/components/TableCellHeader"; -import TableHead from "@saleor/components/TableHead"; -import { TablePaginationWithContext } from "@saleor/components/TablePagination"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { CategoryFragment } from "@saleor/graphql"; import { makeStyles } from "@saleor/macaw-ui"; -import { maybe, renderCollection } from "@saleor/misc"; -import { ListActions, ListProps, SortPage } from "@saleor/types"; -import { getArrowDirection } from "@saleor/utils/sort"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/categories/components/CategoryListPage/CategoryListPage.stories.tsx b/src/categories/components/CategoryListPage/CategoryListPage.stories.tsx index b55d2e8d1..b767a6554 100644 --- a/src/categories/components/CategoryListPage/CategoryListPage.stories.tsx +++ b/src/categories/components/CategoryListPage/CategoryListPage.stories.tsx @@ -1,14 +1,14 @@ -import { categories } from "@saleor/categories/fixtures"; -import { CategoryListUrlSortField } from "@saleor/categories/urls"; +import { categories } from "@dashboard/categories/fixtures"; +import { CategoryListUrlSortField } from "@dashboard/categories/urls"; import { listActionsProps, pageListProps, searchPageProps, sortPageProps, tabPageProps, -} from "@saleor/fixtures"; -import Decorator from "@saleor/storybook/Decorator"; -import { PaginatorContextDecorator } from "@saleor/storybook/PaginatorContextDecorator"; +} from "@dashboard/fixtures"; +import Decorator from "@dashboard/storybook/Decorator"; +import { PaginatorContextDecorator } from "@dashboard/storybook/PaginatorContextDecorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/categories/components/CategoryListPage/CategoryListPage.tsx b/src/categories/components/CategoryListPage/CategoryListPage.tsx index 231dfaea3..c085fc400 100644 --- a/src/categories/components/CategoryListPage/CategoryListPage.tsx +++ b/src/categories/components/CategoryListPage/CategoryListPage.tsx @@ -1,21 +1,21 @@ -import { Card } from "@material-ui/core"; import { categoryAddUrl, CategoryListUrlSortField, -} from "@saleor/categories/urls"; -import { Button } from "@saleor/components/Button"; -import Container from "@saleor/components/Container"; -import PageHeader from "@saleor/components/PageHeader"; -import SearchBar from "@saleor/components/SearchBar"; -import { CategoryFragment } from "@saleor/graphql"; -import { sectionNames } from "@saleor/intl"; +} from "@dashboard/categories/urls"; +import { Button } from "@dashboard/components/Button"; +import Container from "@dashboard/components/Container"; +import PageHeader from "@dashboard/components/PageHeader"; +import SearchBar from "@dashboard/components/SearchBar"; +import { CategoryFragment } from "@dashboard/graphql"; +import { sectionNames } from "@dashboard/intl"; import { ListActions, PageListProps, SearchPageProps, SortPage, TabPageProps, -} from "@saleor/types"; +} from "@dashboard/types"; +import { Card } from "@material-ui/core"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/categories/components/CategoryProductList/CategoryProductList.tsx b/src/categories/components/CategoryProductList/CategoryProductList.tsx index 716cffa43..3890dfec5 100644 --- a/src/categories/components/CategoryProductList/CategoryProductList.tsx +++ b/src/categories/components/CategoryProductList/CategoryProductList.tsx @@ -1,17 +1,17 @@ +import Checkbox from "@dashboard/components/Checkbox"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableCellAvatar from "@dashboard/components/TableCellAvatar"; +import { AVATAR_MARGIN } from "@dashboard/components/TableCellAvatar/Avatar"; +import TableHead from "@dashboard/components/TableHead"; +import { TablePaginationWithContext } from "@dashboard/components/TablePagination"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { CategoryDetailsQuery } from "@dashboard/graphql"; +import { maybe, renderCollection } from "@dashboard/misc"; +import { productUrl } from "@dashboard/products/urls"; +import { ListActions, ListProps, RelayToFlat } from "@dashboard/types"; import { TableBody, TableCell, TableFooter } from "@material-ui/core"; -import Checkbox from "@saleor/components/Checkbox"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableCellAvatar from "@saleor/components/TableCellAvatar"; -import { AVATAR_MARGIN } from "@saleor/components/TableCellAvatar/Avatar"; -import TableHead from "@saleor/components/TableHead"; -import { TablePaginationWithContext } from "@saleor/components/TablePagination"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { CategoryDetailsQuery } from "@saleor/graphql"; import { makeStyles } from "@saleor/macaw-ui"; -import { maybe, renderCollection } from "@saleor/misc"; -import { productUrl } from "@saleor/products/urls"; -import { ListActions, ListProps, RelayToFlat } from "@saleor/types"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/categories/components/CategoryProducts/CategoryProducts.tsx b/src/categories/components/CategoryProducts/CategoryProducts.tsx index 54e08b54a..ffbb892be 100644 --- a/src/categories/components/CategoryProducts/CategoryProducts.tsx +++ b/src/categories/components/CategoryProducts/CategoryProducts.tsx @@ -1,10 +1,10 @@ +import HorizontalSpacer from "@dashboard/apps/components/HorizontalSpacer"; +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import { InternalLink } from "@dashboard/components/InternalLink"; +import { CategoryDetailsQuery } from "@dashboard/graphql"; +import { productAddUrl, productListUrl } from "@dashboard/products/urls"; import { Card } from "@material-ui/core"; -import HorizontalSpacer from "@saleor/apps/components/HorizontalSpacer"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import { InternalLink } from "@saleor/components/InternalLink"; -import { CategoryDetailsQuery } from "@saleor/graphql"; -import { productAddUrl, productListUrl } from "@saleor/products/urls"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/categories/components/CategoryUpdatePage/CategoryUpdatePage.stories.tsx b/src/categories/components/CategoryUpdatePage/CategoryUpdatePage.stories.tsx index 2008066b3..89dee9bdf 100644 --- a/src/categories/components/CategoryUpdatePage/CategoryUpdatePage.stories.tsx +++ b/src/categories/components/CategoryUpdatePage/CategoryUpdatePage.stories.tsx @@ -1,10 +1,10 @@ import placeholderImage from "@assets/images/placeholder255x255.png"; -import { category as categoryFixture } from "@saleor/categories/fixtures"; -import { listActionsProps } from "@saleor/fixtures"; -import { ProductErrorCode } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; -import { PaginatorContextDecorator } from "@saleor/storybook/PaginatorContextDecorator"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +import { category as categoryFixture } from "@dashboard/categories/fixtures"; +import { listActionsProps } from "@dashboard/fixtures"; +import { ProductErrorCode } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; +import { PaginatorContextDecorator } from "@dashboard/storybook/PaginatorContextDecorator"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/categories/components/CategoryUpdatePage/CategoryUpdatePage.tsx b/src/categories/components/CategoryUpdatePage/CategoryUpdatePage.tsx index 83009dfd1..9729ad968 100644 --- a/src/categories/components/CategoryUpdatePage/CategoryUpdatePage.tsx +++ b/src/categories/components/CategoryUpdatePage/CategoryUpdatePage.tsx @@ -1,23 +1,23 @@ -import { Card } from "@material-ui/core"; import { categoryAddUrl, categoryListUrl, categoryUrl, -} from "@saleor/categories/urls"; -import { Backlink } from "@saleor/components/Backlink"; -import { Button } from "@saleor/components/Button"; -import { CardSpacer } from "@saleor/components/CardSpacer"; -import CardTitle from "@saleor/components/CardTitle"; -import Container from "@saleor/components/Container"; -import Metadata from "@saleor/components/Metadata/Metadata"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; -import SeoForm from "@saleor/components/SeoForm"; -import { Tab, TabContainer } from "@saleor/components/Tab"; -import { CategoryDetailsQuery, ProductErrorFragment } from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { sectionNames } from "@saleor/intl"; +} from "@dashboard/categories/urls"; +import { Backlink } from "@dashboard/components/Backlink"; +import { Button } from "@dashboard/components/Button"; +import { CardSpacer } from "@dashboard/components/CardSpacer"; +import CardTitle from "@dashboard/components/CardTitle"; +import Container from "@dashboard/components/Container"; +import Metadata from "@dashboard/components/Metadata/Metadata"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; +import SeoForm from "@dashboard/components/SeoForm"; +import { Tab, TabContainer } from "@dashboard/components/Tab"; +import { CategoryDetailsQuery, ProductErrorFragment } from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { sectionNames } from "@dashboard/intl"; +import { Card } from "@material-ui/core"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/categories/components/CategoryUpdatePage/form.tsx b/src/categories/components/CategoryUpdatePage/form.tsx index 39c2dcacc..126a0f1c4 100644 --- a/src/categories/components/CategoryUpdatePage/form.tsx +++ b/src/categories/components/CategoryUpdatePage/form.tsx @@ -1,20 +1,20 @@ -import { OutputData } from "@editorjs/editorjs"; -import { useExitFormDialog } from "@saleor/components/Form/useExitFormDialog"; -import { MetadataFormData } from "@saleor/components/Metadata"; -import { CategoryDetailsFragment } from "@saleor/graphql"; +import { useExitFormDialog } from "@dashboard/components/Form/useExitFormDialog"; +import { MetadataFormData } from "@dashboard/components/Metadata"; +import { CategoryDetailsFragment } from "@dashboard/graphql"; import useForm, { CommonUseFormResult, FormChange, -} from "@saleor/hooks/useForm"; -import useHandleFormSubmit from "@saleor/hooks/useHandleFormSubmit"; -import { mapMetadataItemToInput } from "@saleor/utils/maps"; -import getMetadata from "@saleor/utils/metadata/getMetadata"; -import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger"; +} from "@dashboard/hooks/useForm"; +import useHandleFormSubmit from "@dashboard/hooks/useHandleFormSubmit"; +import { mapMetadataItemToInput } from "@dashboard/utils/maps"; +import getMetadata from "@dashboard/utils/metadata/getMetadata"; +import useMetadataChangeTrigger from "@dashboard/utils/metadata/useMetadataChangeTrigger"; import { RichTextContext, RichTextContextValues, -} from "@saleor/utils/richText/context"; -import useRichText from "@saleor/utils/richText/useRichText"; +} from "@dashboard/utils/richText/context"; +import useRichText from "@dashboard/utils/richText/useRichText"; +import { OutputData } from "@editorjs/editorjs"; import React, { useEffect } from "react"; export interface CategoryUpdateFormData extends MetadataFormData { diff --git a/src/categories/fixtures.ts b/src/categories/fixtures.ts index a79d8fbc2..80e68a854 100644 --- a/src/categories/fixtures.ts +++ b/src/categories/fixtures.ts @@ -1,4 +1,4 @@ -import { CategoryDetailsQuery, CategoryFragment } from "@saleor/graphql"; +import { CategoryDetailsQuery, CategoryFragment } from "@dashboard/graphql"; import * as richTextEditorFixtures from "../components/RichTextEditor/fixtures.json"; diff --git a/src/categories/index.tsx b/src/categories/index.tsx index 109158fc7..67273f2e7 100644 --- a/src/categories/index.tsx +++ b/src/categories/index.tsx @@ -1,5 +1,5 @@ -import { sectionNames } from "@saleor/intl"; -import { asSortParams } from "@saleor/utils/sort"; +import { sectionNames } from "@dashboard/intl"; +import { asSortParams } from "@dashboard/utils/sort"; import { parse as parseQs } from "qs"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/categories/urls.ts b/src/categories/urls.ts index e9e562066..da9d0c1d8 100644 --- a/src/categories/urls.ts +++ b/src/categories/urls.ts @@ -1,4 +1,4 @@ -import { stringifyQs } from "@saleor/utils/urls"; +import { stringifyQs } from "@dashboard/utils/urls"; import urlJoin from "url-join"; import { diff --git a/src/categories/views/CategoryCreate.tsx b/src/categories/views/CategoryCreate.tsx index cb3f86422..b114830fc 100644 --- a/src/categories/views/CategoryCreate.tsx +++ b/src/categories/views/CategoryCreate.tsx @@ -1,15 +1,15 @@ -import { WindowTitle } from "@saleor/components/WindowTitle"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; import { CategoryCreateMutation, useCategoryCreateMutation, useUpdateMetadataMutation, useUpdatePrivateMetadataMutation, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { getMutationErrors } from "@saleor/misc"; -import createMetadataCreateHandler from "@saleor/utils/handlers/metadataCreateHandler"; -import { getParsedDataForJsonStringField } from "@saleor/utils/richText/misc"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { getMutationErrors } from "@dashboard/misc"; +import createMetadataCreateHandler from "@dashboard/utils/handlers/metadataCreateHandler"; +import { getParsedDataForJsonStringField } from "@dashboard/utils/richText/misc"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/categories/views/CategoryDetails.tsx b/src/categories/views/CategoryDetails.tsx index a27b21427..039980cbd 100644 --- a/src/categories/views/CategoryDetails.tsx +++ b/src/categories/views/CategoryDetails.tsx @@ -1,7 +1,6 @@ -import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; -import NotFoundPage from "@saleor/components/NotFoundPage"; -import { WindowTitle } from "@saleor/components/WindowTitle"; +import ActionDialog from "@dashboard/components/ActionDialog"; +import NotFoundPage from "@dashboard/components/NotFoundPage"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; import { CategoryBulkDeleteMutation, CategoryDeleteMutation, @@ -14,20 +13,21 @@ import { useProductBulkDeleteMutation, useUpdateMetadataMutation, useUpdatePrivateMetadataMutation, -} from "@saleor/graphql"; -import useBulkActions from "@saleor/hooks/useBulkActions"; +} from "@dashboard/graphql"; +import useBulkActions from "@dashboard/hooks/useBulkActions"; import useLocalPaginator, { useSectionLocalPaginationState, -} from "@saleor/hooks/useLocalPaginator"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { PaginatorContext } from "@saleor/hooks/usePaginator"; -import { commonMessages, errorMessages } from "@saleor/intl"; +} from "@dashboard/hooks/useLocalPaginator"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { PaginatorContext } from "@dashboard/hooks/usePaginator"; +import { commonMessages, errorMessages } from "@dashboard/intl"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createMetadataUpdateHandler from "@dashboard/utils/handlers/metadataUpdateHandler"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; +import { getParsedDataForJsonStringField } from "@dashboard/utils/richText/misc"; +import { DialogContentText } from "@material-ui/core"; import { DeleteIcon, IconButton } from "@saleor/macaw-ui"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createMetadataUpdateHandler from "@saleor/utils/handlers/metadataUpdateHandler"; -import { mapEdgesToItems } from "@saleor/utils/maps"; -import { getParsedDataForJsonStringField } from "@saleor/utils/richText/misc"; import React, { useState } from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/categories/views/CategoryList/CategoryList.tsx b/src/categories/views/CategoryList/CategoryList.tsx index 27286253f..4b521d325 100644 --- a/src/categories/views/CategoryList/CategoryList.tsx +++ b/src/categories/views/CategoryList/CategoryList.tsx @@ -1,29 +1,29 @@ -import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; -import DeleteFilterTabDialog from "@saleor/components/DeleteFilterTabDialog"; +import ActionDialog from "@dashboard/components/ActionDialog"; +import DeleteFilterTabDialog from "@dashboard/components/DeleteFilterTabDialog"; import SaveFilterTabDialog, { SaveFilterTabDialogFormData, -} from "@saleor/components/SaveFilterTabDialog"; +} from "@dashboard/components/SaveFilterTabDialog"; import { CategoryBulkDeleteMutation, useCategoryBulkDeleteMutation, useRootCategoriesQuery, -} from "@saleor/graphql"; -import useBulkActions from "@saleor/hooks/useBulkActions"; -import useListSettings from "@saleor/hooks/useListSettings"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; +} from "@dashboard/graphql"; +import useBulkActions from "@dashboard/hooks/useBulkActions"; +import useListSettings from "@dashboard/hooks/useListSettings"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { usePaginationReset } from "@dashboard/hooks/usePaginationReset"; import usePaginator, { createPaginationState, PaginatorContext, -} from "@saleor/hooks/usePaginator"; +} from "@dashboard/hooks/usePaginator"; +import { maybe } from "@dashboard/misc"; +import { ListViews } from "@dashboard/types"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createSortHandler from "@dashboard/utils/handlers/sortHandler"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; +import { getSortParams } from "@dashboard/utils/sort"; +import { DialogContentText } from "@material-ui/core"; import { DeleteIcon, IconButton } from "@saleor/macaw-ui"; -import { maybe } from "@saleor/misc"; -import { ListViews } from "@saleor/types"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createSortHandler from "@saleor/utils/handlers/sortHandler"; -import { mapEdgesToItems } from "@saleor/utils/maps"; -import { getSortParams } from "@saleor/utils/sort"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/categories/views/CategoryList/filter.ts b/src/categories/views/CategoryList/filter.ts index 57fce398f..96c3dbf22 100644 --- a/src/categories/views/CategoryList/filter.ts +++ b/src/categories/views/CategoryList/filter.ts @@ -1,4 +1,4 @@ -import { CategoryFilterInput } from "@saleor/graphql"; +import { CategoryFilterInput } from "@dashboard/graphql"; import { createFilterTabUtils, diff --git a/src/categories/views/CategoryList/sort.ts b/src/categories/views/CategoryList/sort.ts index 64d3d32e1..dc0e1bb94 100644 --- a/src/categories/views/CategoryList/sort.ts +++ b/src/categories/views/CategoryList/sort.ts @@ -1,6 +1,6 @@ -import { CategoryListUrlSortField } from "@saleor/categories/urls"; -import { CategorySortField } from "@saleor/graphql"; -import { createGetSortQueryVariables } from "@saleor/utils/sort"; +import { CategoryListUrlSortField } from "@dashboard/categories/urls"; +import { CategorySortField } from "@dashboard/graphql"; +import { createGetSortQueryVariables } from "@dashboard/utils/sort"; export function getSortQueryField( sort: CategoryListUrlSortField, diff --git a/src/channels/components/AssignmentList/AssignmentList.tsx b/src/channels/components/AssignmentList/AssignmentList.tsx index be6bbbf4f..f442c6194 100644 --- a/src/channels/components/AssignmentList/AssignmentList.tsx +++ b/src/channels/components/AssignmentList/AssignmentList.tsx @@ -1,6 +1,6 @@ +import Skeleton from "@dashboard/components/Skeleton"; +import { ReorderEvent } from "@dashboard/types"; import { Accordion, Divider, Typography } from "@material-ui/core"; -import Skeleton from "@saleor/components/Skeleton"; -import { ReorderEvent } from "@saleor/types"; import React from "react"; import { defineMessages, useIntl } from "react-intl"; diff --git a/src/channels/components/AssignmentList/AssignmentListFooter.tsx b/src/channels/components/AssignmentList/AssignmentListFooter.tsx index c32634a1c..e1008016c 100644 --- a/src/channels/components/AssignmentList/AssignmentListFooter.tsx +++ b/src/channels/components/AssignmentList/AssignmentListFooter.tsx @@ -1,7 +1,7 @@ +import SingleAutocompleteSelectField from "@dashboard/components/SingleAutocompleteSelectField"; +import CardAddItemsFooter from "@dashboard/products/components/ProductStocks/CardAddItemsFooter"; +import { mapNodeToChoice } from "@dashboard/utils/maps"; import { ClickAwayListener } from "@material-ui/core"; -import SingleAutocompleteSelectField from "@saleor/components/SingleAutocompleteSelectField"; -import CardAddItemsFooter from "@saleor/products/components/ProductStocks/CardAddItemsFooter"; -import { mapNodeToChoice } from "@saleor/utils/maps"; import React, { useEffect, useRef, useState } from "react"; import { defineMessages, useIntl } from "react-intl"; diff --git a/src/channels/components/AssignmentList/AssignmentListHeader.tsx b/src/channels/components/AssignmentList/AssignmentListHeader.tsx index f4a150c6b..62e6fd2c9 100644 --- a/src/channels/components/AssignmentList/AssignmentListHeader.tsx +++ b/src/channels/components/AssignmentList/AssignmentListHeader.tsx @@ -1,6 +1,6 @@ +import HorizontalSpacer from "@dashboard/apps/components/HorizontalSpacer"; +import Skeleton from "@dashboard/components/Skeleton"; import { Typography } from "@material-ui/core"; -import HorizontalSpacer from "@saleor/apps/components/HorizontalSpacer"; -import Skeleton from "@saleor/components/Skeleton"; import { AccordionSummary } from "@saleor/macaw-ui"; import React from "react"; diff --git a/src/channels/components/AssignmentList/Item.tsx b/src/channels/components/AssignmentList/Item.tsx index 2564921a3..56483294d 100644 --- a/src/channels/components/AssignmentList/Item.tsx +++ b/src/channels/components/AssignmentList/Item.tsx @@ -1,5 +1,5 @@ +import DeletableItem from "@dashboard/components/DeletableItem"; import { Divider, Typography } from "@material-ui/core"; -import DeletableItem from "@saleor/components/DeletableItem"; import React from "react"; import { SortableElement, SortableElementProps } from "react-sortable-hoc"; diff --git a/src/channels/components/AssignmentList/types.ts b/src/channels/components/AssignmentList/types.ts index 567849ab3..178302f11 100644 --- a/src/channels/components/AssignmentList/types.ts +++ b/src/channels/components/AssignmentList/types.ts @@ -1,4 +1,4 @@ -import { FetchMoreProps, ReorderAction } from "@saleor/types"; +import { FetchMoreProps, ReorderAction } from "@dashboard/types"; export interface AssignItem { id: string; diff --git a/src/channels/components/ChannelAllocationStrategy/ChannelAllocationStrategy.tsx b/src/channels/components/ChannelAllocationStrategy/ChannelAllocationStrategy.tsx index 0c3ee6f9d..f6e3ed33f 100644 --- a/src/channels/components/ChannelAllocationStrategy/ChannelAllocationStrategy.tsx +++ b/src/channels/components/ChannelAllocationStrategy/ChannelAllocationStrategy.tsx @@ -1,9 +1,9 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import PreviewPill from "@dashboard/components/PreviewPill"; +import RadioGroupField from "@dashboard/components/RadioGroupField"; +import { AllocationStrategyEnum, StockSettingsInput } from "@dashboard/graphql"; import { Card, CardContent, Typography } from "@material-ui/core"; import HelpOutline from "@material-ui/icons/HelpOutline"; -import CardTitle from "@saleor/components/CardTitle"; -import PreviewPill from "@saleor/components/PreviewPill"; -import RadioGroupField from "@saleor/components/RadioGroupField"; -import { AllocationStrategyEnum, StockSettingsInput } from "@saleor/graphql"; import { Tooltip } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/channels/components/ChannelDeleteDialog/ChannelDeleteDialog.tsx b/src/channels/components/ChannelDeleteDialog/ChannelDeleteDialog.tsx index a11aa06f2..3337b42f1 100644 --- a/src/channels/components/ChannelDeleteDialog/ChannelDeleteDialog.tsx +++ b/src/channels/components/ChannelDeleteDialog/ChannelDeleteDialog.tsx @@ -1,11 +1,11 @@ -import { Typography } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; +import ActionDialog from "@dashboard/components/ActionDialog"; import { Choices, SingleSelectField, -} from "@saleor/components/SingleSelectField"; -import useStateFromProps from "@saleor/hooks/useStateFromProps"; -import { buttonMessages } from "@saleor/intl"; +} from "@dashboard/components/SingleSelectField"; +import useStateFromProps from "@dashboard/hooks/useStateFromProps"; +import { buttonMessages } from "@dashboard/intl"; +import { Typography } from "@material-ui/core"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { defineMessages, useIntl } from "react-intl"; diff --git a/src/channels/components/ChannelForm/ChannelForm.tsx b/src/channels/components/ChannelForm/ChannelForm.tsx index cab4b1655..e5c443de3 100644 --- a/src/channels/components/ChannelForm/ChannelForm.tsx +++ b/src/channels/components/ChannelForm/ChannelForm.tsx @@ -1,3 +1,23 @@ +import { + ChannelShippingZones, + ChannelWarehouses, +} from "@dashboard/channels/pages/ChannelDetailsPage/types"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import CardTitle from "@dashboard/components/CardTitle"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import SingleAutocompleteSelectField, { + SingleAutocompleteChoiceType, +} from "@dashboard/components/SingleAutocompleteSelectField"; +import { + ChannelErrorFragment, + CountryCode, + StockSettingsInput, +} from "@dashboard/graphql"; +import useClipboard from "@dashboard/hooks/useClipboard"; +import { ChangeEvent, FormChange } from "@dashboard/hooks/useForm"; +import { commonMessages } from "@dashboard/intl"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getChannelsErrorMessage from "@dashboard/utils/errors/channels"; import { Card, CardContent, @@ -5,26 +25,6 @@ import { TextField, Typography, } from "@material-ui/core"; -import { - ChannelShippingZones, - ChannelWarehouses, -} from "@saleor/channels/pages/ChannelDetailsPage/types"; -import CardSpacer from "@saleor/components/CardSpacer"; -import CardTitle from "@saleor/components/CardTitle"; -import FormSpacer from "@saleor/components/FormSpacer"; -import SingleAutocompleteSelectField, { - SingleAutocompleteChoiceType, -} from "@saleor/components/SingleAutocompleteSelectField"; -import { - ChannelErrorFragment, - CountryCode, - StockSettingsInput, -} from "@saleor/graphql"; -import useClipboard from "@saleor/hooks/useClipboard"; -import { ChangeEvent, FormChange } from "@saleor/hooks/useForm"; -import { commonMessages } from "@saleor/intl"; -import { getFormErrors } from "@saleor/utils/errors"; -import getChannelsErrorMessage from "@saleor/utils/errors/channels"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/channels/components/ChannelPickerDialog/ChannelPickerDialog.tsx b/src/channels/components/ChannelPickerDialog/ChannelPickerDialog.tsx index a292835f3..fb33d0c20 100644 --- a/src/channels/components/ChannelPickerDialog/ChannelPickerDialog.tsx +++ b/src/channels/components/ChannelPickerDialog/ChannelPickerDialog.tsx @@ -1,9 +1,9 @@ +import ActionDialog from "@dashboard/components/ActionDialog"; +import { Choice } from "@dashboard/components/SingleSelectField"; +import useChoiceSearch from "@dashboard/hooks/useChoiceSearch"; +import useModalDialogOpen from "@dashboard/hooks/useModalDialogOpen"; +import useStateFromProps from "@dashboard/hooks/useStateFromProps"; import { MenuItem } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; -import { Choice } from "@saleor/components/SingleSelectField"; -import useChoiceSearch from "@saleor/hooks/useChoiceSearch"; -import useModalDialogOpen from "@saleor/hooks/useModalDialogOpen"; -import useStateFromProps from "@saleor/hooks/useStateFromProps"; import { Autocomplete, ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/channels/components/ChannelStatus/ChannelStatus.tsx b/src/channels/components/ChannelStatus/ChannelStatus.tsx index 8658a3619..ac41ac082 100644 --- a/src/channels/components/ChannelStatus/ChannelStatus.tsx +++ b/src/channels/components/ChannelStatus/ChannelStatus.tsx @@ -1,6 +1,6 @@ +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; import { Card, CardContent, Typography } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/channels/components/ShippingZones/ShippingZones.tsx b/src/channels/components/ShippingZones/ShippingZones.tsx index 6d8502ac5..2c75b1490 100644 --- a/src/channels/components/ShippingZones/ShippingZones.tsx +++ b/src/channels/components/ShippingZones/ShippingZones.tsx @@ -1,9 +1,9 @@ +import { ChannelShippingZones } from "@dashboard/channels/pages/ChannelDetailsPage/types"; +import CardTitle from "@dashboard/components/CardTitle"; +import { SearchShippingZonesQuery } from "@dashboard/graphql"; +import { sectionNames } from "@dashboard/intl"; +import { FetchMoreProps, RelayToFlat } from "@dashboard/types"; import { Card, CardContent, Typography } from "@material-ui/core"; -import { ChannelShippingZones } from "@saleor/channels/pages/ChannelDetailsPage/types"; -import CardTitle from "@saleor/components/CardTitle"; -import { SearchShippingZonesQuery } from "@saleor/graphql"; -import { sectionNames } from "@saleor/intl"; -import { FetchMoreProps, RelayToFlat } from "@saleor/types"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/channels/components/Warehouses/Warehouses.tsx b/src/channels/components/Warehouses/Warehouses.tsx index 76b8e9ffa..81f325458 100644 --- a/src/channels/components/Warehouses/Warehouses.tsx +++ b/src/channels/components/Warehouses/Warehouses.tsx @@ -1,9 +1,9 @@ +import { ChannelWarehouses } from "@dashboard/channels/pages/ChannelDetailsPage/types"; +import CardTitle from "@dashboard/components/CardTitle"; +import { SearchWarehousesQuery } from "@dashboard/graphql"; +import { sectionNames } from "@dashboard/intl"; +import { FetchMoreProps, RelayToFlat, ReorderAction } from "@dashboard/types"; import { Card, CardContent, Typography } from "@material-ui/core"; -import { ChannelWarehouses } from "@saleor/channels/pages/ChannelDetailsPage/types"; -import CardTitle from "@saleor/components/CardTitle"; -import { SearchWarehousesQuery } from "@saleor/graphql"; -import { sectionNames } from "@saleor/intl"; -import { FetchMoreProps, RelayToFlat, ReorderAction } from "@saleor/types"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/channels/fixtures.ts b/src/channels/fixtures.ts index 089086a41..8aae5fb2c 100644 --- a/src/channels/fixtures.ts +++ b/src/channels/fixtures.ts @@ -4,7 +4,7 @@ import { ChannelErrorCode, ChannelErrorFragment, ProductFragment, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import { Money } from "@saleor/sdk/dist/apollo/types"; export const channelCreateErrors: ChannelErrorFragment[] = [ diff --git a/src/channels/index.tsx b/src/channels/index.tsx index c127dc3d3..af98d4083 100644 --- a/src/channels/index.tsx +++ b/src/channels/index.tsx @@ -1,5 +1,5 @@ -import { sectionNames } from "@saleor/intl"; -import { asSortParams } from "@saleor/utils/sort"; +import { sectionNames } from "@dashboard/intl"; +import { asSortParams } from "@dashboard/utils/sort"; import { parse as parseQs } from "qs"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/channels/pages/ChannelDetailsPage/ChannelDetailsPage.stories.tsx b/src/channels/pages/ChannelDetailsPage/ChannelDetailsPage.stories.tsx index 6a26ba6d7..4494faa4b 100644 --- a/src/channels/pages/ChannelDetailsPage/ChannelDetailsPage.stories.tsx +++ b/src/channels/pages/ChannelDetailsPage/ChannelDetailsPage.stories.tsx @@ -1,7 +1,7 @@ -import { channel, channelCreateErrors } from "@saleor/channels/fixtures"; -import { countries } from "@saleor/fixtures"; -import { ChannelErrorFragment } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; +import { channel, channelCreateErrors } from "@dashboard/channels/fixtures"; +import { countries } from "@dashboard/fixtures"; +import { ChannelErrorFragment } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/channels/pages/ChannelDetailsPage/ChannelDetailsPage.tsx b/src/channels/pages/ChannelDetailsPage/ChannelDetailsPage.tsx index 0d30bddaf..3bda4dfa4 100644 --- a/src/channels/pages/ChannelDetailsPage/ChannelDetailsPage.tsx +++ b/src/channels/pages/ChannelDetailsPage/ChannelDetailsPage.tsx @@ -1,14 +1,14 @@ -import ChannelAllocationStrategy from "@saleor/channels/components/ChannelAllocationStrategy"; -import ShippingZones from "@saleor/channels/components/ShippingZones"; -import Warehouses from "@saleor/channels/components/Warehouses"; -import { channelsListUrl } from "@saleor/channels/urls"; -import { validateChannelFormData } from "@saleor/channels/validation"; -import CardSpacer from "@saleor/components/CardSpacer"; -import Form from "@saleor/components/Form"; -import Grid from "@saleor/components/Grid"; -import RequirePermissions from "@saleor/components/RequirePermissions"; -import Savebar from "@saleor/components/Savebar"; -import { SingleAutocompleteChoiceType } from "@saleor/components/SingleAutocompleteSelectField"; +import ChannelAllocationStrategy from "@dashboard/channels/components/ChannelAllocationStrategy"; +import ShippingZones from "@dashboard/channels/components/ShippingZones"; +import Warehouses from "@dashboard/channels/components/Warehouses"; +import { channelsListUrl } from "@dashboard/channels/urls"; +import { validateChannelFormData } from "@dashboard/channels/validation"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import Form from "@dashboard/components/Form"; +import Grid from "@dashboard/components/Grid"; +import RequirePermissions from "@dashboard/components/RequirePermissions"; +import Savebar from "@dashboard/components/Savebar"; +import { SingleAutocompleteChoiceType } from "@dashboard/components/SingleAutocompleteSelectField"; import { AllocationStrategyEnum, ChannelDetailsFragment, @@ -19,16 +19,16 @@ import { SearchShippingZonesQuery, SearchWarehousesQuery, StockSettingsInput, -} from "@saleor/graphql"; -import { SearchData } from "@saleor/hooks/makeTopLevelSearch"; -import { getParsedSearchData } from "@saleor/hooks/makeTopLevelSearch/utils"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useStateFromProps from "@saleor/hooks/useStateFromProps"; +} from "@dashboard/graphql"; +import { SearchData } from "@dashboard/hooks/makeTopLevelSearch"; +import { getParsedSearchData } from "@dashboard/hooks/makeTopLevelSearch/utils"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useStateFromProps from "@dashboard/hooks/useStateFromProps"; +import { FetchMoreProps, RelayToFlat } from "@dashboard/types"; +import createSingleAutocompleteSelectHandler from "@dashboard/utils/handlers/singleAutocompleteSelectChangeHandler"; +import { mapCountriesToChoices } from "@dashboard/utils/maps"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { FetchMoreProps, RelayToFlat } from "@saleor/types"; -import createSingleAutocompleteSelectHandler from "@saleor/utils/handlers/singleAutocompleteSelectChangeHandler"; -import { mapCountriesToChoices } from "@saleor/utils/maps"; import React, { useState } from "react"; import { ChannelForm, FormData } from "../../components/ChannelForm"; diff --git a/src/channels/pages/ChannelDetailsPage/handlers.ts b/src/channels/pages/ChannelDetailsPage/handlers.ts index 8bdafc392..5c3c82aed 100644 --- a/src/channels/pages/ChannelDetailsPage/handlers.ts +++ b/src/channels/pages/ChannelDetailsPage/handlers.ts @@ -1,9 +1,9 @@ -import { FormData } from "@saleor/channels/components/ChannelForm"; -import { SearchData } from "@saleor/hooks/makeTopLevelSearch"; -import { getParsedSearchData } from "@saleor/hooks/makeTopLevelSearch/utils"; -import { getById, getByUnmatchingId } from "@saleor/misc"; -import { ReorderAction, ReorderEvent } from "@saleor/types"; -import { move } from "@saleor/utils/lists"; +import { FormData } from "@dashboard/channels/components/ChannelForm"; +import { SearchData } from "@dashboard/hooks/makeTopLevelSearch"; +import { getParsedSearchData } from "@dashboard/hooks/makeTopLevelSearch/utils"; +import { getById, getByUnmatchingId } from "@dashboard/misc"; +import { ReorderAction, ReorderEvent } from "@dashboard/types"; +import { move } from "@dashboard/utils/lists"; import { getUpdatedIdsWithNewId, getUpdatedIdsWithoutNewId } from "./utils"; diff --git a/src/channels/pages/ChannelDetailsPage/types.ts b/src/channels/pages/ChannelDetailsPage/types.ts index 346e2dd53..81ba086d0 100644 --- a/src/channels/pages/ChannelDetailsPage/types.ts +++ b/src/channels/pages/ChannelDetailsPage/types.ts @@ -1,5 +1,8 @@ -import { ChannelShippingZonesQuery, WarehouseFragment } from "@saleor/graphql"; -import { RelayToFlat } from "@saleor/types"; +import { + ChannelShippingZonesQuery, + WarehouseFragment, +} from "@dashboard/graphql"; +import { RelayToFlat } from "@dashboard/types"; export type ChannelShippingZones = RelayToFlat< ChannelShippingZonesQuery["shippingZones"] diff --git a/src/channels/pages/ChannelsListPage/ChannelsListPage.stories.tsx b/src/channels/pages/ChannelsListPage/ChannelsListPage.stories.tsx index 254c5a8a7..04c93161d 100644 --- a/src/channels/pages/ChannelsListPage/ChannelsListPage.stories.tsx +++ b/src/channels/pages/ChannelsListPage/ChannelsListPage.stories.tsx @@ -1,6 +1,6 @@ -import { channelsList } from "@saleor/channels/fixtures"; -import { limits, limitsReached } from "@saleor/fixtures"; -import Decorator from "@saleor/storybook/Decorator"; +import { channelsList } from "@dashboard/channels/fixtures"; +import { limits, limitsReached } from "@dashboard/fixtures"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/channels/pages/ChannelsListPage/ChannelsListPage.tsx b/src/channels/pages/ChannelsListPage/ChannelsListPage.tsx index 18d945f36..8267fea23 100644 --- a/src/channels/pages/ChannelsListPage/ChannelsListPage.tsx +++ b/src/channels/pages/ChannelsListPage/ChannelsListPage.tsx @@ -1,21 +1,21 @@ +import { channelAddUrl, channelUrl } from "@dashboard/channels/urls"; +import { Backlink } from "@dashboard/components/Backlink"; +import { Button } from "@dashboard/components/Button"; +import Container from "@dashboard/components/Container"; +import LimitReachedAlert from "@dashboard/components/LimitReachedAlert"; +import PageHeader from "@dashboard/components/PageHeader"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import { TableButtonWrapper } from "@dashboard/components/TableButtonWrapper/TableButtonWrapper"; +import TableCellHeader from "@dashboard/components/TableCellHeader"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { configurationMenuUrl } from "@dashboard/configuration"; +import { ChannelDetailsFragment, RefreshLimitsQuery } from "@dashboard/graphql"; +import { sectionNames } from "@dashboard/intl"; +import { renderCollection, stopPropagation } from "@dashboard/misc"; +import { hasLimits, isLimitReached } from "@dashboard/utils/limits"; import { Card, TableBody, TableCell, TableHead } from "@material-ui/core"; -import { channelAddUrl, channelUrl } from "@saleor/channels/urls"; -import { Backlink } from "@saleor/components/Backlink"; -import { Button } from "@saleor/components/Button"; -import Container from "@saleor/components/Container"; -import LimitReachedAlert from "@saleor/components/LimitReachedAlert"; -import PageHeader from "@saleor/components/PageHeader"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import { TableButtonWrapper } from "@saleor/components/TableButtonWrapper/TableButtonWrapper"; -import TableCellHeader from "@saleor/components/TableCellHeader"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { configurationMenuUrl } from "@saleor/configuration"; -import { ChannelDetailsFragment, RefreshLimitsQuery } from "@saleor/graphql"; -import { sectionNames } from "@saleor/intl"; import { DeleteIcon, IconButton } from "@saleor/macaw-ui"; -import { renderCollection, stopPropagation } from "@saleor/misc"; -import { hasLimits, isLimitReached } from "@saleor/utils/limits"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/channels/urls.ts b/src/channels/urls.ts index 5b63d0d9f..e328224f9 100644 --- a/src/channels/urls.ts +++ b/src/channels/urls.ts @@ -1,4 +1,4 @@ -import { stringifyQs } from "@saleor/utils/urls"; +import { stringifyQs } from "@dashboard/utils/urls"; import urlJoin from "url-join"; import { Dialog, Filters, SingleAction, Sort } from "../types"; diff --git a/src/channels/utils.ts b/src/channels/utils.ts index c10e0c91f..eb30bc299 100644 --- a/src/channels/utils.ts +++ b/src/channels/utils.ts @@ -1,9 +1,9 @@ import { ChannelSaleFormData, SaleDetailsPageFormData, -} from "@saleor/discounts/components/SaleDetailsPage"; -import { VoucherDetailsPageFormData } from "@saleor/discounts/components/VoucherDetailsPage"; -import { RequirementsPicker } from "@saleor/discounts/types"; +} from "@dashboard/discounts/components/SaleDetailsPage"; +import { VoucherDetailsPageFormData } from "@dashboard/discounts/components/VoucherDetailsPage"; +import { RequirementsPicker } from "@dashboard/discounts/types"; import { ChannelDetailsFragment, ChannelFragment, @@ -15,10 +15,10 @@ import { SaleType, ShippingZoneQuery, VoucherDetailsFragment, -} from "@saleor/graphql"; -import { RequireOnlyOne } from "@saleor/misc"; -import { validatePrice } from "@saleor/products/utils/validation"; -import { mapNodeToChoice } from "@saleor/utils/maps"; +} from "@dashboard/graphql"; +import { RequireOnlyOne } from "@dashboard/misc"; +import { validatePrice } from "@dashboard/products/utils/validation"; +import { mapNodeToChoice } from "@dashboard/utils/maps"; import uniqBy from "lodash/uniqBy"; export interface Channel { diff --git a/src/channels/validation.ts b/src/channels/validation.ts index 018bd83ea..0a8ce514d 100644 --- a/src/channels/validation.ts +++ b/src/channels/validation.ts @@ -1,4 +1,4 @@ -import { ChannelErrorCode, ChannelErrorFragment } from "@saleor/graphql"; +import { ChannelErrorCode, ChannelErrorFragment } from "@dashboard/graphql"; import { FormData } from "./components/ChannelForm"; diff --git a/src/channels/views/ChannelCreate/ChannelCreate.tsx b/src/channels/views/ChannelCreate/ChannelCreate.tsx index 0cff2dba5..877ae01cd 100644 --- a/src/channels/views/ChannelCreate/ChannelCreate.tsx +++ b/src/channels/views/ChannelCreate/ChannelCreate.tsx @@ -1,22 +1,22 @@ -import { FormData } from "@saleor/channels/components/ChannelForm/ChannelForm"; -import { Backlink } from "@saleor/components/Backlink"; -import Container from "@saleor/components/Container"; -import PageHeader from "@saleor/components/PageHeader"; -import { WindowTitle } from "@saleor/components/WindowTitle"; +import { FormData } from "@dashboard/channels/components/ChannelForm/ChannelForm"; +import { Backlink } from "@dashboard/components/Backlink"; +import Container from "@dashboard/components/Container"; +import PageHeader from "@dashboard/components/PageHeader"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; import { ChannelCreateMutation, ChannelErrorFragment, useChannelCreateMutation, useChannelReorderWarehousesMutation, -} from "@saleor/graphql"; -import { getSearchFetchMoreProps } from "@saleor/hooks/makeTopLevelSearch/utils"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { getDefaultNotifierSuccessErrorData } from "@saleor/hooks/useNotifier/utils"; -import useShop from "@saleor/hooks/useShop"; -import { sectionNames } from "@saleor/intl"; -import { extractMutationErrors } from "@saleor/misc"; -import getChannelsErrorMessage from "@saleor/utils/errors/channels"; +} from "@dashboard/graphql"; +import { getSearchFetchMoreProps } from "@dashboard/hooks/makeTopLevelSearch/utils"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { getDefaultNotifierSuccessErrorData } from "@dashboard/hooks/useNotifier/utils"; +import useShop from "@dashboard/hooks/useShop"; +import { sectionNames } from "@dashboard/intl"; +import { extractMutationErrors } from "@dashboard/misc"; +import getChannelsErrorMessage from "@dashboard/utils/errors/channels"; import currencyCodes from "currency-codes"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/channels/views/ChannelDetails/ChannelDetails.tsx b/src/channels/views/ChannelDetails/ChannelDetails.tsx index a6722b0c0..9c7e91171 100644 --- a/src/channels/views/ChannelDetails/ChannelDetails.tsx +++ b/src/channels/views/ChannelDetails/ChannelDetails.tsx @@ -1,10 +1,10 @@ -import ChannelDeleteDialog from "@saleor/channels/components/ChannelDeleteDialog"; -import { FormData } from "@saleor/channels/components/ChannelForm/ChannelForm"; -import { getChannelsCurrencyChoices } from "@saleor/channels/utils"; -import { Backlink } from "@saleor/components/Backlink"; -import Container from "@saleor/components/Container"; -import PageHeader from "@saleor/components/PageHeader"; -import { WindowTitle } from "@saleor/components/WindowTitle"; +import ChannelDeleteDialog from "@dashboard/channels/components/ChannelDeleteDialog"; +import { FormData } from "@dashboard/channels/components/ChannelForm/ChannelForm"; +import { getChannelsCurrencyChoices } from "@dashboard/channels/utils"; +import { Backlink } from "@dashboard/components/Backlink"; +import Container from "@dashboard/components/Container"; +import PageHeader from "@dashboard/components/PageHeader"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; import { ChannelDeleteMutation, ChannelErrorFragment, @@ -16,17 +16,17 @@ import { useChannelReorderWarehousesMutation, useChannelsQuery, useChannelUpdateMutation, -} from "@saleor/graphql"; -import { getSearchFetchMoreProps } from "@saleor/hooks/makeTopLevelSearch/utils"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { getDefaultNotifierSuccessErrorData } from "@saleor/hooks/useNotifier/utils"; -import useShop from "@saleor/hooks/useShop"; -import { sectionNames } from "@saleor/intl"; -import { extractMutationErrors } from "@saleor/misc"; -import getChannelsErrorMessage from "@saleor/utils/errors/channels"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/graphql"; +import { getSearchFetchMoreProps } from "@dashboard/hooks/makeTopLevelSearch/utils"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { getDefaultNotifierSuccessErrorData } from "@dashboard/hooks/useNotifier/utils"; +import useShop from "@dashboard/hooks/useShop"; +import { sectionNames } from "@dashboard/intl"; +import { extractMutationErrors } from "@dashboard/misc"; +import getChannelsErrorMessage from "@dashboard/utils/errors/channels"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/channels/views/ChannelDetails/handlers.ts b/src/channels/views/ChannelDetails/handlers.ts index 1d09b193e..e0651582a 100644 --- a/src/channels/views/ChannelDetails/handlers.ts +++ b/src/channels/views/ChannelDetails/handlers.ts @@ -1,6 +1,6 @@ -import { ReorderInput } from "@saleor/graphql"; -import { Node } from "@saleor/types"; -import { move } from "@saleor/utils/lists"; +import { ReorderInput } from "@dashboard/graphql"; +import { Node } from "@dashboard/types"; +import { move } from "@dashboard/utils/lists"; export function calculateItemsOrderMoves( itemsInputOrder: T[], diff --git a/src/channels/views/ChannelDetails/useShippingZones.ts b/src/channels/views/ChannelDetails/useShippingZones.ts index ff0c1316c..2a04a88d8 100644 --- a/src/channels/views/ChannelDetails/useShippingZones.ts +++ b/src/channels/views/ChannelDetails/useShippingZones.ts @@ -1,12 +1,12 @@ -import { useUserPermissions } from "@saleor/auth/hooks/useUserPermissions"; -import { hasPermissions } from "@saleor/components/RequirePermissions"; -import { DEFAULT_INITIAL_SEARCH_DATA } from "@saleor/config"; +import { useUserPermissions } from "@dashboard/auth/hooks/useUserPermissions"; +import { hasPermissions } from "@dashboard/components/RequirePermissions"; +import { DEFAULT_INITIAL_SEARCH_DATA } from "@dashboard/config"; import { PermissionEnum, useChannelShippingZonesQuery, useShippingZonesCountQuery, -} from "@saleor/graphql"; -import useShippingZonesSearch from "@saleor/searches/useShippingZonesSearch"; +} from "@dashboard/graphql"; +import useShippingZonesSearch from "@dashboard/searches/useShippingZonesSearch"; export const useShippingZones = (channelId?: string) => { const userPermissions = useUserPermissions(); diff --git a/src/channels/views/ChannelDetails/useWarehouses.ts b/src/channels/views/ChannelDetails/useWarehouses.ts index 162856565..bc0865170 100644 --- a/src/channels/views/ChannelDetails/useWarehouses.ts +++ b/src/channels/views/ChannelDetails/useWarehouses.ts @@ -1,8 +1,8 @@ -import { useUserPermissions } from "@saleor/auth/hooks/useUserPermissions"; -import { hasOneOfPermissions } from "@saleor/components/RequirePermissions"; -import { DEFAULT_INITIAL_SEARCH_DATA } from "@saleor/config"; -import { PermissionEnum, useWarehousesCountQuery } from "@saleor/graphql"; -import useWarehouseSearch from "@saleor/searches/useWarehouseSearch"; +import { useUserPermissions } from "@dashboard/auth/hooks/useUserPermissions"; +import { hasOneOfPermissions } from "@dashboard/components/RequirePermissions"; +import { DEFAULT_INITIAL_SEARCH_DATA } from "@dashboard/config"; +import { PermissionEnum, useWarehousesCountQuery } from "@dashboard/graphql"; +import useWarehouseSearch from "@dashboard/searches/useWarehouseSearch"; export const useWarehouses = () => { const userPermissions = useUserPermissions(); diff --git a/src/channels/views/ChannelsList/ChannelsList.tsx b/src/channels/views/ChannelsList/ChannelsList.tsx index fa1169e35..3d17d4187 100644 --- a/src/channels/views/ChannelsList/ChannelsList.tsx +++ b/src/channels/views/ChannelsList/ChannelsList.tsx @@ -1,14 +1,14 @@ -import { getChannelsCurrencyChoices } from "@saleor/channels/utils"; -import { useShopLimitsQuery } from "@saleor/components/Shop/queries"; +import { getChannelsCurrencyChoices } from "@dashboard/channels/utils"; +import { useShopLimitsQuery } from "@dashboard/components/Shop/queries"; import { ChannelDeleteMutation, useChannelDeleteMutation, useChannelsQuery, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import getChannelsErrorMessage from "@saleor/utils/errors/channels"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import getChannelsErrorMessage from "@dashboard/utils/errors/channels"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/collections/components/CollectionCreatePage/CollectionCreatePage.stories.tsx b/src/collections/components/CollectionCreatePage/CollectionCreatePage.stories.tsx index c96b2f979..f20592638 100644 --- a/src/collections/components/CollectionCreatePage/CollectionCreatePage.stories.tsx +++ b/src/collections/components/CollectionCreatePage/CollectionCreatePage.stories.tsx @@ -1,7 +1,7 @@ -import { channelsList } from "@saleor/channels/fixtures"; -import { createCollectionChannels } from "@saleor/channels/utils"; -import { CollectionErrorCode } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; +import { channelsList } from "@dashboard/channels/fixtures"; +import { createCollectionChannels } from "@dashboard/channels/utils"; +import { CollectionErrorCode } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/collections/components/CollectionCreatePage/CollectionCreatePage.tsx b/src/collections/components/CollectionCreatePage/CollectionCreatePage.tsx index 92ea9ec72..7e3cf4d69 100644 --- a/src/collections/components/CollectionCreatePage/CollectionCreatePage.tsx +++ b/src/collections/components/CollectionCreatePage/CollectionCreatePage.tsx @@ -1,22 +1,22 @@ -import { ChannelCollectionData } from "@saleor/channels/utils"; -import { collectionListUrl } from "@saleor/collections/urls"; -import { Backlink } from "@saleor/components/Backlink"; -import { CardSpacer } from "@saleor/components/CardSpacer"; -import ChannelsAvailabilityCard from "@saleor/components/ChannelsAvailabilityCard"; -import { Container } from "@saleor/components/Container"; -import Grid from "@saleor/components/Grid"; -import Metadata from "@saleor/components/Metadata"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; -import SeoForm from "@saleor/components/SeoForm"; +import { ChannelCollectionData } from "@dashboard/channels/utils"; +import { collectionListUrl } from "@dashboard/collections/urls"; +import { Backlink } from "@dashboard/components/Backlink"; +import { CardSpacer } from "@dashboard/components/CardSpacer"; +import ChannelsAvailabilityCard from "@dashboard/components/ChannelsAvailabilityCard"; +import { Container } from "@dashboard/components/Container"; +import Grid from "@dashboard/components/Grid"; +import Metadata from "@dashboard/components/Metadata"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; +import SeoForm from "@dashboard/components/SeoForm"; import { CollectionChannelListingErrorFragment, CollectionErrorFragment, PermissionEnum, -} from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { sectionNames } from "@saleor/intl"; +} from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { sectionNames } from "@dashboard/intl"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/collections/components/CollectionCreatePage/form.tsx b/src/collections/components/CollectionCreatePage/form.tsx index 5ee7d244d..01ef43da6 100644 --- a/src/collections/components/CollectionCreatePage/form.tsx +++ b/src/collections/components/CollectionCreatePage/form.tsx @@ -1,21 +1,21 @@ -import { OutputData } from "@editorjs/editorjs"; -import { ChannelCollectionData } from "@saleor/channels/utils"; -import { createChannelsChangeHandler } from "@saleor/collections/utils"; -import { COLLECTION_CREATE_FORM_ID } from "@saleor/collections/views/consts"; -import { useExitFormDialog } from "@saleor/components/Form/useExitFormDialog"; -import { MetadataFormData } from "@saleor/components/Metadata"; +import { ChannelCollectionData } from "@dashboard/channels/utils"; +import { createChannelsChangeHandler } from "@dashboard/collections/utils"; +import { COLLECTION_CREATE_FORM_ID } from "@dashboard/collections/views/consts"; +import { useExitFormDialog } from "@dashboard/components/Form/useExitFormDialog"; +import { MetadataFormData } from "@dashboard/components/Metadata"; import useForm, { CommonUseFormResultWithHandlers, FormChange, SubmitPromise, -} from "@saleor/hooks/useForm"; -import useHandleFormSubmit from "@saleor/hooks/useHandleFormSubmit"; -import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger"; +} from "@dashboard/hooks/useForm"; +import useHandleFormSubmit from "@dashboard/hooks/useHandleFormSubmit"; +import useMetadataChangeTrigger from "@dashboard/utils/metadata/useMetadataChangeTrigger"; import { RichTextContext, RichTextContextValues, -} from "@saleor/utils/richText/context"; -import useRichText from "@saleor/utils/richText/useRichText"; +} from "@dashboard/utils/richText/context"; +import useRichText from "@dashboard/utils/richText/useRichText"; +import { OutputData } from "@editorjs/editorjs"; import React, { useEffect } from "react"; export interface CollectionCreateFormData extends MetadataFormData { diff --git a/src/collections/components/CollectionDetails/CollectionDetails.tsx b/src/collections/components/CollectionDetails/CollectionDetails.tsx index 0a236fe74..9db4e32d4 100644 --- a/src/collections/components/CollectionDetails/CollectionDetails.tsx +++ b/src/collections/components/CollectionDetails/CollectionDetails.tsx @@ -1,13 +1,13 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import RichTextEditor from "@dashboard/components/RichTextEditor"; +import { RichTextEditorLoading } from "@dashboard/components/RichTextEditor/RichTextEditorLoading"; +import { CollectionErrorFragment } from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; +import { getFormErrors, getProductErrorMessage } from "@dashboard/utils/errors"; +import { useRichTextContext } from "@dashboard/utils/richText/context"; import { OutputData } from "@editorjs/editorjs"; import { Card, CardContent, TextField } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import FormSpacer from "@saleor/components/FormSpacer"; -import RichTextEditor from "@saleor/components/RichTextEditor"; -import { RichTextEditorLoading } from "@saleor/components/RichTextEditor/RichTextEditorLoading"; -import { CollectionErrorFragment } from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; -import { getFormErrors, getProductErrorMessage } from "@saleor/utils/errors"; -import { useRichTextContext } from "@saleor/utils/richText/context"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/collections/components/CollectionDetailsPage/CollectionDetailsPage.stories.tsx b/src/collections/components/CollectionDetailsPage/CollectionDetailsPage.stories.tsx index db60c09e3..775eaaa09 100644 --- a/src/collections/components/CollectionDetailsPage/CollectionDetailsPage.stories.tsx +++ b/src/collections/components/CollectionDetailsPage/CollectionDetailsPage.stories.tsx @@ -1,11 +1,11 @@ import placeholderCollectionImage from "@assets/images/block1.jpg"; import placeholderProductImage from "@assets/images/placeholder60x60.png"; -import { createCollectionChannelsData } from "@saleor/channels/utils"; -import { collection as collectionFixture } from "@saleor/collections/fixtures"; -import { listActionsProps, pageListProps } from "@saleor/fixtures"; -import { CollectionErrorCode } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; -import { PaginatorContextDecorator } from "@saleor/storybook/PaginatorContextDecorator"; +import { createCollectionChannelsData } from "@dashboard/channels/utils"; +import { collection as collectionFixture } from "@dashboard/collections/fixtures"; +import { listActionsProps, pageListProps } from "@dashboard/fixtures"; +import { CollectionErrorCode } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; +import { PaginatorContextDecorator } from "@dashboard/storybook/PaginatorContextDecorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/collections/components/CollectionDetailsPage/CollectionDetailsPage.tsx b/src/collections/components/CollectionDetailsPage/CollectionDetailsPage.tsx index e40d63e05..0919a0dc6 100644 --- a/src/collections/components/CollectionDetailsPage/CollectionDetailsPage.tsx +++ b/src/collections/components/CollectionDetailsPage/CollectionDetailsPage.tsx @@ -1,23 +1,23 @@ -import { ChannelCollectionData } from "@saleor/channels/utils"; -import { collectionListUrl } from "@saleor/collections/urls"; -import { Backlink } from "@saleor/components/Backlink"; -import { CardSpacer } from "@saleor/components/CardSpacer"; -import ChannelsAvailabilityCard from "@saleor/components/ChannelsAvailabilityCard"; -import { Container } from "@saleor/components/Container"; -import Grid from "@saleor/components/Grid"; -import Metadata from "@saleor/components/Metadata/Metadata"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; -import SeoForm from "@saleor/components/SeoForm"; +import { ChannelCollectionData } from "@dashboard/channels/utils"; +import { collectionListUrl } from "@dashboard/collections/urls"; +import { Backlink } from "@dashboard/components/Backlink"; +import { CardSpacer } from "@dashboard/components/CardSpacer"; +import ChannelsAvailabilityCard from "@dashboard/components/ChannelsAvailabilityCard"; +import { Container } from "@dashboard/components/Container"; +import Grid from "@dashboard/components/Grid"; +import Metadata from "@dashboard/components/Metadata/Metadata"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; +import SeoForm from "@dashboard/components/SeoForm"; import { CollectionChannelListingErrorFragment, CollectionDetailsQuery, CollectionErrorFragment, PermissionEnum, -} from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { sectionNames } from "@saleor/intl"; +} from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { sectionNames } from "@dashboard/intl"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/collections/components/CollectionDetailsPage/form.tsx b/src/collections/components/CollectionDetailsPage/form.tsx index 32d02a148..e9f5db5af 100644 --- a/src/collections/components/CollectionDetailsPage/form.tsx +++ b/src/collections/components/CollectionDetailsPage/form.tsx @@ -1,23 +1,23 @@ -import { OutputData } from "@editorjs/editorjs"; -import { ChannelCollectionData } from "@saleor/channels/utils"; -import { createChannelsChangeHandler } from "@saleor/collections/utils"; -import { COLLECTION_DETAILS_FORM_ID } from "@saleor/collections/views/consts"; -import { useExitFormDialog } from "@saleor/components/Form/useExitFormDialog"; -import { MetadataFormData } from "@saleor/components/Metadata"; -import { CollectionDetailsFragment } from "@saleor/graphql"; +import { ChannelCollectionData } from "@dashboard/channels/utils"; +import { createChannelsChangeHandler } from "@dashboard/collections/utils"; +import { COLLECTION_DETAILS_FORM_ID } from "@dashboard/collections/views/consts"; +import { useExitFormDialog } from "@dashboard/components/Form/useExitFormDialog"; +import { MetadataFormData } from "@dashboard/components/Metadata"; +import { CollectionDetailsFragment } from "@dashboard/graphql"; import useForm, { CommonUseFormResultWithHandlers, FormChange, -} from "@saleor/hooks/useForm"; -import useHandleFormSubmit from "@saleor/hooks/useHandleFormSubmit"; -import { mapMetadataItemToInput } from "@saleor/utils/maps"; -import getMetadata from "@saleor/utils/metadata/getMetadata"; -import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger"; +} from "@dashboard/hooks/useForm"; +import useHandleFormSubmit from "@dashboard/hooks/useHandleFormSubmit"; +import { mapMetadataItemToInput } from "@dashboard/utils/maps"; +import getMetadata from "@dashboard/utils/metadata/getMetadata"; +import useMetadataChangeTrigger from "@dashboard/utils/metadata/useMetadataChangeTrigger"; import { RichTextContext, RichTextContextValues, -} from "@saleor/utils/richText/context"; -import useRichText from "@saleor/utils/richText/useRichText"; +} from "@dashboard/utils/richText/context"; +import useRichText from "@dashboard/utils/richText/useRichText"; +import { OutputData } from "@editorjs/editorjs"; import React, { useEffect } from "react"; export interface CollectionUpdateFormData extends MetadataFormData { diff --git a/src/collections/components/CollectionImage/CollectionImage.tsx b/src/collections/components/CollectionImage/CollectionImage.tsx index 98c86f0ab..dd43b9f28 100644 --- a/src/collections/components/CollectionImage/CollectionImage.tsx +++ b/src/collections/components/CollectionImage/CollectionImage.tsx @@ -1,12 +1,12 @@ +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import Hr from "@dashboard/components/Hr"; +import ImageUpload from "@dashboard/components/ImageUpload"; +import MediaTile from "@dashboard/components/MediaTile"; +import Skeleton from "@dashboard/components/Skeleton"; +import { CollectionDetailsFragment } from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; import { Card, CardContent, TextField } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import Hr from "@saleor/components/Hr"; -import ImageUpload from "@saleor/components/ImageUpload"; -import MediaTile from "@saleor/components/MediaTile"; -import Skeleton from "@saleor/components/Skeleton"; -import { CollectionDetailsFragment } from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/collections/components/CollectionList/CollectionList.tsx b/src/collections/components/CollectionList/CollectionList.tsx index 29232e4a8..5776e86f3 100644 --- a/src/collections/components/CollectionList/CollectionList.tsx +++ b/src/collections/components/CollectionList/CollectionList.tsx @@ -1,34 +1,34 @@ -import { TableBody, TableCell, TableFooter } from "@material-ui/core"; import { CollectionListUrlSortField, collectionUrl, -} from "@saleor/collections/urls"; -import { canBeSorted } from "@saleor/collections/views/CollectionList/sort"; -import { ChannelsAvailabilityDropdown } from "@saleor/components/ChannelsAvailabilityDropdown"; +} from "@dashboard/collections/urls"; +import { canBeSorted } from "@dashboard/collections/views/CollectionList/sort"; +import { ChannelsAvailabilityDropdown } from "@dashboard/components/ChannelsAvailabilityDropdown"; import { getChannelAvailabilityColor, getChannelAvailabilityLabel, -} from "@saleor/components/ChannelsAvailabilityDropdown/utils"; -import Checkbox from "@saleor/components/Checkbox"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableCellHeader from "@saleor/components/TableCellHeader"; -import TableHead from "@saleor/components/TableHead"; -import { TablePaginationWithContext } from "@saleor/components/TablePagination"; -import TableRowLink from "@saleor/components/TableRowLink"; -import TooltipTableCellHeader from "@saleor/components/TooltipTableCellHeader"; -import { commonTooltipMessages } from "@saleor/components/TooltipTableCellHeader/messages"; -import { CollectionListQuery } from "@saleor/graphql"; -import { makeStyles, Pill } from "@saleor/macaw-ui"; -import { maybe, renderCollection } from "@saleor/misc"; +} from "@dashboard/components/ChannelsAvailabilityDropdown/utils"; +import Checkbox from "@dashboard/components/Checkbox"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableCellHeader from "@dashboard/components/TableCellHeader"; +import TableHead from "@dashboard/components/TableHead"; +import { TablePaginationWithContext } from "@dashboard/components/TablePagination"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import TooltipTableCellHeader from "@dashboard/components/TooltipTableCellHeader"; +import { commonTooltipMessages } from "@dashboard/components/TooltipTableCellHeader/messages"; +import { CollectionListQuery } from "@dashboard/graphql"; +import { maybe, renderCollection } from "@dashboard/misc"; import { ChannelProps, ListActions, ListProps, RelayToFlat, SortPage, -} from "@saleor/types"; -import { getArrowDirection } from "@saleor/utils/sort"; +} from "@dashboard/types"; +import { getArrowDirection } from "@dashboard/utils/sort"; +import { TableBody, TableCell, TableFooter } from "@material-ui/core"; +import { makeStyles, Pill } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/collections/components/CollectionListPage/CollectionListPage.stories.tsx b/src/collections/components/CollectionListPage/CollectionListPage.stories.tsx index 08289705c..afc15a300 100644 --- a/src/collections/components/CollectionListPage/CollectionListPage.stories.tsx +++ b/src/collections/components/CollectionListPage/CollectionListPage.stories.tsx @@ -1,6 +1,6 @@ -import { CollectionListUrlSortField } from "@saleor/collections/urls"; -import Decorator from "@saleor/storybook/Decorator"; -import { PaginatorContextDecorator } from "@saleor/storybook/PaginatorContextDecorator"; +import { CollectionListUrlSortField } from "@dashboard/collections/urls"; +import Decorator from "@dashboard/storybook/Decorator"; +import { PaginatorContextDecorator } from "@dashboard/storybook/PaginatorContextDecorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/collections/components/CollectionListPage/CollectionListPage.tsx b/src/collections/components/CollectionListPage/CollectionListPage.tsx index e4ac60a49..9bd1ce47c 100644 --- a/src/collections/components/CollectionListPage/CollectionListPage.tsx +++ b/src/collections/components/CollectionListPage/CollectionListPage.tsx @@ -1,17 +1,17 @@ -import { Card } from "@material-ui/core"; -import { collectionAddUrl } from "@saleor/collections/urls"; -import { Button } from "@saleor/components/Button"; -import { Container } from "@saleor/components/Container"; -import { getByName } from "@saleor/components/Filter/utils"; -import FilterBar from "@saleor/components/FilterBar"; -import PageHeader from "@saleor/components/PageHeader"; -import { sectionNames } from "@saleor/intl"; +import { collectionAddUrl } from "@dashboard/collections/urls"; +import { Button } from "@dashboard/components/Button"; +import { Container } from "@dashboard/components/Container"; +import { getByName } from "@dashboard/components/Filter/utils"; +import FilterBar from "@dashboard/components/FilterBar"; +import PageHeader from "@dashboard/components/PageHeader"; +import { sectionNames } from "@dashboard/intl"; import { FilterPageProps, PageListProps, SearchPageProps, TabPageProps, -} from "@saleor/types"; +} from "@dashboard/types"; +import { Card } from "@material-ui/core"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/collections/components/CollectionListPage/filters.ts b/src/collections/components/CollectionListPage/filters.ts index b2a01f251..e67eeaa74 100644 --- a/src/collections/components/CollectionListPage/filters.ts +++ b/src/collections/components/CollectionListPage/filters.ts @@ -1,9 +1,9 @@ -import { IFilter } from "@saleor/components/Filter"; -import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField"; -import { CollectionPublished } from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; -import { FilterOpts } from "@saleor/types"; -import { createOptionsField } from "@saleor/utils/filters/fields"; +import { IFilter } from "@dashboard/components/Filter"; +import { MultiAutocompleteChoiceType } from "@dashboard/components/MultiAutocompleteSelectField"; +import { CollectionPublished } from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; +import { FilterOpts } from "@dashboard/types"; +import { createOptionsField } from "@dashboard/utils/filters/fields"; import { defineMessages, IntlShape } from "react-intl"; export interface CollectionListFilterOpts { diff --git a/src/collections/components/CollectionProducts/CollectionProducts.tsx b/src/collections/components/CollectionProducts/CollectionProducts.tsx index 5ee09aef1..da8dd0f25 100644 --- a/src/collections/components/CollectionProducts/CollectionProducts.tsx +++ b/src/collections/components/CollectionProducts/CollectionProducts.tsx @@ -1,20 +1,20 @@ +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import { ChannelsAvailabilityDropdown } from "@dashboard/components/ChannelsAvailabilityDropdown"; +import Checkbox from "@dashboard/components/Checkbox"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import { TableButtonWrapper } from "@dashboard/components/TableButtonWrapper/TableButtonWrapper"; +import TableCellAvatar from "@dashboard/components/TableCellAvatar"; +import { AVATAR_MARGIN } from "@dashboard/components/TableCellAvatar/Avatar"; +import TableHead from "@dashboard/components/TableHead"; +import { TablePaginationWithContext } from "@dashboard/components/TablePagination"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { CollectionDetailsQuery } from "@dashboard/graphql"; +import { productUrl } from "@dashboard/products/urls"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import { Card, TableBody, TableCell, TableFooter } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import { ChannelsAvailabilityDropdown } from "@saleor/components/ChannelsAvailabilityDropdown"; -import Checkbox from "@saleor/components/Checkbox"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import { TableButtonWrapper } from "@saleor/components/TableButtonWrapper/TableButtonWrapper"; -import TableCellAvatar from "@saleor/components/TableCellAvatar"; -import { AVATAR_MARGIN } from "@saleor/components/TableCellAvatar/Avatar"; -import TableHead from "@saleor/components/TableHead"; -import { TablePaginationWithContext } from "@saleor/components/TablePagination"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { CollectionDetailsQuery } from "@saleor/graphql"; import { DeleteIcon, IconButton, makeStyles } from "@saleor/macaw-ui"; -import { productUrl } from "@saleor/products/urls"; -import { mapEdgesToItems } from "@saleor/utils/maps"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/collections/fixtures.ts b/src/collections/fixtures.ts index b703d7020..de75ce95d 100644 --- a/src/collections/fixtures.ts +++ b/src/collections/fixtures.ts @@ -2,8 +2,8 @@ import { CollectionDetailsQuery, CollectionListQuery, CollectionPublished, -} from "@saleor/graphql"; -import { RelayToFlat } from "@saleor/types"; +} from "@dashboard/graphql"; +import { RelayToFlat } from "@dashboard/types"; import * as richTextEditorFixtures from "../components/RichTextEditor/fixtures.json"; import { CollectionListFilterOpts } from "./components/CollectionListPage"; diff --git a/src/collections/index.tsx b/src/collections/index.tsx index ae72c3b7e..da6e224c7 100644 --- a/src/collections/index.tsx +++ b/src/collections/index.tsx @@ -1,5 +1,5 @@ -import { sectionNames } from "@saleor/intl"; -import { asSortParams } from "@saleor/utils/sort"; +import { sectionNames } from "@dashboard/intl"; +import { asSortParams } from "@dashboard/utils/sort"; import { parse as parseQs } from "qs"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/collections/urls.ts b/src/collections/urls.ts index cbbbaf17c..9193622fd 100644 --- a/src/collections/urls.ts +++ b/src/collections/urls.ts @@ -1,5 +1,5 @@ -import { ChannelsAction } from "@saleor/channels/urls"; -import { stringifyQs } from "@saleor/utils/urls"; +import { ChannelsAction } from "@dashboard/channels/urls"; +import { stringifyQs } from "@dashboard/utils/urls"; import urlJoin from "url-join"; import { diff --git a/src/collections/utils.ts b/src/collections/utils.ts index 788f412f6..5be571d34 100644 --- a/src/collections/utils.ts +++ b/src/collections/utils.ts @@ -1,5 +1,8 @@ -import { ChannelCollectionData } from "@saleor/channels/utils"; -import { CollectionDetailsQuery, SearchProductsQuery } from "@saleor/graphql"; +import { ChannelCollectionData } from "@dashboard/channels/utils"; +import { + CollectionDetailsQuery, + SearchProductsQuery, +} from "@dashboard/graphql"; export const createChannelsChangeHandler = ( channelListings: ChannelCollectionData[], diff --git a/src/collections/views/CollectionCreate.tsx b/src/collections/views/CollectionCreate.tsx index abb0f850d..869bc7198 100644 --- a/src/collections/views/CollectionCreate.tsx +++ b/src/collections/views/CollectionCreate.tsx @@ -1,23 +1,23 @@ -import { ChannelsAction } from "@saleor/channels/urls"; -import { createCollectionChannels } from "@saleor/channels/utils"; -import useAppChannel from "@saleor/components/AppLayout/AppChannelContext"; -import ChannelsAvailabilityDialog from "@saleor/components/ChannelsAvailabilityDialog"; -import { WindowTitle } from "@saleor/components/WindowTitle"; +import { ChannelsAction } from "@dashboard/channels/urls"; +import { createCollectionChannels } from "@dashboard/channels/utils"; +import useAppChannel from "@dashboard/components/AppLayout/AppChannelContext"; +import ChannelsAvailabilityDialog from "@dashboard/components/ChannelsAvailabilityDialog"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; import { CollectionCreateInput, useCollectionChannelListingUpdateMutation, useCreateCollectionMutation, useUpdateMetadataMutation, useUpdatePrivateMetadataMutation, -} from "@saleor/graphql"; -import useChannels from "@saleor/hooks/useChannels"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { commonMessages } from "@saleor/intl"; -import { getMutationErrors } from "@saleor/misc"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createMetadataCreateHandler from "@saleor/utils/handlers/metadataCreateHandler"; -import { getParsedDataForJsonStringField } from "@saleor/utils/richText/misc"; +} from "@dashboard/graphql"; +import useChannels from "@dashboard/hooks/useChannels"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { commonMessages } from "@dashboard/intl"; +import { getMutationErrors } from "@dashboard/misc"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createMetadataCreateHandler from "@dashboard/utils/handlers/metadataCreateHandler"; +import { getParsedDataForJsonStringField } from "@dashboard/utils/richText/misc"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/collections/views/CollectionDetails.tsx b/src/collections/views/CollectionDetails.tsx index 2919744f1..0a1e1eef0 100644 --- a/src/collections/views/CollectionDetails.tsx +++ b/src/collections/views/CollectionDetails.tsx @@ -1,16 +1,15 @@ -import { DialogContentText } from "@material-ui/core"; import { createCollectionChannels, createCollectionChannelsData, -} from "@saleor/channels/utils"; -import ActionDialog from "@saleor/components/ActionDialog"; -import useAppChannel from "@saleor/components/AppLayout/AppChannelContext"; -import AssignProductDialog from "@saleor/components/AssignProductDialog"; -import { Button } from "@saleor/components/Button"; -import ChannelsAvailabilityDialog from "@saleor/components/ChannelsAvailabilityDialog"; -import NotFoundPage from "@saleor/components/NotFoundPage"; -import { WindowTitle } from "@saleor/components/WindowTitle"; -import { DEFAULT_INITIAL_SEARCH_DATA, PAGINATE_BY } from "@saleor/config"; +} from "@dashboard/channels/utils"; +import ActionDialog from "@dashboard/components/ActionDialog"; +import useAppChannel from "@dashboard/components/AppLayout/AppChannelContext"; +import AssignProductDialog from "@dashboard/components/AssignProductDialog"; +import { Button } from "@dashboard/components/Button"; +import ChannelsAvailabilityDialog from "@dashboard/components/ChannelsAvailabilityDialog"; +import NotFoundPage from "@dashboard/components/NotFoundPage"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; +import { DEFAULT_INITIAL_SEARCH_DATA, PAGINATE_BY } from "@dashboard/config"; import { CollectionInput, CollectionUpdateMutation, @@ -22,23 +21,24 @@ import { useUnassignCollectionProductMutation, useUpdateMetadataMutation, useUpdatePrivateMetadataMutation, -} from "@saleor/graphql"; -import useBulkActions from "@saleor/hooks/useBulkActions"; -import useChannels from "@saleor/hooks/useChannels"; +} from "@dashboard/graphql"; +import useBulkActions from "@dashboard/hooks/useBulkActions"; +import useChannels from "@dashboard/hooks/useChannels"; import useLocalPaginator, { useLocalPaginationState, -} from "@saleor/hooks/useLocalPaginator"; -import useLocalStorage from "@saleor/hooks/useLocalStorage"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { PaginatorContext } from "@saleor/hooks/usePaginator"; -import { commonMessages, errorMessages } from "@saleor/intl"; -import useProductSearch from "@saleor/searches/useProductSearch"; -import { arrayDiff } from "@saleor/utils/arrays"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createMetadataUpdateHandler from "@saleor/utils/handlers/metadataUpdateHandler"; -import { mapEdgesToItems } from "@saleor/utils/maps"; -import { getParsedDataForJsonStringField } from "@saleor/utils/richText/misc"; +} from "@dashboard/hooks/useLocalPaginator"; +import useLocalStorage from "@dashboard/hooks/useLocalStorage"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { PaginatorContext } from "@dashboard/hooks/usePaginator"; +import { commonMessages, errorMessages } from "@dashboard/intl"; +import useProductSearch from "@dashboard/searches/useProductSearch"; +import { arrayDiff } from "@dashboard/utils/arrays"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createMetadataUpdateHandler from "@dashboard/utils/handlers/metadataUpdateHandler"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; +import { getParsedDataForJsonStringField } from "@dashboard/utils/richText/misc"; +import { DialogContentText } from "@material-ui/core"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/collections/views/CollectionList/CollectionList.tsx b/src/collections/views/CollectionList/CollectionList.tsx index 4b4822289..82fb732a1 100644 --- a/src/collections/views/CollectionList/CollectionList.tsx +++ b/src/collections/views/CollectionList/CollectionList.tsx @@ -1,32 +1,32 @@ -import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; -import useAppChannel from "@saleor/components/AppLayout/AppChannelContext"; -import DeleteFilterTabDialog from "@saleor/components/DeleteFilterTabDialog"; +import ActionDialog from "@dashboard/components/ActionDialog"; +import useAppChannel from "@dashboard/components/AppLayout/AppChannelContext"; +import DeleteFilterTabDialog from "@dashboard/components/DeleteFilterTabDialog"; import SaveFilterTabDialog, { SaveFilterTabDialogFormData, -} from "@saleor/components/SaveFilterTabDialog"; +} from "@dashboard/components/SaveFilterTabDialog"; import { useCollectionBulkDeleteMutation, useCollectionListQuery, -} from "@saleor/graphql"; -import useBulkActions from "@saleor/hooks/useBulkActions"; -import useListSettings from "@saleor/hooks/useListSettings"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; +} from "@dashboard/graphql"; +import useBulkActions from "@dashboard/hooks/useBulkActions"; +import useListSettings from "@dashboard/hooks/useListSettings"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { usePaginationReset } from "@dashboard/hooks/usePaginationReset"; import usePaginator, { createPaginationState, PaginatorContext, -} from "@saleor/hooks/usePaginator"; -import { commonMessages } from "@saleor/intl"; +} from "@dashboard/hooks/usePaginator"; +import { commonMessages } from "@dashboard/intl"; +import { maybe } from "@dashboard/misc"; +import { ListViews } from "@dashboard/types"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createFilterHandlers from "@dashboard/utils/handlers/filterHandlers"; +import createSortHandler from "@dashboard/utils/handlers/sortHandler"; +import { mapEdgesToItems, mapNodeToChoice } from "@dashboard/utils/maps"; +import { getSortParams } from "@dashboard/utils/sort"; +import { DialogContentText } from "@material-ui/core"; import { DeleteIcon, IconButton } from "@saleor/macaw-ui"; -import { maybe } from "@saleor/misc"; -import { ListViews } from "@saleor/types"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createFilterHandlers from "@saleor/utils/handlers/filterHandlers"; -import createSortHandler from "@saleor/utils/handlers/sortHandler"; -import { mapEdgesToItems, mapNodeToChoice } from "@saleor/utils/maps"; -import { getSortParams } from "@saleor/utils/sort"; import React, { useEffect } from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/collections/views/CollectionList/filters.test.ts b/src/collections/views/CollectionList/filters.test.ts index cfd6250d4..3455c755a 100644 --- a/src/collections/views/CollectionList/filters.test.ts +++ b/src/collections/views/CollectionList/filters.test.ts @@ -1,8 +1,8 @@ -import { createFilterStructure } from "@saleor/collections/components/CollectionListPage"; -import { CollectionListUrlFilters } from "@saleor/collections/urls"; -import { CollectionPublished } from "@saleor/graphql"; -import { getFilterQueryParams } from "@saleor/utils/filters"; -import { stringifyQs } from "@saleor/utils/urls"; +import { createFilterStructure } from "@dashboard/collections/components/CollectionListPage"; +import { CollectionListUrlFilters } from "@dashboard/collections/urls"; +import { CollectionPublished } from "@dashboard/graphql"; +import { getFilterQueryParams } from "@dashboard/utils/filters"; +import { stringifyQs } from "@dashboard/utils/urls"; import { getExistingKeys, setFilterOptsStatus } from "@test/filters"; import { config } from "@test/intl"; import { createIntl } from "react-intl"; diff --git a/src/collections/views/CollectionList/filters.ts b/src/collections/views/CollectionList/filters.ts index 9667f271b..30053a73b 100644 --- a/src/collections/views/CollectionList/filters.ts +++ b/src/collections/views/CollectionList/filters.ts @@ -1,11 +1,14 @@ import { CollectionFilterKeys, CollectionListFilterOpts, -} from "@saleor/collections/components/CollectionListPage"; -import { FilterElement, FilterElementRegular } from "@saleor/components/Filter"; -import { SingleAutocompleteChoiceType } from "@saleor/components/SingleAutocompleteSelectField"; -import { CollectionFilterInput, CollectionPublished } from "@saleor/graphql"; -import { findValueInEnum, maybe } from "@saleor/misc"; +} from "@dashboard/collections/components/CollectionListPage"; +import { + FilterElement, + FilterElementRegular, +} from "@dashboard/components/Filter"; +import { SingleAutocompleteChoiceType } from "@dashboard/components/SingleAutocompleteSelectField"; +import { CollectionFilterInput, CollectionPublished } from "@dashboard/graphql"; +import { findValueInEnum, maybe } from "@dashboard/misc"; import { createFilterTabUtils, diff --git a/src/collections/views/CollectionList/sort.ts b/src/collections/views/CollectionList/sort.ts index cf979131a..f18754718 100644 --- a/src/collections/views/CollectionList/sort.ts +++ b/src/collections/views/CollectionList/sort.ts @@ -1,6 +1,6 @@ -import { CollectionListUrlSortField } from "@saleor/collections/urls"; -import { CollectionSortField } from "@saleor/graphql"; -import { createGetSortQueryVariables } from "@saleor/utils/sort"; +import { CollectionListUrlSortField } from "@dashboard/collections/urls"; +import { CollectionSortField } from "@dashboard/graphql"; +import { createGetSortQueryVariables } from "@dashboard/utils/sort"; export const DEFAULT_SORT_KEY = CollectionListUrlSortField.name; diff --git a/src/components/AccountPermissionGroups/AccountPermissionGroups.tsx b/src/components/AccountPermissionGroups/AccountPermissionGroups.tsx index c660009ab..aa9ef311a 100644 --- a/src/components/AccountPermissionGroups/AccountPermissionGroups.tsx +++ b/src/components/AccountPermissionGroups/AccountPermissionGroups.tsx @@ -1,12 +1,12 @@ -import { Typography } from "@material-ui/core"; import { SearchPermissionGroupsQuery, StaffErrorFragment, -} from "@saleor/graphql"; -import { FormChange } from "@saleor/hooks/useForm"; -import { FetchMoreProps, RelayToFlat, SearchPageProps } from "@saleor/types"; -import { getFormErrors } from "@saleor/utils/errors"; -import getStaffErrorMessage from "@saleor/utils/errors/staff"; +} from "@dashboard/graphql"; +import { FormChange } from "@dashboard/hooks/useForm"; +import { FetchMoreProps, RelayToFlat, SearchPageProps } from "@dashboard/types"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getStaffErrorMessage from "@dashboard/utils/errors/staff"; +import { Typography } from "@material-ui/core"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/components/AccountPermissions/AccountPermissions.tsx b/src/components/AccountPermissions/AccountPermissions.tsx index dedbcac41..e9e737628 100644 --- a/src/components/AccountPermissions/AccountPermissions.tsx +++ b/src/components/AccountPermissions/AccountPermissions.tsx @@ -1,3 +1,7 @@ +import { useUser } from "@dashboard/auth"; +import CardTitle from "@dashboard/components/CardTitle"; +import Skeleton from "@dashboard/components/Skeleton"; +import { PermissionData } from "@dashboard/permissionGroups/components/PermissionGroupDetailsPage/PermissionGroupDetailsPage"; import { Card, CardContent, @@ -8,11 +12,7 @@ import { ListItemText, Typography, } from "@material-ui/core"; -import { useUser } from "@saleor/auth"; -import CardTitle from "@saleor/components/CardTitle"; -import Skeleton from "@saleor/components/Skeleton"; import { makeStyles } from "@saleor/macaw-ui"; -import { PermissionData } from "@saleor/permissionGroups/components/PermissionGroupDetailsPage/PermissionGroupDetailsPage"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/components/AccountPermissions/utils.ts b/src/components/AccountPermissions/utils.ts index bc3c6033f..b7c844813 100644 --- a/src/components/AccountPermissions/utils.ts +++ b/src/components/AccountPermissions/utils.ts @@ -2,7 +2,7 @@ import { PermissionGroupDetailsQuery, ShopInfoQuery, UserDetailsQuery, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; export const getLastSourcesOfPermission = ( groupId: string, diff --git a/src/components/ActionDialog/ActionDialog.tsx b/src/components/ActionDialog/ActionDialog.tsx index 247bb346f..1c41632f8 100644 --- a/src/components/ActionDialog/ActionDialog.tsx +++ b/src/components/ActionDialog/ActionDialog.tsx @@ -1,6 +1,6 @@ +import { DialogProps } from "@dashboard/types"; import { Dialog, DialogContent, DialogTitle } from "@material-ui/core"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { DialogProps } from "@saleor/types"; import React from "react"; import DialogButtons from "./DialogButtons"; diff --git a/src/components/ActionDialog/DialogButtons.tsx b/src/components/ActionDialog/DialogButtons.tsx index f802916e1..7a56984ce 100644 --- a/src/components/ActionDialog/DialogButtons.tsx +++ b/src/components/ActionDialog/DialogButtons.tsx @@ -1,5 +1,5 @@ +import { buttonMessages } from "@dashboard/intl"; import { DialogActions } from "@material-ui/core"; -import { buttonMessages } from "@saleor/intl"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/components/AddressEdit/AddressEdit.tsx b/src/components/AddressEdit/AddressEdit.tsx index 8971f4132..f689dcbd6 100644 --- a/src/components/AddressEdit/AddressEdit.tsx +++ b/src/components/AddressEdit/AddressEdit.tsx @@ -1,11 +1,11 @@ +import { AddressTypeInput } from "@dashboard/customers/types"; +import { AccountErrorFragment, OrderErrorFragment } from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getAccountErrorMessage from "@dashboard/utils/errors/account"; +import getOrderErrorMessage from "@dashboard/utils/errors/order"; import { TextField } from "@material-ui/core"; -import { AddressTypeInput } from "@saleor/customers/types"; -import { AccountErrorFragment, OrderErrorFragment } from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; import { makeStyles } from "@saleor/macaw-ui"; -import { getFormErrors } from "@saleor/utils/errors"; -import getAccountErrorMessage from "@saleor/utils/errors/account"; -import getOrderErrorMessage from "@saleor/utils/errors/order"; import React from "react"; import { IntlShape, useIntl } from "react-intl"; diff --git a/src/components/AddressEdit/createCountryHandler.ts b/src/components/AddressEdit/createCountryHandler.ts index 06426d236..0b2482908 100644 --- a/src/components/AddressEdit/createCountryHandler.ts +++ b/src/components/AddressEdit/createCountryHandler.ts @@ -1,5 +1,5 @@ -import { AddressTypeInput } from "@saleor/customers/types"; -import { FormChange } from "@saleor/hooks/useForm"; +import { AddressTypeInput } from "@dashboard/customers/types"; +import { FormChange } from "@dashboard/hooks/useForm"; import { ChangeEvent } from "react"; export const createCountryHandler = ( diff --git a/src/components/AddressEdit/useAddressValidation.test.ts b/src/components/AddressEdit/useAddressValidation.test.ts index 38cef81cd..399686daa 100644 --- a/src/components/AddressEdit/useAddressValidation.test.ts +++ b/src/components/AddressEdit/useAddressValidation.test.ts @@ -1,10 +1,10 @@ -import { useAddressValidationRulesQuery } from "@saleor/graphql"; +import { useAddressValidationRulesQuery } from "@dashboard/graphql"; import { renderHook } from "@testing-library/react-hooks"; import { useAddressValidation } from "./useAddressValidation"; -jest.mock("@saleor/graphql", () => ({ - CountryCode: jest.requireActual("@saleor/graphql").CountryCode, +jest.mock("@dashboard/graphql", () => ({ + CountryCode: jest.requireActual("@dashboard/graphql").CountryCode, useAddressValidationRulesQuery: jest.fn(), })); diff --git a/src/components/AddressEdit/useAddressValidation.ts b/src/components/AddressEdit/useAddressValidation.ts index ca051b745..3e5db93bc 100644 --- a/src/components/AddressEdit/useAddressValidation.ts +++ b/src/components/AddressEdit/useAddressValidation.ts @@ -2,7 +2,7 @@ import { AddressValidationRulesQuery, CountryCode, useAddressValidationRulesQuery, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import { ChoiceValue } from "@saleor/sdk/dist/apollo/types"; interface AreaChoices { diff --git a/src/components/AppLayout/AppChannelContext.tsx b/src/components/AppLayout/AppChannelContext.tsx index 6c3aefb82..e9c67dd6f 100644 --- a/src/components/AppLayout/AppChannelContext.tsx +++ b/src/components/AppLayout/AppChannelContext.tsx @@ -1,7 +1,7 @@ -import { useUser } from "@saleor/auth"; -import { ChannelFragment, useBaseChannelsQuery } from "@saleor/graphql"; -import useLocalStorage from "@saleor/hooks/useLocalStorage"; -import { getById } from "@saleor/misc"; +import { useUser } from "@dashboard/auth"; +import { ChannelFragment, useBaseChannelsQuery } from "@dashboard/graphql"; +import useLocalStorage from "@dashboard/hooks/useLocalStorage"; +import { getById } from "@dashboard/misc"; import { useSaleorConfig } from "@saleor/sdk"; import React from "react"; diff --git a/src/components/AppLayout/AppChannelSelect.tsx b/src/components/AppLayout/AppChannelSelect.tsx index 6d14d70a5..af119e633 100644 --- a/src/components/AppLayout/AppChannelSelect.tsx +++ b/src/components/AppLayout/AppChannelSelect.tsx @@ -1,7 +1,7 @@ -import { ChannelFragment } from "@saleor/graphql"; +import { ChannelFragment } from "@dashboard/graphql"; +import { ChannelProps } from "@dashboard/types"; +import { mapNodeToChoice } from "@dashboard/utils/maps"; import { makeStyles } from "@saleor/macaw-ui"; -import { ChannelProps } from "@saleor/types"; -import { mapNodeToChoice } from "@saleor/utils/maps"; import React from "react"; import SingleSelectField from "../SingleSelectField"; diff --git a/src/components/AppLayout/AppLayout.tsx b/src/components/AppLayout/AppLayout.tsx index d6d958a9a..f5561c614 100644 --- a/src/components/AppLayout/AppLayout.tsx +++ b/src/components/AppLayout/AppLayout.tsx @@ -1,6 +1,7 @@ +import { useUser } from "@dashboard/auth"; +import useAppState from "@dashboard/hooks/useAppState"; +import { isDarkTheme } from "@dashboard/misc"; import { LinearProgress, useMediaQuery } from "@material-ui/core"; -import { useUser } from "@saleor/auth"; -import useAppState from "@saleor/hooks/useAppState"; import { SaleorTheme, Sidebar, @@ -9,7 +10,6 @@ import { useBacklink, useTheme, } from "@saleor/macaw-ui"; -import { isDarkTheme } from "@saleor/misc"; import clsx from "clsx"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/components/AppLayout/menuStructure.ts b/src/components/AppLayout/menuStructure.ts index c8440949a..d27499d3f 100644 --- a/src/components/AppLayout/menuStructure.ts +++ b/src/components/AppLayout/menuStructure.ts @@ -10,16 +10,16 @@ import translationIcon from "@assets/images/menu-translation-icon.svg"; import { extensionMountPoints, useExtensions, -} from "@saleor/apps/useExtensions"; -import { MARKETPLACE_URL } from "@saleor/config"; -import { configurationMenuUrl } from "@saleor/configuration"; -import { getConfigMenuItemsPermissions } from "@saleor/configuration/utils"; -import { giftCardListUrl } from "@saleor/giftCards/urls"; -import { PermissionEnum, UserFragment } from "@saleor/graphql"; -import { commonMessages, sectionNames } from "@saleor/intl"; +} from "@dashboard/apps/useExtensions"; +import { MARKETPLACE_URL } from "@dashboard/config"; +import { configurationMenuUrl } from "@dashboard/configuration"; +import { getConfigMenuItemsPermissions } from "@dashboard/configuration/utils"; +import { giftCardListUrl } from "@dashboard/giftCards/urls"; +import { PermissionEnum, UserFragment } from "@dashboard/graphql"; +import { commonMessages, sectionNames } from "@dashboard/intl"; +import { marketplaceUrlResolver } from "@dashboard/marketplace/marketplace-url-resolver"; +import { pageListPath } from "@dashboard/pages/urls"; import { SidebarMenuItem } from "@saleor/macaw-ui"; -import { marketplaceUrlResolver } from "@saleor/marketplace/marketplace-url-resolver"; -import { pageListPath } from "@saleor/pages/urls"; import { IntlShape } from "react-intl"; import { appsListPath } from "../../apps/urls"; diff --git a/src/components/AppLayout/utils.ts b/src/components/AppLayout/utils.ts index d3aff3823..c6819bf66 100644 --- a/src/components/AppLayout/utils.ts +++ b/src/components/AppLayout/utils.ts @@ -1,8 +1,8 @@ -import { getDashboardUrFromAppCompleteUrl } from "@saleor/apps/urls"; -import { Extension } from "@saleor/apps/useExtensions"; -import { AppExtensionMountEnum } from "@saleor/graphql"; +import { getDashboardUrFromAppCompleteUrl } from "@dashboard/apps/urls"; +import { Extension } from "@dashboard/apps/useExtensions"; +import { AppExtensionMountEnum } from "@dashboard/graphql"; +import { orderDraftListUrl, orderListUrl } from "@dashboard/orders/urls"; import { SidebarMenuItem } from "@saleor/macaw-ui"; -import { orderDraftListUrl, orderListUrl } from "@saleor/orders/urls"; import { matchPath } from "react-router"; import { FilterableMenuItem } from "./menuStructure"; diff --git a/src/components/AssignAttributeDialog/AssignAttributeDialog.tsx b/src/components/AssignAttributeDialog/AssignAttributeDialog.tsx index 6b1d3db69..43c454f69 100644 --- a/src/components/AssignAttributeDialog/AssignAttributeDialog.tsx +++ b/src/components/AssignAttributeDialog/AssignAttributeDialog.tsx @@ -1,3 +1,16 @@ +import Checkbox from "@dashboard/components/Checkbox"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { AvailableAttributeFragment } from "@dashboard/graphql"; +import useElementScroll, { + isScrolledToBottom, +} from "@dashboard/hooks/useElementScroll"; +import useModalDialogErrors from "@dashboard/hooks/useModalDialogErrors"; +import useModalDialogOpen from "@dashboard/hooks/useModalDialogOpen"; +import useSearchQuery from "@dashboard/hooks/useSearchQuery"; +import { maybe, renderCollection } from "@dashboard/misc"; +import { FetchMoreProps } from "@dashboard/types"; import { CircularProgress, Dialog, @@ -10,20 +23,7 @@ import { TextField, Typography, } from "@material-ui/core"; -import Checkbox from "@saleor/components/Checkbox"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { AvailableAttributeFragment } from "@saleor/graphql"; -import useElementScroll, { - isScrolledToBottom, -} from "@saleor/hooks/useElementScroll"; -import useModalDialogErrors from "@saleor/hooks/useModalDialogErrors"; -import useModalDialogOpen from "@saleor/hooks/useModalDialogOpen"; -import useSearchQuery from "@saleor/hooks/useSearchQuery"; import { ConfirmButtonTransitionState, makeStyles } from "@saleor/macaw-ui"; -import { maybe, renderCollection } from "@saleor/misc"; -import { FetchMoreProps } from "@saleor/types"; import clsx from "clsx"; import React from "react"; import InfiniteScroll from "react-infinite-scroll-component"; diff --git a/src/components/AssignAttributeValueDialog/AssignAttributeValueDialog.tsx b/src/components/AssignAttributeValueDialog/AssignAttributeValueDialog.tsx index 73df76090..e3388edae 100644 --- a/src/components/AssignAttributeValueDialog/AssignAttributeValueDialog.tsx +++ b/src/components/AssignAttributeValueDialog/AssignAttributeValueDialog.tsx @@ -1,5 +1,5 @@ -import { AttributeEntityTypeEnum, SearchPagesQuery } from "@saleor/graphql"; -import { RelayToFlat } from "@saleor/types"; +import { AttributeEntityTypeEnum, SearchPagesQuery } from "@dashboard/graphql"; +import { RelayToFlat } from "@dashboard/types"; import React from "react"; import { defineMessages, useIntl } from "react-intl"; diff --git a/src/components/AssignCategoryDialog/AssignCategoryDialog.tsx b/src/components/AssignCategoryDialog/AssignCategoryDialog.tsx index b500b2405..58a6e0420 100644 --- a/src/components/AssignCategoryDialog/AssignCategoryDialog.tsx +++ b/src/components/AssignCategoryDialog/AssignCategoryDialog.tsx @@ -1,5 +1,5 @@ -import { SearchCategoriesQuery } from "@saleor/graphql"; -import { RelayToFlat } from "@saleor/types"; +import { SearchCategoriesQuery } from "@dashboard/graphql"; +import { RelayToFlat } from "@dashboard/types"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/components/AssignCollectionDialog/AssignCollectionDialog.tsx b/src/components/AssignCollectionDialog/AssignCollectionDialog.tsx index d3afedc50..2fa4456c2 100644 --- a/src/components/AssignCollectionDialog/AssignCollectionDialog.tsx +++ b/src/components/AssignCollectionDialog/AssignCollectionDialog.tsx @@ -1,5 +1,5 @@ -import { SearchCollectionsQuery } from "@saleor/graphql"; -import { RelayToFlat } from "@saleor/types"; +import { SearchCollectionsQuery } from "@dashboard/graphql"; +import { RelayToFlat } from "@dashboard/types"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/components/AssignContainerDialog/AssignContainerDialog.tsx b/src/components/AssignContainerDialog/AssignContainerDialog.tsx index 4d33c83c4..30a1ca0d1 100644 --- a/src/components/AssignContainerDialog/AssignContainerDialog.tsx +++ b/src/components/AssignContainerDialog/AssignContainerDialog.tsx @@ -1,3 +1,8 @@ +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import useSearchQuery from "@dashboard/hooks/useSearchQuery"; +import useScrollableDialogStyle from "@dashboard/styles/useScrollableDialogStyle"; +import { DialogProps, FetchMoreProps, Node } from "@dashboard/types"; import { CircularProgress, Dialog, @@ -8,12 +13,7 @@ import { TableCell, TextField, } from "@material-ui/core"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import TableRowLink from "@saleor/components/TableRowLink"; -import useSearchQuery from "@saleor/hooks/useSearchQuery"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import useScrollableDialogStyle from "@saleor/styles/useScrollableDialogStyle"; -import { DialogProps, FetchMoreProps, Node } from "@saleor/types"; import React from "react"; import InfiniteScroll from "react-infinite-scroll-component"; diff --git a/src/components/AssignProductDialog/AssignProductDialog.tsx b/src/components/AssignProductDialog/AssignProductDialog.tsx index f0876df9e..62399dbfd 100644 --- a/src/components/AssignProductDialog/AssignProductDialog.tsx +++ b/src/components/AssignProductDialog/AssignProductDialog.tsx @@ -1,3 +1,13 @@ +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import TableCellAvatar from "@dashboard/components/TableCellAvatar"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { SearchProductsQuery } from "@dashboard/graphql"; +import useModalDialogOpen from "@dashboard/hooks/useModalDialogOpen"; +import useSearchQuery from "@dashboard/hooks/useSearchQuery"; +import { maybe } from "@dashboard/misc"; +import useScrollableDialogStyle from "@dashboard/styles/useScrollableDialogStyle"; +import { DialogProps, FetchMoreProps, RelayToFlat } from "@dashboard/types"; import { CircularProgress, Dialog, @@ -8,17 +18,7 @@ import { TableCell, TextField, } from "@material-ui/core"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import TableCellAvatar from "@saleor/components/TableCellAvatar"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { SearchProductsQuery } from "@saleor/graphql"; -import useModalDialogOpen from "@saleor/hooks/useModalDialogOpen"; -import useSearchQuery from "@saleor/hooks/useSearchQuery"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { maybe } from "@saleor/misc"; -import useScrollableDialogStyle from "@saleor/styles/useScrollableDialogStyle"; -import { DialogProps, FetchMoreProps, RelayToFlat } from "@saleor/types"; import React, { useEffect } from "react"; import InfiniteScroll from "react-infinite-scroll-component"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/components/AssignVariantDialog/AssignVariantDialog.tsx b/src/components/AssignVariantDialog/AssignVariantDialog.tsx index f8df9ee04..4ff41e528 100644 --- a/src/components/AssignVariantDialog/AssignVariantDialog.tsx +++ b/src/components/AssignVariantDialog/AssignVariantDialog.tsx @@ -1,3 +1,13 @@ +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import Money from "@dashboard/components/Money"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import TableCellAvatar from "@dashboard/components/TableCellAvatar"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { SearchProductsQuery } from "@dashboard/graphql"; +import useSearchQuery from "@dashboard/hooks/useSearchQuery"; +import { maybe, renderCollection } from "@dashboard/misc"; +import useScrollableDialogStyle from "@dashboard/styles/useScrollableDialogStyle"; +import { DialogProps, FetchMoreProps, RelayToFlat } from "@dashboard/types"; import { CircularProgress, Dialog, @@ -9,17 +19,7 @@ import { TextField, Typography, } from "@material-ui/core"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import Money from "@saleor/components/Money"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import TableCellAvatar from "@saleor/components/TableCellAvatar"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { SearchProductsQuery } from "@saleor/graphql"; -import useSearchQuery from "@saleor/hooks/useSearchQuery"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { maybe, renderCollection } from "@saleor/misc"; -import useScrollableDialogStyle from "@saleor/styles/useScrollableDialogStyle"; -import { DialogProps, FetchMoreProps, RelayToFlat } from "@saleor/types"; import React from "react"; import InfiniteScroll from "react-infinite-scroll-component"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/components/AssignVariantDialog/utils.ts b/src/components/AssignVariantDialog/utils.ts index efba00825..14aa1e51a 100644 --- a/src/components/AssignVariantDialog/utils.ts +++ b/src/components/AssignVariantDialog/utils.ts @@ -1,6 +1,6 @@ -import { SearchProductsQuery } from "@saleor/graphql"; -import { getById, getByUnmatchingId } from "@saleor/misc"; -import { RelayToFlat } from "@saleor/types"; +import { SearchProductsQuery } from "@dashboard/graphql"; +import { getById, getByUnmatchingId } from "@dashboard/misc"; +import { RelayToFlat } from "@dashboard/types"; export type SearchVariant = RelayToFlat< SearchProductsQuery["search"] diff --git a/src/components/AttributeUnassignDialog/AttributeUnassignDialog.tsx b/src/components/AttributeUnassignDialog/AttributeUnassignDialog.tsx index 72c1f37c0..921370ffc 100644 --- a/src/components/AttributeUnassignDialog/AttributeUnassignDialog.tsx +++ b/src/components/AttributeUnassignDialog/AttributeUnassignDialog.tsx @@ -1,5 +1,5 @@ +import ActionDialog from "@dashboard/components/ActionDialog"; import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/components/Attributes/AttributeRow.tsx b/src/components/Attributes/AttributeRow.tsx index ded299be4..d74bbe155 100644 --- a/src/components/Attributes/AttributeRow.tsx +++ b/src/components/Attributes/AttributeRow.tsx @@ -1,10 +1,9 @@ -import { InputAdornment, TextField } from "@material-ui/core"; -import { inputTypeMessages } from "@saleor/attributes/components/AttributeDetails/messages"; -import { getMeasurementUnitMessage } from "@saleor/attributes/components/AttributeDetails/utils"; -import BasicAttributeRow from "@saleor/components/Attributes/BasicAttributeRow"; -import ExtendedAttributeRow from "@saleor/components/Attributes/ExtendedAttributeRow"; -import { attributeRowMessages } from "@saleor/components/Attributes/messages"; -import { SwatchRow } from "@saleor/components/Attributes/SwatchRow"; +import { inputTypeMessages } from "@dashboard/attributes/components/AttributeDetails/messages"; +import { getMeasurementUnitMessage } from "@dashboard/attributes/components/AttributeDetails/utils"; +import BasicAttributeRow from "@dashboard/components/Attributes/BasicAttributeRow"; +import ExtendedAttributeRow from "@dashboard/components/Attributes/ExtendedAttributeRow"; +import { attributeRowMessages } from "@dashboard/components/Attributes/messages"; +import { SwatchRow } from "@dashboard/components/Attributes/SwatchRow"; import { getErrorMessage, getFileChoice, @@ -13,16 +12,17 @@ import { getReferenceDisplayValue, getSingleChoices, getSingleDisplayValue, -} from "@saleor/components/Attributes/utils"; -import Checkbox from "@saleor/components/Checkbox"; -import { DateTimeField } from "@saleor/components/DateTimeField"; -import FileUploadField from "@saleor/components/FileUploadField"; -import MultiAutocompleteSelectField from "@saleor/components/MultiAutocompleteSelectField"; -import RichTextEditor from "@saleor/components/RichTextEditor"; -import SingleAutocompleteSelectField from "@saleor/components/SingleAutocompleteSelectField"; -import SortableChipsField from "@saleor/components/SortableChipsField"; -import { AttributeInputTypeEnum } from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; +} from "@dashboard/components/Attributes/utils"; +import Checkbox from "@dashboard/components/Checkbox"; +import { DateTimeField } from "@dashboard/components/DateTimeField"; +import FileUploadField from "@dashboard/components/FileUploadField"; +import MultiAutocompleteSelectField from "@dashboard/components/MultiAutocompleteSelectField"; +import RichTextEditor from "@dashboard/components/RichTextEditor"; +import SingleAutocompleteSelectField from "@dashboard/components/SingleAutocompleteSelectField"; +import SortableChipsField from "@dashboard/components/SortableChipsField"; +import { AttributeInputTypeEnum } from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; +import { InputAdornment, TextField } from "@material-ui/core"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/components/Attributes/Attributes.tsx b/src/components/Attributes/Attributes.tsx index b85f51f7a..2eeeb0ddc 100644 --- a/src/components/Attributes/Attributes.tsx +++ b/src/components/Attributes/Attributes.tsx @@ -1,7 +1,6 @@ -import { Card, CardContent, Typography } from "@material-ui/core"; -import { AttributeReference } from "@saleor/attributes/utils/data"; -import CardTitle from "@saleor/components/CardTitle"; -import Hr from "@saleor/components/Hr"; +import { AttributeReference } from "@dashboard/attributes/utils/data"; +import CardTitle from "@dashboard/components/CardTitle"; +import Hr from "@dashboard/components/Hr"; import { AttributeEntityTypeEnum, AttributeInputTypeEnum, @@ -10,11 +9,12 @@ import { MeasurementUnitsEnum, PageErrorWithAttributesFragment, ProductErrorWithAttributesFragment, -} from "@saleor/graphql"; -import { FormsetAtomicData } from "@saleor/hooks/useFormset"; +} from "@dashboard/graphql"; +import { FormsetAtomicData } from "@dashboard/hooks/useFormset"; +import { FetchMoreProps } from "@dashboard/types"; +import { RichTextGetters } from "@dashboard/utils/richText/useMultipleRichText"; +import { Card, CardContent, Typography } from "@material-ui/core"; import { ChevronIcon, IconButton, makeStyles } from "@saleor/macaw-ui"; -import { FetchMoreProps } from "@saleor/types"; -import { RichTextGetters } from "@saleor/utils/richText/useMultipleRichText"; import clsx from "clsx"; import React from "react"; import { defineMessages, FormattedMessage, useIntl } from "react-intl"; diff --git a/src/components/Attributes/BasicAttributeRow.tsx b/src/components/Attributes/BasicAttributeRow.tsx index 2aeb9126e..05a04c712 100644 --- a/src/components/Attributes/BasicAttributeRow.tsx +++ b/src/components/Attributes/BasicAttributeRow.tsx @@ -1,6 +1,6 @@ +import Grid from "@dashboard/components/Grid"; import { Typography } from "@material-ui/core"; import HelpOutline from "@material-ui/icons/HelpOutline"; -import Grid from "@saleor/components/Grid"; import { Tooltip } from "@saleor/macaw-ui"; import clsx from "clsx"; import React from "react"; diff --git a/src/components/Attributes/ExtendedAttributeRow.tsx b/src/components/Attributes/ExtendedAttributeRow.tsx index 2eec2072f..797b1629f 100644 --- a/src/components/Attributes/ExtendedAttributeRow.tsx +++ b/src/components/Attributes/ExtendedAttributeRow.tsx @@ -1,6 +1,6 @@ +import { Button } from "@dashboard/components/Button"; +import Grid from "@dashboard/components/Grid"; import { Typography } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import Grid from "@saleor/components/Grid"; import React from "react"; import { useExtendedAttributeStyles } from "./styles"; diff --git a/src/components/Attributes/SwatchRow.tsx b/src/components/Attributes/SwatchRow.tsx index af095fb6f..72d16f132 100644 --- a/src/components/Attributes/SwatchRow.tsx +++ b/src/components/Attributes/SwatchRow.tsx @@ -1,12 +1,12 @@ -import { InputAdornment } from "@material-ui/core"; -import HorizontalSpacer from "@saleor/apps/components/HorizontalSpacer"; -import BasicAttributeRow from "@saleor/components/Attributes/BasicAttributeRow"; +import HorizontalSpacer from "@dashboard/apps/components/HorizontalSpacer"; +import BasicAttributeRow from "@dashboard/components/Attributes/BasicAttributeRow"; import { getErrorMessage, getSingleDisplayValue, -} from "@saleor/components/Attributes/utils"; -import SingleAutocompleteSelectField from "@saleor/components/SingleAutocompleteSelectField"; -import { getBySlug } from "@saleor/misc"; +} from "@dashboard/components/Attributes/utils"; +import SingleAutocompleteSelectField from "@dashboard/components/SingleAutocompleteSelectField"; +import { getBySlug } from "@dashboard/misc"; +import { InputAdornment } from "@material-ui/core"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/components/Attributes/fixtures.ts b/src/components/Attributes/fixtures.ts index 2f64faeab..e5eb70a0b 100644 --- a/src/components/Attributes/fixtures.ts +++ b/src/components/Attributes/fixtures.ts @@ -2,7 +2,7 @@ import { AttributeEntityTypeEnum, AttributeInputTypeEnum, MeasurementUnitsEnum, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import { AttributeInput } from "./Attributes"; diff --git a/src/components/Attributes/types.ts b/src/components/Attributes/types.ts index 66f9d3dfa..958230871 100644 --- a/src/components/Attributes/types.ts +++ b/src/components/Attributes/types.ts @@ -2,10 +2,10 @@ import { AttributeValueFragment, PageErrorWithAttributesFragment, ProductErrorWithAttributesFragment, -} from "@saleor/graphql"; -import { FormsetChange } from "@saleor/hooks/useFormset"; -import { FetchMoreProps, ReorderEvent } from "@saleor/types"; -import { RichTextGetters } from "@saleor/utils/richText/useMultipleRichText"; +} from "@dashboard/graphql"; +import { FormsetChange } from "@dashboard/hooks/useFormset"; +import { FetchMoreProps, ReorderEvent } from "@dashboard/types"; +import { RichTextGetters } from "@dashboard/utils/richText/useMultipleRichText"; import { AttributeInput } from "./Attributes"; diff --git a/src/components/Attributes/utils.ts b/src/components/Attributes/utils.ts index 1cb874260..de6104a66 100644 --- a/src/components/Attributes/utils.ts +++ b/src/components/Attributes/utils.ts @@ -1,16 +1,16 @@ -import { OutputData } from "@editorjs/editorjs"; -import { AttributeInput } from "@saleor/components/Attributes/Attributes"; -import { FileChoiceType } from "@saleor/components/FileUploadField"; -import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField"; -import { SingleAutocompleteChoiceType } from "@saleor/components/SingleAutocompleteSelectField"; -import { SortableChipsFieldValueType } from "@saleor/components/SortableChipsField"; +import { AttributeInput } from "@dashboard/components/Attributes/Attributes"; +import { FileChoiceType } from "@dashboard/components/FileUploadField"; +import { MultiAutocompleteChoiceType } from "@dashboard/components/MultiAutocompleteSelectField"; +import { SingleAutocompleteChoiceType } from "@dashboard/components/SingleAutocompleteSelectField"; +import { SortableChipsFieldValueType } from "@dashboard/components/SortableChipsField"; import { AttributeValueFragment, PageErrorWithAttributesFragment, ProductErrorWithAttributesFragment, -} from "@saleor/graphql"; -import { getProductErrorMessage } from "@saleor/utils/errors"; -import getPageErrorMessage from "@saleor/utils/errors/page"; +} from "@dashboard/graphql"; +import { getProductErrorMessage } from "@dashboard/utils/errors"; +import getPageErrorMessage from "@dashboard/utils/errors/page"; +import { OutputData } from "@editorjs/editorjs"; import { IntlShape } from "react-intl"; export function getSingleChoices( diff --git a/src/components/AutocompleteSelectMenu/AutocompleteSelectMenu.tsx b/src/components/AutocompleteSelectMenu/AutocompleteSelectMenu.tsx index 9a668d6f3..ddcb278df 100644 --- a/src/components/AutocompleteSelectMenu/AutocompleteSelectMenu.tsx +++ b/src/components/AutocompleteSelectMenu/AutocompleteSelectMenu.tsx @@ -1,3 +1,4 @@ +import { buttonMessages } from "@dashboard/intl"; import { CircularProgress, MenuItem, @@ -5,7 +6,6 @@ import { TextField, } from "@material-ui/core"; import ArrowBack from "@material-ui/icons/ArrowBack"; -import { buttonMessages } from "@saleor/intl"; import { makeStyles } from "@saleor/macaw-ui"; import Downshift from "downshift"; import React from "react"; diff --git a/src/components/BackButton.tsx b/src/components/BackButton.tsx index 932ca3e36..2aaaf3f06 100644 --- a/src/components/BackButton.tsx +++ b/src/components/BackButton.tsx @@ -1,5 +1,5 @@ -import { Button } from "@saleor/components/Button"; -import { buttonMessages } from "@saleor/intl"; +import { Button } from "@dashboard/components/Button"; +import { buttonMessages } from "@dashboard/intl"; import { ButtonProps } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/components/Backlink/Backlink.tsx b/src/components/Backlink/Backlink.tsx index 607683bc9..0b39bddd7 100644 --- a/src/components/Backlink/Backlink.tsx +++ b/src/components/Backlink/Backlink.tsx @@ -1,5 +1,5 @@ +import { isExternalURL } from "@dashboard/utils/urls"; import { Backlink as MacawBacklink, BacklinkProps } from "@saleor/macaw-ui"; -import { isExternalURL } from "@saleor/utils/urls"; import React from "react"; import { Link, LinkProps } from "react-router-dom"; diff --git a/src/components/BulkAttributeUnassignDialog/BulkAttributeUnassignDialog.tsx b/src/components/BulkAttributeUnassignDialog/BulkAttributeUnassignDialog.tsx index a3457d276..7ea327bdd 100644 --- a/src/components/BulkAttributeUnassignDialog/BulkAttributeUnassignDialog.tsx +++ b/src/components/BulkAttributeUnassignDialog/BulkAttributeUnassignDialog.tsx @@ -1,5 +1,5 @@ +import ActionDialog from "@dashboard/components/ActionDialog"; import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/components/Button/Button.tsx b/src/components/Button/Button.tsx index 9349f070e..4393b4061 100644 --- a/src/components/Button/Button.tsx +++ b/src/components/Button/Button.tsx @@ -1,6 +1,6 @@ +import { isExternalURL } from "@dashboard/utils/urls"; import { OverridableComponent } from "@material-ui/core/OverridableComponent"; import { Button as MacawButton, ButtonTypeMap } from "@saleor/macaw-ui"; -import { isExternalURL } from "@saleor/utils/urls"; import React from "react"; import { Link } from "react-router-dom"; diff --git a/src/components/ButtonWithSelect/ButtonWithSelect.tsx b/src/components/ButtonWithSelect/ButtonWithSelect.tsx index 2a03c0728..fa10800ec 100644 --- a/src/components/ButtonWithSelect/ButtonWithSelect.tsx +++ b/src/components/ButtonWithSelect/ButtonWithSelect.tsx @@ -1,3 +1,4 @@ +import { Button } from "@dashboard/components/Button"; import { ButtonGroup, ButtonGroupProps, @@ -10,7 +11,6 @@ import { Popper, } from "@material-ui/core"; import { ArrowDropDown as ArrowDropDownIcon } from "@material-ui/icons"; -import { Button } from "@saleor/components/Button"; import React from "react"; import { useStyles } from "./styles"; diff --git a/src/components/ChannelsAvailabilityCard/Channel/ChannelAvailabilityItemContent.tsx b/src/components/ChannelsAvailabilityCard/Channel/ChannelAvailabilityItemContent.tsx index 1b7b2747b..eab2d3364 100644 --- a/src/components/ChannelsAvailabilityCard/Channel/ChannelAvailabilityItemContent.tsx +++ b/src/components/ChannelsAvailabilityCard/Channel/ChannelAvailabilityItemContent.tsx @@ -1,11 +1,11 @@ +import { ChannelData } from "@dashboard/channels/utils"; +import ControlledCheckbox from "@dashboard/components/ControlledCheckbox"; +import Hr from "@dashboard/components/Hr"; +import RadioSwitchField from "@dashboard/components/RadioSwitchField"; +import useCurrentDate from "@dashboard/hooks/useCurrentDate"; +import useDateLocalize from "@dashboard/hooks/useDateLocalize"; +import { getFormErrors, getProductErrorMessage } from "@dashboard/utils/errors"; import { TextField, Typography } from "@material-ui/core"; -import { ChannelData } from "@saleor/channels/utils"; -import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; -import Hr from "@saleor/components/Hr"; -import RadioSwitchField from "@saleor/components/RadioSwitchField"; -import useCurrentDate from "@saleor/hooks/useCurrentDate"; -import useDateLocalize from "@saleor/hooks/useDateLocalize"; -import { getFormErrors, getProductErrorMessage } from "@saleor/utils/errors"; import clsx from "clsx"; import React, { useState } from "react"; import { useIntl } from "react-intl"; diff --git a/src/components/ChannelsAvailabilityCard/Channel/ChannelAvailabilityItemWrapper.tsx b/src/components/ChannelsAvailabilityCard/Channel/ChannelAvailabilityItemWrapper.tsx index becbd2dcf..65f5ec8a6 100644 --- a/src/components/ChannelsAvailabilityCard/Channel/ChannelAvailabilityItemWrapper.tsx +++ b/src/components/ChannelsAvailabilityCard/Channel/ChannelAvailabilityItemWrapper.tsx @@ -1,7 +1,7 @@ +import { ChannelData } from "@dashboard/channels/utils"; +import Label from "@dashboard/orders/components/OrderHistory/Label"; import { Typography } from "@material-ui/core"; -import { ChannelData } from "@saleor/channels/utils"; import { Accordion, AccordionSummary, makeStyles } from "@saleor/macaw-ui"; -import Label from "@saleor/orders/components/OrderHistory/Label"; import React from "react"; import { Messages } from "../types"; diff --git a/src/components/ChannelsAvailabilityCard/ChannelsAvailabilityCard.tsx b/src/components/ChannelsAvailabilityCard/ChannelsAvailabilityCard.tsx index a141442a2..36bf9a4de 100644 --- a/src/components/ChannelsAvailabilityCard/ChannelsAvailabilityCard.tsx +++ b/src/components/ChannelsAvailabilityCard/ChannelsAvailabilityCard.tsx @@ -1,9 +1,9 @@ +import { Channel as ChannelList, ChannelData } from "@dashboard/channels/utils"; +import Hr from "@dashboard/components/Hr"; +import { PermissionEnum } from "@dashboard/graphql"; +import useDateLocalize from "@dashboard/hooks/useDateLocalize"; +import { RequireOnlyOne } from "@dashboard/misc"; import { Typography } from "@material-ui/core"; -import { Channel as ChannelList, ChannelData } from "@saleor/channels/utils"; -import Hr from "@saleor/components/Hr"; -import { PermissionEnum } from "@saleor/graphql"; -import useDateLocalize from "@saleor/hooks/useDateLocalize"; -import { RequireOnlyOne } from "@saleor/misc"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/components/ChannelsAvailabilityCard/ChannelsAvailabilityCardWrapper.tsx b/src/components/ChannelsAvailabilityCard/ChannelsAvailabilityCardWrapper.tsx index 36d324134..e2592547a 100644 --- a/src/components/ChannelsAvailabilityCard/ChannelsAvailabilityCardWrapper.tsx +++ b/src/components/ChannelsAvailabilityCard/ChannelsAvailabilityCardWrapper.tsx @@ -1,9 +1,9 @@ +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import Hr from "@dashboard/components/Hr"; +import RequirePermissions from "@dashboard/components/RequirePermissions"; +import { PermissionEnum } from "@dashboard/graphql"; import { Card, CardContent, Typography } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import Hr from "@saleor/components/Hr"; -import RequirePermissions from "@saleor/components/RequirePermissions"; -import { PermissionEnum } from "@saleor/graphql"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/components/ChannelsAvailabilityCard/types.tsx b/src/components/ChannelsAvailabilityCard/types.tsx index 350293aeb..19308df84 100644 --- a/src/components/ChannelsAvailabilityCard/types.tsx +++ b/src/components/ChannelsAvailabilityCard/types.tsx @@ -1,7 +1,7 @@ import { CollectionChannelListingErrorFragment, ProductChannelListingErrorFragment, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; export interface ChannelOpts { availableForPurchase?: string; diff --git a/src/components/ChannelsAvailabilityCard/utils.ts b/src/components/ChannelsAvailabilityCard/utils.ts index 5fe6ed313..da43e1e73 100644 --- a/src/components/ChannelsAvailabilityCard/utils.ts +++ b/src/components/ChannelsAvailabilityCard/utils.ts @@ -1,5 +1,5 @@ -import { ChannelData } from "@saleor/channels/utils"; -import { LocalizeDate } from "@saleor/hooks/useDateLocalize"; +import { ChannelData } from "@dashboard/channels/utils"; +import { LocalizeDate } from "@dashboard/hooks/useDateLocalize"; import { IntlShape } from "react-intl"; import { publicationMessages } from "./messages"; diff --git a/src/components/ChannelsAvailabilityContent/ChannelsAvailabilityContent.tsx b/src/components/ChannelsAvailabilityContent/ChannelsAvailabilityContent.tsx index b1f963eb6..52768a740 100644 --- a/src/components/ChannelsAvailabilityContent/ChannelsAvailabilityContent.tsx +++ b/src/components/ChannelsAvailabilityContent/ChannelsAvailabilityContent.tsx @@ -1,7 +1,7 @@ +import { Channel } from "@dashboard/channels/utils"; +import { ControlledCheckbox } from "@dashboard/components/ControlledCheckbox"; +import Hr from "@dashboard/components/Hr"; import { TextField, Typography } from "@material-ui/core"; -import { Channel } from "@saleor/channels/utils"; -import { ControlledCheckbox } from "@saleor/components/ControlledCheckbox"; -import Hr from "@saleor/components/Hr"; import { filter } from "fuzzaldrin"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/components/ChannelsAvailabilityDialog/ChannelsAvailabilityDialog.tsx b/src/components/ChannelsAvailabilityDialog/ChannelsAvailabilityDialog.tsx index 0b4016bb2..8fa83d21d 100644 --- a/src/components/ChannelsAvailabilityDialog/ChannelsAvailabilityDialog.tsx +++ b/src/components/ChannelsAvailabilityDialog/ChannelsAvailabilityDialog.tsx @@ -1,5 +1,5 @@ -import { Channel } from "@saleor/channels/utils"; -import ActionDialog from "@saleor/components/ActionDialog"; +import { Channel } from "@dashboard/channels/utils"; +import ActionDialog from "@dashboard/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; diff --git a/src/components/ChannelsAvailabilityDialogChannelsList/ChannelsAvailabilityDialogChannelsList.tsx b/src/components/ChannelsAvailabilityDialogChannelsList/ChannelsAvailabilityDialogChannelsList.tsx index f37da41ac..d9c085af0 100644 --- a/src/components/ChannelsAvailabilityDialogChannelsList/ChannelsAvailabilityDialogChannelsList.tsx +++ b/src/components/ChannelsAvailabilityDialogChannelsList/ChannelsAvailabilityDialogChannelsList.tsx @@ -1,7 +1,7 @@ +import { Channel } from "@dashboard/channels/utils"; +import { ControlledCheckbox } from "@dashboard/components/ControlledCheckbox"; +import Hr from "@dashboard/components/Hr"; import { Typography } from "@material-ui/core"; -import { Channel } from "@saleor/channels/utils"; -import { ControlledCheckbox } from "@saleor/components/ControlledCheckbox"; -import Hr from "@saleor/components/Hr"; import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; diff --git a/src/components/ChannelsAvailabilityDialogWrapper/ChannelsAvailabilityDialogWrapper.tsx b/src/components/ChannelsAvailabilityDialogWrapper/ChannelsAvailabilityDialogWrapper.tsx index 6a5aa0076..af09ee947 100644 --- a/src/components/ChannelsAvailabilityDialogWrapper/ChannelsAvailabilityDialogWrapper.tsx +++ b/src/components/ChannelsAvailabilityDialogWrapper/ChannelsAvailabilityDialogWrapper.tsx @@ -1,8 +1,8 @@ +import { ControlledCheckbox } from "@dashboard/components/ControlledCheckbox"; +import Hr from "@dashboard/components/Hr"; +import Label from "@dashboard/orders/components/OrderHistory/Label"; import { TextField, Typography } from "@material-ui/core"; -import { ControlledCheckbox } from "@saleor/components/ControlledCheckbox"; -import Hr from "@saleor/components/Hr"; import { makeStyles } from "@saleor/macaw-ui"; -import Label from "@saleor/orders/components/OrderHistory/Label"; import React from "react"; import { defineMessages, FormattedMessage, useIntl } from "react-intl"; diff --git a/src/components/ChannelsAvailabilityDropdown/utils.ts b/src/components/ChannelsAvailabilityDropdown/utils.ts index 4b4482940..8813eb17f 100644 --- a/src/components/ChannelsAvailabilityDropdown/utils.ts +++ b/src/components/ChannelsAvailabilityDropdown/utils.ts @@ -1,4 +1,4 @@ -import { CollectionFragment } from "@saleor/graphql"; +import { CollectionFragment } from "@dashboard/graphql"; import { PillColor } from "@saleor/macaw-ui"; import { MessageDescriptor } from "react-intl"; diff --git a/src/components/ChannelsAvailabilityMenuContent/ChannelsAvailabilityMenuContent.tsx b/src/components/ChannelsAvailabilityMenuContent/ChannelsAvailabilityMenuContent.tsx index e7692cbc1..2370b600f 100644 --- a/src/components/ChannelsAvailabilityMenuContent/ChannelsAvailabilityMenuContent.tsx +++ b/src/components/ChannelsAvailabilityMenuContent/ChannelsAvailabilityMenuContent.tsx @@ -1,8 +1,8 @@ +import HorizontalSpacer from "@dashboard/apps/components/HorizontalSpacer"; +import { CollectionFragment } from "@dashboard/graphql"; +import ScrollableContent from "@dashboard/plugins/components/PluginsList/PluginAvailabilityStatusPopup/ScrollableContent"; import { Typography } from "@material-ui/core"; -import HorizontalSpacer from "@saleor/apps/components/HorizontalSpacer"; -import { CollectionFragment } from "@saleor/graphql"; import { Pill, PillColor } from "@saleor/macaw-ui"; -import ScrollableContent from "@saleor/plugins/components/PluginsList/PluginAvailabilityStatusPopup/ScrollableContent"; import React from "react"; import { MessageDescriptor, useIntl } from "react-intl"; diff --git a/src/components/ColorPicker/ColorPicker.tsx b/src/components/ColorPicker/ColorPicker.tsx index 8e34760f7..b55119565 100644 --- a/src/components/ColorPicker/ColorPicker.tsx +++ b/src/components/ColorPicker/ColorPicker.tsx @@ -1,9 +1,9 @@ +import HorizontalSpacer from "@dashboard/apps/components/HorizontalSpacer"; +import { UseFormResult } from "@dashboard/hooks/useForm"; +import { RequireOnlyOne } from "@dashboard/misc"; +import commonErrorMessages from "@dashboard/utils/errors/common"; import { TextField } from "@material-ui/core"; -import HorizontalSpacer from "@saleor/apps/components/HorizontalSpacer"; -import { UseFormResult } from "@saleor/hooks/useForm"; import { makeStyles } from "@saleor/macaw-ui"; -import { RequireOnlyOne } from "@saleor/misc"; -import commonErrorMessages from "@saleor/utils/errors/common"; import Hue from "@uiw/react-color-hue"; import Saturation from "@uiw/react-color-saturation"; import convert from "color-convert"; diff --git a/src/components/ColumnPicker/ColumnPicker.tsx b/src/components/ColumnPicker/ColumnPicker.tsx index bfc909296..45784b406 100644 --- a/src/components/ColumnPicker/ColumnPicker.tsx +++ b/src/components/ColumnPicker/ColumnPicker.tsx @@ -1,6 +1,7 @@ +import { FormChange } from "@dashboard/hooks/useForm"; +import useStateFromProps from "@dashboard/hooks/useStateFromProps"; +import { FetchMoreProps } from "@dashboard/types"; import { ClickAwayListener, Grow, Popper } from "@material-ui/core"; -import { FormChange } from "@saleor/hooks/useForm"; -import useStateFromProps from "@saleor/hooks/useStateFromProps"; import { Choice, ColumnsIcon, @@ -8,7 +9,6 @@ import { IconButtonProps, makeStyles, } from "@saleor/macaw-ui"; -import { FetchMoreProps } from "@saleor/types"; import { score } from "fuzzaldrin"; import sortBy from "lodash/sortBy"; import React from "react"; diff --git a/src/components/ColumnPicker/ColumnPickerButton.tsx b/src/components/ColumnPicker/ColumnPickerButton.tsx index 2dd1c5feb..c60c8fced 100644 --- a/src/components/ColumnPicker/ColumnPickerButton.tsx +++ b/src/components/ColumnPicker/ColumnPickerButton.tsx @@ -1,6 +1,6 @@ +import { Button } from "@dashboard/components/Button"; import { alpha } from "@material-ui/core/styles"; import ArrowDropDownIcon from "@material-ui/icons/ArrowDropDown"; -import { Button } from "@saleor/components/Button"; import { makeStyles } from "@saleor/macaw-ui"; import clsx from "clsx"; import React from "react"; diff --git a/src/components/ColumnPicker/ColumnPickerContent.tsx b/src/components/ColumnPicker/ColumnPickerContent.tsx index 80fead521..a64b44445 100644 --- a/src/components/ColumnPicker/ColumnPickerContent.tsx +++ b/src/components/ColumnPicker/ColumnPickerContent.tsx @@ -1,3 +1,7 @@ +import { Button } from "@dashboard/components/Button"; +import { FormChange } from "@dashboard/hooks/useForm"; +import { buttonMessages } from "@dashboard/intl"; +import { FetchMoreProps } from "@dashboard/types"; import { Card, CardActions, @@ -6,9 +10,6 @@ import { MenuItem, Typography, } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import { FormChange } from "@saleor/hooks/useForm"; -import { buttonMessages } from "@saleor/intl"; import { Choice, CloseIcon, @@ -16,7 +17,6 @@ import { makeStyles, MultipleValueAutocomplete, } from "@saleor/macaw-ui"; -import { FetchMoreProps } from "@saleor/types"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/components/CompanyAddressInput/CompanyAddressForm.tsx b/src/components/CompanyAddressInput/CompanyAddressForm.tsx index aa07a8165..f4d105e22 100644 --- a/src/components/CompanyAddressInput/CompanyAddressForm.tsx +++ b/src/components/CompanyAddressInput/CompanyAddressForm.tsx @@ -1,21 +1,21 @@ -import { TextField } from "@material-ui/core"; -import FormSpacer from "@saleor/components/FormSpacer"; -import Grid from "@saleor/components/Grid"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import Grid from "@dashboard/components/Grid"; import SingleAutocompleteSelectField, { SingleAutocompleteChoiceType, -} from "@saleor/components/SingleAutocompleteSelectField"; -import { AddressTypeInput } from "@saleor/customers/types"; +} from "@dashboard/components/SingleAutocompleteSelectField"; +import { AddressTypeInput } from "@dashboard/customers/types"; import { AccountErrorFragment, ShopErrorFragment, WarehouseErrorFragment, -} from "@saleor/graphql"; -import { ChangeEvent } from "@saleor/hooks/useForm"; +} from "@dashboard/graphql"; +import { ChangeEvent } from "@dashboard/hooks/useForm"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getAccountErrorMessage from "@dashboard/utils/errors/account"; +import getShopErrorMessage from "@dashboard/utils/errors/shop"; +import getWarehouseErrorMessage from "@dashboard/utils/errors/warehouse"; +import { TextField } from "@material-ui/core"; import { makeStyles } from "@saleor/macaw-ui"; -import { getFormErrors } from "@saleor/utils/errors"; -import getAccountErrorMessage from "@saleor/utils/errors/account"; -import getShopErrorMessage from "@saleor/utils/errors/shop"; -import getWarehouseErrorMessage from "@saleor/utils/errors/warehouse"; import React from "react"; import { IntlShape, useIntl } from "react-intl"; diff --git a/src/components/ConfirmButton.tsx b/src/components/ConfirmButton.tsx index c9e7bae4e..24d0be170 100644 --- a/src/components/ConfirmButton.tsx +++ b/src/components/ConfirmButton.tsx @@ -1,4 +1,4 @@ -import { buttonMessages, commonMessages } from "@saleor/intl"; +import { buttonMessages, commonMessages } from "@dashboard/intl"; import { ConfirmButton as MacawConfirmButton, ConfirmButtonLabels, diff --git a/src/components/CountryList/CountryList.tsx b/src/components/CountryList/CountryList.tsx index 76ed06f2b..4b0e9819a 100644 --- a/src/components/CountryList/CountryList.tsx +++ b/src/components/CountryList/CountryList.tsx @@ -1,11 +1,11 @@ +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { CountryFragment } from "@dashboard/graphql"; import { Card, TableBody, TableCell } from "@material-ui/core"; import ArrowDropDownIcon from "@material-ui/icons/ArrowDropDown"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { CountryFragment } from "@saleor/graphql"; import { DeleteIcon, IconButton, makeStyles } from "@saleor/macaw-ui"; import clsx from "clsx"; import React from "react"; diff --git a/src/components/Datagrid/Datagrid.tsx b/src/components/Datagrid/Datagrid.tsx index 0dd2ce4d7..5b30cfd9a 100644 --- a/src/components/Datagrid/Datagrid.tsx +++ b/src/components/Datagrid/Datagrid.tsx @@ -1,5 +1,6 @@ import "@glideapps/glide-data-grid/dist/index.css"; +import { usePreventHistoryBack } from "@dashboard/hooks/usePreventHistoryBack"; import DataEditor, { DataEditorRef, EditableGridCell, @@ -8,7 +9,6 @@ import DataEditor, { Item, } from "@glideapps/glide-data-grid"; import { Card, CardContent, Typography } from "@material-ui/core"; -import { usePreventHistoryBack } from "@saleor/hooks/usePreventHistoryBack"; import { useTheme } from "@saleor/macaw-ui"; import clsx from "clsx"; import range from "lodash/range"; diff --git a/src/components/Datagrid/Header.tsx b/src/components/Datagrid/Header.tsx index 8077a1993..5f49bbeee 100644 --- a/src/components/Datagrid/Header.tsx +++ b/src/components/Datagrid/Header.tsx @@ -1,4 +1,4 @@ -import FullScreenIcon from "@saleor/icons/FullScreenIcon"; +import FullScreenIcon from "@dashboard/icons/FullScreenIcon"; import { Button, makeStyles, PlusSmallIcon } from "@saleor/macaw-ui"; import clsx from "clsx"; import React, { FC, PropsWithChildren } from "react"; diff --git a/src/components/Datagrid/cells.ts b/src/components/Datagrid/cells.ts index 49dbf79f8..5d5f81a90 100644 --- a/src/components/Datagrid/cells.ts +++ b/src/components/Datagrid/cells.ts @@ -1,8 +1,8 @@ -import { GridCell, GridCellKind } from "@glideapps/glide-data-grid"; import { NumberCell, numberCellEmptyValue, -} from "@saleor/components/Datagrid/NumberCell"; +} from "@dashboard/components/Datagrid/NumberCell"; +import { GridCell, GridCellKind } from "@glideapps/glide-data-grid"; import { DropdownCell, diff --git a/src/components/Datagrid/useCells.ts b/src/components/Datagrid/useCells.ts index f6e4deade..f622a07f6 100644 --- a/src/components/Datagrid/useCells.ts +++ b/src/components/Datagrid/useCells.ts @@ -1,5 +1,5 @@ +import useLocale from "@dashboard/hooks/useLocale"; import { useCustomCells } from "@glideapps/glide-data-grid"; -import useLocale from "@saleor/hooks/useLocale"; import { useMemo } from "react"; import { dropdownCellRenderer } from "./DropdownCell"; diff --git a/src/components/Datagrid/useColumns.ts b/src/components/Datagrid/useColumns.ts index 761ff4b45..ba7091ea6 100644 --- a/src/components/Datagrid/useColumns.ts +++ b/src/components/Datagrid/useColumns.ts @@ -1,6 +1,6 @@ +import useStateFromProps from "@dashboard/hooks/useStateFromProps"; +import { addAtIndex, removeAtIndex } from "@dashboard/utils/lists"; import { GridColumn } from "@glideapps/glide-data-grid"; -import useStateFromProps from "@saleor/hooks/useStateFromProps"; -import { addAtIndex, removeAtIndex } from "@saleor/utils/lists"; import { useCallback, useMemo, useState } from "react"; import { AvailableColumn } from "./types"; diff --git a/src/components/Datagrid/useDatagridChange.ts b/src/components/Datagrid/useDatagridChange.ts index c196a599b..45dad536d 100644 --- a/src/components/Datagrid/useDatagridChange.ts +++ b/src/components/Datagrid/useDatagridChange.ts @@ -1,5 +1,5 @@ +import { updateAtIndex } from "@dashboard/utils/lists"; import { EditableGridCell, Item } from "@glideapps/glide-data-grid"; -import { updateAtIndex } from "@saleor/utils/lists"; import { createContext, Dispatch, diff --git a/src/components/Datagrid/useFullScreenMode.ts b/src/components/Datagrid/useFullScreenMode.ts index ddc277090..7a05959be 100644 --- a/src/components/Datagrid/useFullScreenMode.ts +++ b/src/components/Datagrid/useFullScreenMode.ts @@ -1,4 +1,4 @@ -import { usePreventHistoryBack } from "@saleor/hooks/usePreventHistoryBack"; +import { usePreventHistoryBack } from "@dashboard/hooks/usePreventHistoryBack"; import { useEffect, useState } from "react"; import { useDelayedState } from "./useDelayedState"; diff --git a/src/components/Date/Date.tsx b/src/components/Date/Date.tsx index a660c6c69..cb5be2abf 100644 --- a/src/components/Date/Date.tsx +++ b/src/components/Date/Date.tsx @@ -1,4 +1,4 @@ -import useDateLocalize from "@saleor/hooks/useDateLocalize"; +import useDateLocalize from "@dashboard/hooks/useDateLocalize"; import { Tooltip } from "@saleor/macaw-ui"; import moment from "moment-timezone"; import React from "react"; diff --git a/src/components/DateTimeField/DateTimeField.tsx b/src/components/DateTimeField/DateTimeField.tsx index d96608563..8c5d2d466 100644 --- a/src/components/DateTimeField/DateTimeField.tsx +++ b/src/components/DateTimeField/DateTimeField.tsx @@ -1,12 +1,12 @@ -import { TextField } from "@material-ui/core"; -import { TextFieldProps } from "@material-ui/core/TextField"; -import { getErrorMessage } from "@saleor/components/Attributes/utils"; +import { getErrorMessage } from "@dashboard/components/Attributes/utils"; import { PageErrorWithAttributesFragment, ProductErrorWithAttributesFragment, -} from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; -import { joinDateTime, splitDateTime } from "@saleor/misc"; +} from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; +import { joinDateTime, splitDateTime } from "@dashboard/misc"; +import { TextField } from "@material-ui/core"; +import { TextFieldProps } from "@material-ui/core/TextField"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/components/DateTimeTimezoneField.tsx b/src/components/DateTimeTimezoneField.tsx index cf0236262..2eaef736a 100644 --- a/src/components/DateTimeTimezoneField.tsx +++ b/src/components/DateTimeTimezoneField.tsx @@ -1,8 +1,8 @@ +import { commonMessages } from "@dashboard/intl"; +import { DateTime, joinDateTime, splitDateTime } from "@dashboard/misc"; import { TextField } from "@material-ui/core"; import { TextFieldProps } from "@material-ui/core/TextField"; -import { commonMessages } from "@saleor/intl"; import { makeStyles } from "@saleor/macaw-ui"; -import { DateTime, joinDateTime, splitDateTime } from "@saleor/misc"; import React, { useEffect, useState } from "react"; import { useIntl } from "react-intl"; diff --git a/src/components/DeleteButton/DeleteButton.tsx b/src/components/DeleteButton/DeleteButton.tsx index 405dec7d8..c9c460535 100644 --- a/src/components/DeleteButton/DeleteButton.tsx +++ b/src/components/DeleteButton/DeleteButton.tsx @@ -1,5 +1,5 @@ -import { Button } from "@saleor/components/Button"; -import { buttonMessages } from "@saleor/intl"; +import { Button } from "@dashboard/components/Button"; +import { buttonMessages } from "@dashboard/intl"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/components/DemoBanner/DemoBanner.tsx b/src/components/DemoBanner/DemoBanner.tsx index ec3d03b0e..32c28ccfe 100644 --- a/src/components/DemoBanner/DemoBanner.tsx +++ b/src/components/DemoBanner/DemoBanner.tsx @@ -1,6 +1,6 @@ +import ExternalLink from "@dashboard/components/ExternalLink"; import { useTheme } from "@material-ui/core/styles"; import useMediaQuery from "@material-ui/core/useMediaQuery"; -import ExternalLink from "@saleor/components/ExternalLink"; import React from "react"; import GitHubButton from "react-github-btn"; import { FormattedMessage } from "react-intl"; diff --git a/src/components/EditableTableCell/EditableTableCell.tsx b/src/components/EditableTableCell/EditableTableCell.tsx index f6e637801..f6412056c 100644 --- a/src/components/EditableTableCell/EditableTableCell.tsx +++ b/src/components/EditableTableCell/EditableTableCell.tsx @@ -1,3 +1,4 @@ +import useForm from "@dashboard/hooks/useForm"; import { Card, CardContent, @@ -6,7 +7,6 @@ import { Typography, } from "@material-ui/core"; import { TextFieldProps } from "@material-ui/core/TextField"; -import useForm from "@saleor/hooks/useForm"; import { makeStyles } from "@saleor/macaw-ui"; import clsx from "clsx"; import React from "react"; diff --git a/src/components/ErrorPage/ErrorPage.stories.tsx b/src/components/ErrorPage/ErrorPage.stories.tsx index 17e48980a..608bbdffd 100644 --- a/src/components/ErrorPage/ErrorPage.stories.tsx +++ b/src/components/ErrorPage/ErrorPage.stories.tsx @@ -1,9 +1,9 @@ import { AppStateContext, AppStateContextType, -} from "@saleor/containers/AppState"; -import { initialAppState } from "@saleor/containers/AppState/state"; -import Decorator from "@saleor/storybook/Decorator"; +} from "@dashboard/containers/AppState"; +import { initialAppState } from "@dashboard/containers/AppState/state"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/components/ErrorPage/ErrorPage.tsx b/src/components/ErrorPage/ErrorPage.tsx index 99b63756f..daff778dc 100644 --- a/src/components/ErrorPage/ErrorPage.tsx +++ b/src/components/ErrorPage/ErrorPage.tsx @@ -1,7 +1,7 @@ import notFoundImage from "@assets/images/what.svg"; +import useAppState from "@dashboard/hooks/useAppState"; +import useNavigator from "@dashboard/hooks/useNavigator"; import { Typography } from "@material-ui/core"; -import useAppState from "@saleor/hooks/useAppState"; -import useNavigator from "@saleor/hooks/useNavigator"; import { Button } from "@saleor/macaw-ui"; import React from "react"; import SVG from "react-inlinesvg"; diff --git a/src/components/FileUploadField/FileUploadField.tsx b/src/components/FileUploadField/FileUploadField.tsx index 57ea9f3c0..e0c1eed2b 100644 --- a/src/components/FileUploadField/FileUploadField.tsx +++ b/src/components/FileUploadField/FileUploadField.tsx @@ -1,7 +1,7 @@ +import { Button } from "@dashboard/components/Button"; +import { FileFragment } from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; import { Typography } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import { FileFragment } from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; import { DeleteIcon, IconButton, makeStyles } from "@saleor/macaw-ui"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/components/FileUploadField/fixtures.ts b/src/components/FileUploadField/fixtures.ts index e7e151547..d55b7c7bc 100644 --- a/src/components/FileUploadField/fixtures.ts +++ b/src/components/FileUploadField/fixtures.ts @@ -1,4 +1,4 @@ -import { FileFragment } from "@saleor/graphql"; +import { FileFragment } from "@dashboard/graphql"; export const UPLOADED_FILE: FileFragment = { __typename: "File", diff --git a/src/components/Filter/FilterAutocompleteField.tsx b/src/components/Filter/FilterAutocompleteField.tsx index 42b59cce9..2831d5e72 100644 --- a/src/components/Filter/FilterAutocompleteField.tsx +++ b/src/components/Filter/FilterAutocompleteField.tsx @@ -1,6 +1,6 @@ +import { toggle } from "@dashboard/utils/lists"; import { FormControlLabel, TextField, Typography } from "@material-ui/core"; import { makeStyles } from "@saleor/macaw-ui"; -import { toggle } from "@saleor/utils/lists"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/components/Filter/FilterContent/FilterContent.tsx b/src/components/Filter/FilterContent/FilterContent.tsx index e57140df0..c9a6a5a69 100644 --- a/src/components/Filter/FilterContent/FilterContent.tsx +++ b/src/components/Filter/FilterContent/FilterContent.tsx @@ -1,7 +1,7 @@ +import CollectionWithDividers from "@dashboard/components/CollectionWithDividers"; +import Hr from "@dashboard/components/Hr"; +import useStateFromProps from "@dashboard/hooks/useStateFromProps"; import { makeStyles, Paper, Typography } from "@material-ui/core"; -import CollectionWithDividers from "@saleor/components/CollectionWithDividers"; -import Hr from "@saleor/components/Hr"; -import useStateFromProps from "@saleor/hooks/useStateFromProps"; import { Accordion, AccordionSummary } from "@saleor/macaw-ui"; import React, { useState } from "react"; diff --git a/src/components/Filter/FilterContent/FilterContentBody.tsx b/src/components/Filter/FilterContent/FilterContentBody.tsx index f40d35aca..8799c8542 100644 --- a/src/components/Filter/FilterContent/FilterContentBody.tsx +++ b/src/components/Filter/FilterContent/FilterContentBody.tsx @@ -1,11 +1,11 @@ +import { FilterDateTimeField } from "@dashboard/components/Filter/FilterContent/FilterDateTimeField"; +import { FilterNumericField } from "@dashboard/components/Filter/FilterContent/FilterNumericField"; +import { FilterSingleSelectField } from "@dashboard/components/Filter/FilterContent/FilterSingleSelectField"; +import { useCommonStyles } from "@dashboard/components/Filter/FilterContent/utils"; +import { MultiAutocompleteChoiceType } from "@dashboard/components/MultiAutocompleteSelectField"; +import Skeleton from "@dashboard/components/Skeleton"; import { FormControlLabel, Radio, TextField } from "@material-ui/core"; import { alpha } from "@material-ui/core/styles"; -import { FilterDateTimeField } from "@saleor/components/Filter/FilterContent/FilterDateTimeField"; -import { FilterNumericField } from "@saleor/components/Filter/FilterContent/FilterNumericField"; -import { FilterSingleSelectField } from "@saleor/components/Filter/FilterContent/FilterSingleSelectField"; -import { useCommonStyles } from "@saleor/components/Filter/FilterContent/utils"; -import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField"; -import Skeleton from "@saleor/components/Skeleton"; import { makeStyles } from "@saleor/macaw-ui"; import clsx from "clsx"; import React from "react"; diff --git a/src/components/Filter/FilterContent/FilterContentHeader.tsx b/src/components/Filter/FilterContent/FilterContentHeader.tsx index db3ff430e..3bb1da2c4 100644 --- a/src/components/Filter/FilterContent/FilterContentHeader.tsx +++ b/src/components/Filter/FilterContent/FilterContentHeader.tsx @@ -1,6 +1,6 @@ +import { Button } from "@dashboard/components/Button"; +import { buttonMessages } from "@dashboard/intl"; import { Typography } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import { buttonMessages } from "@saleor/intl"; import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/components/Filter/FilterContent/FilterDateTimeField.tsx b/src/components/Filter/FilterContent/FilterDateTimeField.tsx index 06b8aa36d..70c83c9ea 100644 --- a/src/components/Filter/FilterContent/FilterDateTimeField.tsx +++ b/src/components/Filter/FilterContent/FilterDateTimeField.tsx @@ -1,7 +1,7 @@ +import { FieldType, FilterFieldBaseProps } from "@dashboard/components/Filter"; +import Arrow from "@dashboard/components/Filter/Arrow"; +import { splitDateTime } from "@dashboard/misc"; import { TextField } from "@material-ui/core"; -import { FieldType, FilterFieldBaseProps } from "@saleor/components/Filter"; -import Arrow from "@saleor/components/Filter/Arrow"; -import { splitDateTime } from "@saleor/misc"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/components/Filter/FilterContent/FilterErrorsList.tsx b/src/components/Filter/FilterContent/FilterErrorsList.tsx index f339abe2b..919f0013c 100644 --- a/src/components/Filter/FilterContent/FilterErrorsList.tsx +++ b/src/components/Filter/FilterContent/FilterErrorsList.tsx @@ -1,7 +1,7 @@ +import InlineAlert from "@dashboard/components/Alert/InlineAlert"; +import errorTracker from "@dashboard/services/errorTracking"; import { Typography } from "@material-ui/core"; import { alpha, makeStyles } from "@material-ui/core/styles"; -import InlineAlert from "@saleor/components/Alert/InlineAlert"; -import errorTracker from "@saleor/services/errorTracking"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/components/Filter/FilterContent/FilterNumericField.tsx b/src/components/Filter/FilterContent/FilterNumericField.tsx index 6c8bf5eca..ea2103eb7 100644 --- a/src/components/Filter/FilterContent/FilterNumericField.tsx +++ b/src/components/Filter/FilterContent/FilterNumericField.tsx @@ -1,6 +1,6 @@ +import { FieldType, FilterFieldBaseProps } from "@dashboard/components/Filter"; +import Arrow from "@dashboard/components/Filter/Arrow"; import { TextField } from "@material-ui/core"; -import { FieldType, FilterFieldBaseProps } from "@saleor/components/Filter"; -import Arrow from "@saleor/components/Filter/Arrow"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/components/Filter/FilterContent/FilterSingleSelectField.tsx b/src/components/Filter/FilterContent/FilterSingleSelectField.tsx index ef2bb8a70..1e6f1824a 100644 --- a/src/components/Filter/FilterContent/FilterSingleSelectField.tsx +++ b/src/components/Filter/FilterContent/FilterSingleSelectField.tsx @@ -1,9 +1,9 @@ -import { FilterFieldBaseProps, FilterType } from "@saleor/components/Filter"; +import { FilterFieldBaseProps, FilterType } from "@dashboard/components/Filter"; import { getIsFilterMultipleChoices, useCommonStyles, -} from "@saleor/components/Filter/FilterContent/utils"; -import FormSpacer from "@saleor/components/FormSpacer"; +} from "@dashboard/components/Filter/FilterContent/utils"; +import FormSpacer from "@dashboard/components/FormSpacer"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/components/Filter/FilterContent/utils.ts b/src/components/Filter/FilterContent/utils.ts index ada947f69..e5704e41d 100644 --- a/src/components/Filter/FilterContent/utils.ts +++ b/src/components/Filter/FilterContent/utils.ts @@ -1,6 +1,6 @@ -import { SingleAutocompleteChoiceType } from "@saleor/components/SingleAutocompleteSelectField"; +import { SingleAutocompleteChoiceType } from "@dashboard/components/SingleAutocompleteSelectField"; +import { joinDateTime, splitDateTime } from "@dashboard/misc"; import { makeStyles } from "@saleor/macaw-ui"; -import { joinDateTime, splitDateTime } from "@saleor/misc"; import { IntlShape } from "react-intl"; import { FilterType } from "../types"; diff --git a/src/components/Filter/FilterKeyValueField.tsx b/src/components/Filter/FilterKeyValueField.tsx index 3919f69d5..b48688335 100644 --- a/src/components/Filter/FilterKeyValueField.tsx +++ b/src/components/Filter/FilterKeyValueField.tsx @@ -1,6 +1,6 @@ +import { KeyValue } from "@dashboard/types"; import { TextField } from "@material-ui/core"; import { Button, DeleteIcon, IconButton, makeStyles } from "@saleor/macaw-ui"; -import { KeyValue } from "@saleor/types"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/components/Filter/FilterOptionField.tsx b/src/components/Filter/FilterOptionField.tsx index ae37452f0..183942d5a 100644 --- a/src/components/Filter/FilterOptionField.tsx +++ b/src/components/Filter/FilterOptionField.tsx @@ -1,6 +1,6 @@ +import { toggle } from "@dashboard/utils/lists"; import { FormControlLabel, Radio } from "@material-ui/core"; import { makeStyles } from "@saleor/macaw-ui"; -import { toggle } from "@saleor/utils/lists"; import clsx from "clsx"; import React from "react"; diff --git a/src/components/Filter/reducer.ts b/src/components/Filter/reducer.ts index 8ee318141..349d8fd01 100644 --- a/src/components/Filter/reducer.ts +++ b/src/components/Filter/reducer.ts @@ -1,4 +1,4 @@ -import { update } from "@saleor/utils/lists"; +import { update } from "@dashboard/utils/lists"; import { FieldType, IFilter, IFilterElementMutableDataGeneric } from "./types"; diff --git a/src/components/Filter/types.ts b/src/components/Filter/types.ts index 77dda09cb..93b194b85 100644 --- a/src/components/Filter/types.ts +++ b/src/components/Filter/types.ts @@ -1,5 +1,5 @@ -import { PermissionEnum } from "@saleor/graphql"; -import { FetchMoreProps, KeyValue, SearchPageProps } from "@saleor/types"; +import { PermissionEnum } from "@dashboard/graphql"; +import { FetchMoreProps, KeyValue, SearchPageProps } from "@dashboard/types"; import { MessageDescriptor } from "react-intl"; import { MultiAutocompleteChoiceType } from "../MultiAutocompleteSelectField"; diff --git a/src/components/FilterBar/FilterBar.tsx b/src/components/FilterBar/FilterBar.tsx index 90e0e7453..72a2cf46f 100644 --- a/src/components/FilterBar/FilterBar.tsx +++ b/src/components/FilterBar/FilterBar.tsx @@ -1,4 +1,4 @@ -import { Button } from "@saleor/components/Button"; +import { Button } from "@dashboard/components/Button"; import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/components/Form/ExitFormDialog.tsx b/src/components/Form/ExitFormDialog.tsx index b309c191c..ab6044bc0 100644 --- a/src/components/Form/ExitFormDialog.tsx +++ b/src/components/Form/ExitFormDialog.tsx @@ -1,5 +1,5 @@ +import HorizontalSpacer from "@dashboard/apps/components/HorizontalSpacer"; import { Button, Dialog, DialogContent, makeStyles } from "@material-ui/core"; -import HorizontalSpacer from "@saleor/apps/components/HorizontalSpacer"; import { DialogHeader } from "@saleor/macaw-ui"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/components/Form/Form.tsx b/src/components/Form/Form.tsx index 3bc0acabf..5e26d2438 100644 --- a/src/components/Form/Form.tsx +++ b/src/components/Form/Form.tsx @@ -1,4 +1,7 @@ -import useForm, { SubmitPromise, UseFormResult } from "@saleor/hooks/useForm"; +import useForm, { + SubmitPromise, + UseFormResult, +} from "@dashboard/hooks/useForm"; import React from "react"; import { FormId } from "./types"; diff --git a/src/components/Form/types.ts b/src/components/Form/types.ts index 2efa6fb17..cd92e1746 100644 --- a/src/components/Form/types.ts +++ b/src/components/Form/types.ts @@ -1,4 +1,4 @@ -import { SubmitPromise } from "@saleor/hooks/useForm"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; import React from "react"; export type SubmitFn = (event?: React.FormEvent) => SubmitPromise; diff --git a/src/components/Form/useExitFormDialog.test.tsx b/src/components/Form/useExitFormDialog.test.tsx index 9af3486d3..b1eed0824 100644 --- a/src/components/Form/useExitFormDialog.test.tsx +++ b/src/components/Form/useExitFormDialog.test.tsx @@ -1,4 +1,4 @@ -import useForm, { SubmitPromise } from "@saleor/hooks/useForm"; +import useForm, { SubmitPromise } from "@dashboard/hooks/useForm"; import { act, renderHook } from "@testing-library/react-hooks"; import React from "react"; import { useHistory } from "react-router"; diff --git a/src/components/Form/useExitFormDialogProvider.tsx b/src/components/Form/useExitFormDialogProvider.tsx index 571231b2e..d0e9a0ac3 100644 --- a/src/components/Form/useExitFormDialogProvider.tsx +++ b/src/components/Form/useExitFormDialogProvider.tsx @@ -1,4 +1,4 @@ -import { SubmitPromise } from "@saleor/hooks/useForm"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; import { useEffect, useRef, useState } from "react"; import { useHistory } from "react-router"; import useRouter from "use-react-router"; diff --git a/src/components/IconButton/IconButton.tsx b/src/components/IconButton/IconButton.tsx index bfb9ffa01..fa5488803 100644 --- a/src/components/IconButton/IconButton.tsx +++ b/src/components/IconButton/IconButton.tsx @@ -1,8 +1,8 @@ +import { isExternalURL } from "@dashboard/utils/urls"; import { IconButton as MacawIconButton, IconButtonProps, } from "@saleor/macaw-ui"; -import { isExternalURL } from "@saleor/utils/urls"; import React from "react"; import { Link } from "react-router-dom"; diff --git a/src/components/LanguageSwitch/LanguageSwitch.tsx b/src/components/LanguageSwitch/LanguageSwitch.tsx index d1fc97c05..8f5dbf98a 100644 --- a/src/components/LanguageSwitch/LanguageSwitch.tsx +++ b/src/components/LanguageSwitch/LanguageSwitch.tsx @@ -1,3 +1,4 @@ +import { LanguageCodeEnum, LanguageFragment } from "@dashboard/graphql"; import { Card, ClickAwayListener, @@ -9,7 +10,6 @@ import { Typography, } from "@material-ui/core"; import ArrowDropDown from "@material-ui/icons/ArrowDropDown"; -import { LanguageCodeEnum, LanguageFragment } from "@saleor/graphql"; import { makeStyles } from "@saleor/macaw-ui"; import clsx from "clsx"; import React from "react"; diff --git a/src/components/Link.tsx b/src/components/Link.tsx index 14901a9e1..f04d791a0 100644 --- a/src/components/Link.tsx +++ b/src/components/Link.tsx @@ -1,7 +1,7 @@ +import { isExternalURL } from "@dashboard/utils/urls"; import { Typography } from "@material-ui/core"; import { TypographyProps } from "@material-ui/core/Typography"; import { makeStyles } from "@saleor/macaw-ui"; -import { isExternalURL } from "@saleor/utils/urls"; import clsx from "clsx"; import React from "react"; import { Link as RouterLink } from "react-router-dom"; diff --git a/src/components/LinkChoice/LinkChoice.tsx b/src/components/LinkChoice/LinkChoice.tsx index 3dd4175e2..d22fc45ea 100644 --- a/src/components/LinkChoice/LinkChoice.tsx +++ b/src/components/LinkChoice/LinkChoice.tsx @@ -1,6 +1,6 @@ +import { FormChange } from "@dashboard/hooks/useForm"; +import ArrowDropdown from "@dashboard/icons/ArrowDropdown"; import { ClickAwayListener, MenuItem, Paper, Popper } from "@material-ui/core"; -import { FormChange } from "@saleor/hooks/useForm"; -import ArrowDropdown from "@saleor/icons/ArrowDropdown"; import clsx from "clsx"; import { codes } from "keycode"; import React from "react"; diff --git a/src/components/Locale/Locale.tsx b/src/components/Locale/Locale.tsx index 835a4c478..fc2bba7bd 100644 --- a/src/components/Locale/Locale.tsx +++ b/src/components/Locale/Locale.tsx @@ -1,4 +1,4 @@ -import useLocalStorage from "@saleor/hooks/useLocalStorage"; +import useLocalStorage from "@dashboard/hooks/useLocalStorage"; import React from "react"; import { IntlProvider, ReactIntlErrorCode } from "react-intl"; diff --git a/src/components/MediaTile/MediaTile.tsx b/src/components/MediaTile/MediaTile.tsx index 68987e13d..95cee8ef5 100644 --- a/src/components/MediaTile/MediaTile.tsx +++ b/src/components/MediaTile/MediaTile.tsx @@ -1,5 +1,5 @@ +import { IconButton } from "@dashboard/components/IconButton"; import { CircularProgress } from "@material-ui/core"; -import { IconButton } from "@saleor/components/IconButton"; import { DeleteIcon, EditIcon, makeStyles } from "@saleor/macaw-ui"; import clsx from "clsx"; import React from "react"; diff --git a/src/components/Metadata/Metadata.test.tsx b/src/components/Metadata/Metadata.test.tsx index 3060d2773..0ca3e0fa0 100644 --- a/src/components/Metadata/Metadata.test.tsx +++ b/src/components/Metadata/Metadata.test.tsx @@ -1,4 +1,4 @@ -import useForm from "@saleor/hooks/useForm"; +import useForm from "@dashboard/hooks/useForm"; import Wrapper from "@test/wrapper"; import { render, screen } from "@testing-library/react"; import userEvent from "@testing-library/user-event"; diff --git a/src/components/Metadata/Metadata.tsx b/src/components/Metadata/Metadata.tsx index 09b31ff7d..f6f8b3235 100644 --- a/src/components/Metadata/Metadata.tsx +++ b/src/components/Metadata/Metadata.tsx @@ -1,6 +1,6 @@ -import { MetadataInput } from "@saleor/graphql"; -import { ChangeEvent } from "@saleor/hooks/useForm"; -import { removeAtIndex, updateAtIndex } from "@saleor/utils/lists"; +import { MetadataInput } from "@dashboard/graphql"; +import { ChangeEvent } from "@dashboard/hooks/useForm"; +import { removeAtIndex, updateAtIndex } from "@dashboard/utils/lists"; import React from "react"; import CardSpacer from "../CardSpacer"; diff --git a/src/components/Metadata/MetadataCard.tsx b/src/components/Metadata/MetadataCard.tsx index 5816c597e..ec39b7926 100644 --- a/src/components/Metadata/MetadataCard.tsx +++ b/src/components/Metadata/MetadataCard.tsx @@ -1,3 +1,7 @@ +import { Button } from "@dashboard/components/Button"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { MetadataInput } from "@dashboard/graphql"; +import { FormChange } from "@dashboard/hooks/useForm"; import { Card, CardActions, @@ -9,10 +13,6 @@ import { TextField, Typography, } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { MetadataInput } from "@saleor/graphql"; -import { FormChange } from "@saleor/hooks/useForm"; import { DeleteIcon, ExpandIcon, IconButton } from "@saleor/macaw-ui"; import clsx from "clsx"; import React, { useEffect } from "react"; diff --git a/src/components/Metadata/types.ts b/src/components/Metadata/types.ts index 58c2f0c7e..1f3a003ec 100644 --- a/src/components/Metadata/types.ts +++ b/src/components/Metadata/types.ts @@ -1,4 +1,4 @@ -import { MetadataInput } from "@saleor/graphql"; +import { MetadataInput } from "@dashboard/graphql"; export enum EventDataAction { add = "add", diff --git a/src/components/Metadata/utils.ts b/src/components/Metadata/utils.ts index f074653bf..ff8955303 100644 --- a/src/components/Metadata/utils.ts +++ b/src/components/Metadata/utils.ts @@ -1,4 +1,4 @@ -import { ChangeEvent } from "@saleor/hooks/useForm"; +import { ChangeEvent } from "@dashboard/hooks/useForm"; import { nameSeparator } from "./MetadataCard"; import { EventData, EventDataAction, EventDataField } from "./types"; diff --git a/src/components/Money/Money.tsx b/src/components/Money/Money.tsx index e45564d1c..94b20201f 100644 --- a/src/components/Money/Money.tsx +++ b/src/components/Money/Money.tsx @@ -1,4 +1,4 @@ -import useLocale from "@saleor/hooks/useLocale"; +import useLocale from "@dashboard/hooks/useLocale"; import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; diff --git a/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectField.tsx b/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectField.tsx index 3d5a84256..38ca9222d 100644 --- a/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectField.tsx +++ b/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectField.tsx @@ -1,3 +1,5 @@ +import Debounce, { DebounceProps } from "@dashboard/components/Debounce"; +import { FetchMoreProps } from "@dashboard/types"; import { Popper, PopperPlacementType, @@ -5,9 +7,7 @@ import { Typography, } from "@material-ui/core"; import CloseIcon from "@material-ui/icons/Close"; -import Debounce, { DebounceProps } from "@saleor/components/Debounce"; import { ChevronIcon, IconButton } from "@saleor/macaw-ui"; -import { FetchMoreProps } from "@saleor/types"; import clsx from "clsx"; import Downshift, { ControllerStateAndHelpers } from "downshift"; import { filter } from "fuzzaldrin"; diff --git a/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectFieldContent.tsx b/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectFieldContent.tsx index 55af4f5a3..73aa56dda 100644 --- a/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectFieldContent.tsx +++ b/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectFieldContent.tsx @@ -1,4 +1,10 @@ import chevronDown from "@assets/images/ChevronDown.svg"; +import HorizontalSpacer from "@dashboard/apps/components/HorizontalSpacer"; +import Checkbox from "@dashboard/components/Checkbox"; +import useElementScroll, { + isScrolledToBottom, +} from "@dashboard/hooks/useElementScroll"; +import { FetchMoreProps } from "@dashboard/types"; import { CircularProgress, MenuItem, @@ -6,13 +12,7 @@ import { Typography, } from "@material-ui/core"; import AddIcon from "@material-ui/icons/Add"; -import HorizontalSpacer from "@saleor/apps/components/HorizontalSpacer"; -import Checkbox from "@saleor/components/Checkbox"; -import useElementScroll, { - isScrolledToBottom, -} from "@saleor/hooks/useElementScroll"; import { makeStyles } from "@saleor/macaw-ui"; -import { FetchMoreProps } from "@saleor/types"; import clsx from "clsx"; import { GetItemPropsOptions } from "downshift"; import React, { ReactNode } from "react"; diff --git a/src/components/Navigator/Navigator.tsx b/src/components/Navigator/Navigator.tsx index 55fcd52c1..81a1068d7 100644 --- a/src/components/Navigator/Navigator.tsx +++ b/src/components/Navigator/Navigator.tsx @@ -1,7 +1,7 @@ +import { APP_VERSION } from "@dashboard/config"; +import useLocalStorage from "@dashboard/hooks/useLocalStorage"; +import useNotifier from "@dashboard/hooks/useNotifier"; import { Divider, Fade, Modal, Paper } from "@material-ui/core"; -import { APP_VERSION } from "@saleor/config"; -import useLocalStorage from "@saleor/hooks/useLocalStorage"; -import useNotifier from "@saleor/hooks/useNotifier"; import { makeStyles, useTheme } from "@saleor/macaw-ui"; import Downshift from "downshift"; import hotkeys from "hotkeys-js"; diff --git a/src/components/Navigator/modes/catalog.ts b/src/components/Navigator/modes/catalog.ts index e8fd89a6e..20670665a 100644 --- a/src/components/Navigator/modes/catalog.ts +++ b/src/components/Navigator/modes/catalog.ts @@ -1,9 +1,9 @@ -import { categoryUrl } from "@saleor/categories/urls"; -import { collectionUrl } from "@saleor/collections/urls"; -import { SearchCatalogQuery } from "@saleor/graphql"; -import { UseNavigatorResult } from "@saleor/hooks/useNavigator"; -import { productUrl } from "@saleor/products/urls"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +import { categoryUrl } from "@dashboard/categories/urls"; +import { collectionUrl } from "@dashboard/collections/urls"; +import { SearchCatalogQuery } from "@dashboard/graphql"; +import { UseNavigatorResult } from "@dashboard/hooks/useNavigator"; +import { productUrl } from "@dashboard/products/urls"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import { score } from "fuzzaldrin"; import { IntlShape } from "react-intl"; diff --git a/src/components/Navigator/modes/commands/actions.ts b/src/components/Navigator/modes/commands/actions.ts index 353f736d5..9c878b348 100644 --- a/src/components/Navigator/modes/commands/actions.ts +++ b/src/components/Navigator/modes/commands/actions.ts @@ -1,12 +1,12 @@ import { MutationFunction } from "@apollo/client"; -import { categoryAddUrl } from "@saleor/categories/urls"; -import { collectionAddUrl } from "@saleor/collections/urls"; -import { customerAddUrl } from "@saleor/customers/urls"; -import { voucherAddUrl } from "@saleor/discounts/urls"; -import { OrderDraftCreateMutation } from "@saleor/graphql"; -import { UseNavigatorResult } from "@saleor/hooks/useNavigator"; -import { permissionGroupAddUrl } from "@saleor/permissionGroups/urls"; -import { productAddUrl } from "@saleor/products/urls"; +import { categoryAddUrl } from "@dashboard/categories/urls"; +import { collectionAddUrl } from "@dashboard/collections/urls"; +import { customerAddUrl } from "@dashboard/customers/urls"; +import { voucherAddUrl } from "@dashboard/discounts/urls"; +import { OrderDraftCreateMutation } from "@dashboard/graphql"; +import { UseNavigatorResult } from "@dashboard/hooks/useNavigator"; +import { permissionGroupAddUrl } from "@dashboard/permissionGroups/urls"; +import { productAddUrl } from "@dashboard/products/urls"; import { score } from "fuzzaldrin"; import { IntlShape } from "react-intl"; diff --git a/src/components/Navigator/modes/customers.ts b/src/components/Navigator/modes/customers.ts index c192a87dc..8237f69aa 100644 --- a/src/components/Navigator/modes/customers.ts +++ b/src/components/Navigator/modes/customers.ts @@ -1,7 +1,7 @@ -import { customerUrl } from "@saleor/customers/urls"; -import { SearchCustomersQuery } from "@saleor/graphql"; -import { UseNavigatorResult } from "@saleor/hooks/useNavigator"; -import { RelayToFlat } from "@saleor/types"; +import { customerUrl } from "@dashboard/customers/urls"; +import { SearchCustomersQuery } from "@dashboard/graphql"; +import { UseNavigatorResult } from "@dashboard/hooks/useNavigator"; +import { RelayToFlat } from "@dashboard/types"; import { IntlShape } from "react-intl"; import { QuickSearchAction } from "../types"; diff --git a/src/components/Navigator/modes/default/default.ts b/src/components/Navigator/modes/default/default.ts index aed32c3e9..7642ad9ed 100644 --- a/src/components/Navigator/modes/default/default.ts +++ b/src/components/Navigator/modes/default/default.ts @@ -1,6 +1,6 @@ import { MutationFunction } from "@apollo/client"; -import { OrderDraftCreateMutation } from "@saleor/graphql"; -import { UseNavigatorResult } from "@saleor/hooks/useNavigator"; +import { OrderDraftCreateMutation } from "@dashboard/graphql"; +import { UseNavigatorResult } from "@dashboard/hooks/useNavigator"; import { IntlShape } from "react-intl"; import { QuickSearchAction, QuickSearchMode } from "../../types"; diff --git a/src/components/Navigator/modes/default/views.ts b/src/components/Navigator/modes/default/views.ts index 1a8ffb7e5..acdbf1aba 100644 --- a/src/components/Navigator/modes/default/views.ts +++ b/src/components/Navigator/modes/default/views.ts @@ -1,24 +1,24 @@ -import { appsListUrl } from "@saleor/apps/urls"; -import { attributeListUrl } from "@saleor/attributes/urls"; -import { categoryListUrl } from "@saleor/categories/urls"; -import { collectionListUrl } from "@saleor/collections/urls"; -import { customerListUrl } from "@saleor/customers/urls"; -import { saleListUrl, voucherListUrl } from "@saleor/discounts/urls"; -import { UseNavigatorResult } from "@saleor/hooks/useNavigator"; -import { sectionNames } from "@saleor/intl"; -import { menuListUrl } from "@saleor/navigation/urls"; -import { orderDraftListUrl, orderListUrl } from "@saleor/orders/urls"; -import { pageListUrl } from "@saleor/pages/urls"; -import { permissionGroupListUrl } from "@saleor/permissionGroups/urls"; -import { pluginListUrl } from "@saleor/plugins/urls"; -import { productListUrl } from "@saleor/products/urls"; -import { productTypeListUrl } from "@saleor/productTypes/urls"; -import { shippingZonesListUrl } from "@saleor/shipping/urls"; -import { siteSettingsUrl } from "@saleor/siteSettings/urls"; -import { staffListUrl } from "@saleor/staff/urls"; -import { taxConfigurationListUrl } from "@saleor/taxes/urls"; -import { languageListUrl } from "@saleor/translations/urls"; -import { warehouseListUrl } from "@saleor/warehouses/urls"; +import { appsListUrl } from "@dashboard/apps/urls"; +import { attributeListUrl } from "@dashboard/attributes/urls"; +import { categoryListUrl } from "@dashboard/categories/urls"; +import { collectionListUrl } from "@dashboard/collections/urls"; +import { customerListUrl } from "@dashboard/customers/urls"; +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 { orderDraftListUrl, orderListUrl } from "@dashboard/orders/urls"; +import { pageListUrl } from "@dashboard/pages/urls"; +import { permissionGroupListUrl } from "@dashboard/permissionGroups/urls"; +import { pluginListUrl } from "@dashboard/plugins/urls"; +import { productListUrl } from "@dashboard/products/urls"; +import { productTypeListUrl } from "@dashboard/productTypes/urls"; +import { shippingZonesListUrl } from "@dashboard/shipping/urls"; +import { siteSettingsUrl } from "@dashboard/siteSettings/urls"; +import { staffListUrl } from "@dashboard/staff/urls"; +import { taxConfigurationListUrl } from "@dashboard/taxes/urls"; +import { languageListUrl } from "@dashboard/translations/urls"; +import { warehouseListUrl } from "@dashboard/warehouses/urls"; import { score } from "fuzzaldrin"; import { IntlShape } from "react-intl"; diff --git a/src/components/Navigator/modes/index.ts b/src/components/Navigator/modes/index.ts index 89ab8b249..0343b8f17 100644 --- a/src/components/Navigator/modes/index.ts +++ b/src/components/Navigator/modes/index.ts @@ -1,6 +1,6 @@ import { MutationFunction } from "@apollo/client"; -import { OrderDraftCreateMutation } from "@saleor/graphql"; -import { UseNavigatorResult } from "@saleor/hooks/useNavigator"; +import { OrderDraftCreateMutation } from "@dashboard/graphql"; +import { UseNavigatorResult } from "@dashboard/hooks/useNavigator"; import { IntlShape } from "react-intl"; import { QuickSearchAction, QuickSearchMode } from "../types"; diff --git a/src/components/Navigator/modes/orders.ts b/src/components/Navigator/modes/orders.ts index 75c479eb4..a9ca8318c 100644 --- a/src/components/Navigator/modes/orders.ts +++ b/src/components/Navigator/modes/orders.ts @@ -1,7 +1,7 @@ -import { CheckIfOrderExistsQuery } from "@saleor/graphql"; -import { UseNavigatorResult } from "@saleor/hooks/useNavigator"; -import { maybe, transformOrderStatus } from "@saleor/misc"; -import { orderUrl } from "@saleor/orders/urls"; +import { CheckIfOrderExistsQuery } from "@dashboard/graphql"; +import { UseNavigatorResult } from "@dashboard/hooks/useNavigator"; +import { maybe, transformOrderStatus } from "@dashboard/misc"; +import { orderUrl } from "@dashboard/orders/urls"; import { IntlShape } from "react-intl"; import { QuickSearchAction } from "../types"; diff --git a/src/components/Navigator/modes/types.ts b/src/components/Navigator/modes/types.ts index e67bc36c8..c22cf1cf1 100644 --- a/src/components/Navigator/modes/types.ts +++ b/src/components/Navigator/modes/types.ts @@ -2,8 +2,8 @@ import { CheckIfOrderExistsQuery, SearchCatalogQuery, SearchCustomersQuery, -} from "@saleor/graphql"; -import { RelayToFlat } from "@saleor/types"; +} from "@dashboard/graphql"; +import { RelayToFlat } from "@dashboard/types"; export interface ActionQueries { catalog: SearchCatalogQuery; diff --git a/src/components/Navigator/queries/useCatalogSearch.ts b/src/components/Navigator/queries/useCatalogSearch.ts index 3418aaaab..3e02360f3 100644 --- a/src/components/Navigator/queries/useCatalogSearch.ts +++ b/src/components/Navigator/queries/useCatalogSearch.ts @@ -1,8 +1,8 @@ import { SearchCatalogQueryHookResult, useSearchCatalogQuery, -} from "@saleor/graphql"; -import useDebounce from "@saleor/hooks/useDebounce"; +} from "@dashboard/graphql"; +import useDebounce from "@dashboard/hooks/useDebounce"; import { useState } from "react"; type UseSearchCatalog = [SearchCatalogQueryHookResult, (query: string) => void]; diff --git a/src/components/Navigator/queries/useCheckIfOrderExists.ts b/src/components/Navigator/queries/useCheckIfOrderExists.ts index 39af2b805..eae7ed774 100644 --- a/src/components/Navigator/queries/useCheckIfOrderExists.ts +++ b/src/components/Navigator/queries/useCheckIfOrderExists.ts @@ -1,8 +1,8 @@ import { CheckIfOrderExistsQueryHookResult, useCheckIfOrderExistsQuery, -} from "@saleor/graphql"; -import useDebounce from "@saleor/hooks/useDebounce"; +} from "@dashboard/graphql"; +import useDebounce from "@dashboard/hooks/useDebounce"; import { useState } from "react"; function useCheckIfOrderExists(): [ diff --git a/src/components/Navigator/useQuickSearch.ts b/src/components/Navigator/useQuickSearch.ts index 5cbe979c8..bd58cb8ec 100644 --- a/src/components/Navigator/useQuickSearch.ts +++ b/src/components/Navigator/useQuickSearch.ts @@ -1,12 +1,12 @@ -import { DEFAULT_INITIAL_SEARCH_DATA } from "@saleor/config"; -import { useOrderDraftCreateMutation } from "@saleor/graphql"; -import { ChangeEvent, FormChange } from "@saleor/hooks/useForm"; -import useModalDialogOpen from "@saleor/hooks/useModalDialogOpen"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { maybe } from "@saleor/misc"; -import { orderUrl } from "@saleor/orders/urls"; -import useCustomerSearch from "@saleor/searches/useCustomerSearch"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +import { DEFAULT_INITIAL_SEARCH_DATA } from "@dashboard/config"; +import { useOrderDraftCreateMutation } from "@dashboard/graphql"; +import { ChangeEvent, FormChange } from "@dashboard/hooks/useForm"; +import useModalDialogOpen from "@dashboard/hooks/useModalDialogOpen"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { maybe } from "@dashboard/misc"; +import { orderUrl } from "@dashboard/orders/urls"; +import useCustomerSearch from "@dashboard/searches/useCustomerSearch"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import { RefObject, useEffect, useState } from "react"; import { useIntl } from "react-intl"; diff --git a/src/components/NavigatorButton/NavigatorButton.tsx b/src/components/NavigatorButton/NavigatorButton.tsx index 47f14f3c6..3c6f506d3 100644 --- a/src/components/NavigatorButton/NavigatorButton.tsx +++ b/src/components/NavigatorButton/NavigatorButton.tsx @@ -1,7 +1,7 @@ +import { triangle } from "@dashboard/styles/mixins"; import { Grow, Paper, Popper } from "@material-ui/core"; import { IconButtonProps } from "@material-ui/core/IconButton"; import { LayoutButton, makeStyles, NavigatorIcon } from "@saleor/macaw-ui"; -import { triangle } from "@saleor/styles/mixins"; import clsx from "clsx"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/components/NotFoundPage/NotFoundPage.stories.tsx b/src/components/NotFoundPage/NotFoundPage.stories.tsx index 7bc94b549..de0e619e9 100644 --- a/src/components/NotFoundPage/NotFoundPage.stories.tsx +++ b/src/components/NotFoundPage/NotFoundPage.stories.tsx @@ -1,4 +1,4 @@ -import Decorator from "@saleor/storybook/Decorator"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/components/NotFoundPage/NotFoundPage.tsx b/src/components/NotFoundPage/NotFoundPage.tsx index 3b00016cc..b6437fdb3 100644 --- a/src/components/NotFoundPage/NotFoundPage.tsx +++ b/src/components/NotFoundPage/NotFoundPage.tsx @@ -1,6 +1,6 @@ import notFoundImage from "@assets/images/not-found-404.svg"; +import { Button } from "@dashboard/components/Button"; import { Typography } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; import SVG from "react-inlinesvg"; diff --git a/src/components/PageSectionHeader/PageSectionHeader.tsx b/src/components/PageSectionHeader/PageSectionHeader.tsx index f7889e68c..ed7b84b74 100644 --- a/src/components/PageSectionHeader/PageSectionHeader.tsx +++ b/src/components/PageSectionHeader/PageSectionHeader.tsx @@ -1,5 +1,5 @@ +import VerticalSpacer from "@dashboard/apps/components/VerticalSpacer"; import { Typography } from "@material-ui/core"; -import VerticalSpacer from "@saleor/apps/components/VerticalSpacer"; import React from "react"; interface PageSectionHeaderProps { diff --git a/src/components/PhoneField/PhoneField.tsx b/src/components/PhoneField/PhoneField.tsx index 5f9bf38c8..ae14d4402 100644 --- a/src/components/PhoneField/PhoneField.tsx +++ b/src/components/PhoneField/PhoneField.tsx @@ -1,5 +1,5 @@ +import SingleSelectField from "@dashboard/components/SingleSelectField"; import { TextField } from "@material-ui/core"; -import SingleSelectField from "@saleor/components/SingleSelectField"; import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; diff --git a/src/components/PriceField/usePriceField.ts b/src/components/PriceField/usePriceField.ts index a3f770da1..d36499a68 100644 --- a/src/components/PriceField/usePriceField.ts +++ b/src/components/PriceField/usePriceField.ts @@ -1,5 +1,5 @@ +import { FormChange } from "@dashboard/hooks/useForm"; import { TextFieldProps } from "@material-ui/core"; -import { FormChange } from "@saleor/hooks/useForm"; import { useMemo } from "react"; import { SEPARATOR_CHARACTERS } from "./consts"; diff --git a/src/components/RequirePermissions.tsx b/src/components/RequirePermissions.tsx index f15d4e0cb..96345a2a8 100644 --- a/src/components/RequirePermissions.tsx +++ b/src/components/RequirePermissions.tsx @@ -1,5 +1,5 @@ -import { useUserPermissions } from "@saleor/auth/hooks/useUserPermissions"; -import { PermissionEnum, UserPermissionFragment } from "@saleor/graphql"; +import { useUserPermissions } from "@dashboard/auth/hooks/useUserPermissions"; +import { PermissionEnum, UserPermissionFragment } from "@dashboard/graphql"; import React from "react"; const findPerm = (permList, perm) => diff --git a/src/components/RichTextEditor/consts.ts b/src/components/RichTextEditor/consts.ts index 60e935f9b..eab229798 100644 --- a/src/components/RichTextEditor/consts.ts +++ b/src/components/RichTextEditor/consts.ts @@ -1,10 +1,10 @@ +import strikethroughIcon from "@dashboard/icons/StrikethroughIcon"; import { ToolConstructable, ToolSettings } from "@editorjs/editorjs"; import Embed from "@editorjs/embed"; import Header from "@editorjs/header"; import List from "@editorjs/list"; import Paragraph from "@editorjs/paragraph"; import Quote from "@editorjs/quote"; -import strikethroughIcon from "@saleor/icons/StrikethroughIcon"; import createGenericInlineTool from "editorjs-inline-tool"; const inlineToolbar = ["link", "bold", "italic", "strikethrough"]; diff --git a/src/components/SaveFilterTabDialog/SaveFilterTabDialog.tsx b/src/components/SaveFilterTabDialog/SaveFilterTabDialog.tsx index 339763e30..cfc1999b1 100644 --- a/src/components/SaveFilterTabDialog/SaveFilterTabDialog.tsx +++ b/src/components/SaveFilterTabDialog/SaveFilterTabDialog.tsx @@ -1,3 +1,4 @@ +import { buttonMessages } from "@dashboard/intl"; import { Dialog, DialogActions, @@ -5,7 +6,6 @@ import { DialogTitle, TextField, } from "@material-ui/core"; -import { buttonMessages } from "@saleor/intl"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/components/Savebar.tsx b/src/components/Savebar.tsx index 928591c9a..eab99e5ee 100644 --- a/src/components/Savebar.tsx +++ b/src/components/Savebar.tsx @@ -1,4 +1,4 @@ -import { buttonMessages, commonMessages } from "@saleor/intl"; +import { buttonMessages, commonMessages } from "@dashboard/intl"; import { Savebar as MacawSavebar, SavebarLabels, diff --git a/src/components/SearchBar/SearchBar.tsx b/src/components/SearchBar/SearchBar.tsx index ed9dbcf92..3b9bcff8d 100644 --- a/src/components/SearchBar/SearchBar.tsx +++ b/src/components/SearchBar/SearchBar.tsx @@ -1,6 +1,6 @@ -import { Button } from "@saleor/components/Button"; +import { Button } from "@dashboard/components/Button"; +import { SearchPageProps, TabPageProps } from "@dashboard/types"; import { makeStyles } from "@saleor/macaw-ui"; -import { SearchPageProps, TabPageProps } from "@saleor/types"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/components/SeoForm/SeoForm.tsx b/src/components/SeoForm/SeoForm.tsx index 062f965a8..9649ad99b 100644 --- a/src/components/SeoForm/SeoForm.tsx +++ b/src/components/SeoForm/SeoForm.tsx @@ -1,13 +1,13 @@ -import { Card, CardContent, TextField, Typography } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; +import { Button } from "@dashboard/components/Button"; import { CollectionErrorFragment, PageErrorFragment, ProductErrorFragment, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; +import { getFieldError, getProductErrorMessage } from "@dashboard/utils/errors"; +import getPageErrorMessage from "@dashboard/utils/errors/page"; +import { Card, CardContent, TextField, Typography } from "@material-ui/core"; import { makeStyles } from "@saleor/macaw-ui"; -import { getFieldError, getProductErrorMessage } from "@saleor/utils/errors"; -import getPageErrorMessage from "@saleor/utils/errors/page"; import clsx from "clsx"; import React from "react"; import { defineMessages, FormattedMessage, useIntl } from "react-intl"; diff --git a/src/components/Shop/index.tsx b/src/components/Shop/index.tsx index 6b7fb613a..1e048ca78 100644 --- a/src/components/Shop/index.tsx +++ b/src/components/Shop/index.tsx @@ -2,8 +2,8 @@ import appleTouchIcon from "@assets/favicons/apple-touch-icon.png"; import favicon16 from "@assets/favicons/favicon-16x16.png"; import favicon32 from "@assets/favicons/favicon-32x32.png"; import safariPinnedTab from "@assets/favicons/safari-pinned-tab.svg"; -import { useUser } from "@saleor/auth"; -import { ShopInfoQuery, useShopInfoQuery } from "@saleor/graphql"; +import { useUser } from "@dashboard/auth"; +import { ShopInfoQuery, useShopInfoQuery } from "@dashboard/graphql"; import React from "react"; import Helmet from "react-helmet"; diff --git a/src/components/Shop/queries.ts b/src/components/Shop/queries.ts index 1ea481e2a..40e9025e8 100644 --- a/src/components/Shop/queries.ts +++ b/src/components/Shop/queries.ts @@ -3,8 +3,8 @@ import { RefreshLimitsQuery, RefreshLimitsQueryVariables, useRefreshLimitsQuery, -} from "@saleor/graphql"; -import { QueryHookOptions } from "@saleor/hooks/graphql"; +} from "@dashboard/graphql"; +import { QueryHookOptions } from "@dashboard/hooks/graphql"; export const shopInfo = gql` query ShopInfo { diff --git a/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectField.tsx b/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectField.tsx index 0790d6d34..381379ef4 100644 --- a/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectField.tsx +++ b/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectField.tsx @@ -1,3 +1,5 @@ +import { ExtendedFormHelperTextProps } from "@dashboard/channels/components/ChannelForm/types"; +import { FetchMoreProps } from "@dashboard/types"; import { InputBase, OutlinedInputProps, @@ -6,9 +8,7 @@ import { TextField, } from "@material-ui/core"; import { InputProps } from "@material-ui/core/Input"; -import { ExtendedFormHelperTextProps } from "@saleor/channels/components/ChannelForm/types"; import { ChevronIcon } from "@saleor/macaw-ui"; -import { FetchMoreProps } from "@saleor/types"; import clsx from "clsx"; import Downshift from "downshift"; import Fuse from "fuse.js"; @@ -37,7 +37,7 @@ export interface SingleAutocompleteSelectFieldProps helperText?: string; label?: string; InputProps?: InputProps; - autocomplete?: string, + autocomplete?: string; fetchChoices?: (value: string) => void; onChange: (event: React.ChangeEvent) => void; fetchOnFocus?: boolean; diff --git a/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectFieldContent.tsx b/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectFieldContent.tsx index a5fe95cbf..975e66f36 100644 --- a/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectFieldContent.tsx +++ b/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectFieldContent.tsx @@ -1,4 +1,8 @@ import chevronDown from "@assets/images/ChevronDown.svg"; +import useElementScroll, { + isScrolledToBottom, +} from "@dashboard/hooks/useElementScroll"; +import { FetchMoreProps } from "@dashboard/types"; import { CircularProgress, MenuItem, @@ -6,11 +10,7 @@ import { Typography, } from "@material-ui/core"; import Add from "@material-ui/icons/Add"; -import useElementScroll, { - isScrolledToBottom, -} from "@saleor/hooks/useElementScroll"; import { makeStyles } from "@saleor/macaw-ui"; -import { FetchMoreProps } from "@saleor/types"; import clsx from "clsx"; import { GetItemPropsOptions } from "downshift"; import React, { ReactElement } from "react"; diff --git a/src/components/SortableChipsField/SortableChipsField.tsx b/src/components/SortableChipsField/SortableChipsField.tsx index d5acee169..9f4dac5c4 100644 --- a/src/components/SortableChipsField/SortableChipsField.tsx +++ b/src/components/SortableChipsField/SortableChipsField.tsx @@ -1,6 +1,6 @@ +import { ReorderAction, ReorderEvent } from "@dashboard/types"; import { Typography } from "@material-ui/core"; import { makeStyles } from "@saleor/macaw-ui"; -import { ReorderAction, ReorderEvent } from "@saleor/types"; import React from "react"; import { SortableContainerProps } from "react-sortable-hoc"; diff --git a/src/components/SortableTable/SortableTableBody.tsx b/src/components/SortableTable/SortableTableBody.tsx index c9b628b5e..63e3dc90d 100644 --- a/src/components/SortableTable/SortableTableBody.tsx +++ b/src/components/SortableTable/SortableTableBody.tsx @@ -1,7 +1,7 @@ +import { ReorderAction } from "@dashboard/types"; import { TableBody } from "@material-ui/core"; import { TableBodyProps } from "@material-ui/core/TableBody"; import { makeStyles } from "@saleor/macaw-ui"; -import { ReorderAction } from "@saleor/types"; import React from "react"; import { SortableContainer } from "react-sortable-hoc"; diff --git a/src/components/TableHead/TableHead.tsx b/src/components/TableHead/TableHead.tsx index c0104a790..841a4b948 100644 --- a/src/components/TableHead/TableHead.tsx +++ b/src/components/TableHead/TableHead.tsx @@ -1,10 +1,10 @@ +import TableRowLink from "@dashboard/components/TableRowLink"; import { TableCell, TableHead as MuiTableHead, Typography, } from "@material-ui/core"; import { TableHeadProps as MuiTableHeadProps } from "@material-ui/core/TableHead"; -import TableRowLink from "@saleor/components/TableRowLink"; import { makeStyles } from "@saleor/macaw-ui"; import clsx from "clsx"; import React from "react"; diff --git a/src/components/TablePagination/TablePaginationActions.tsx b/src/components/TablePagination/TablePaginationActions.tsx index 7f8485b48..33ee1fc25 100644 --- a/src/components/TablePagination/TablePaginationActions.tsx +++ b/src/components/TablePagination/TablePaginationActions.tsx @@ -1,8 +1,8 @@ +import { isDarkTheme } from "@dashboard/misc"; import { alpha } from "@material-ui/core/styles"; import ArrowLeft from "@material-ui/icons/ArrowLeft"; import ArrowRight from "@material-ui/icons/ArrowRight"; import { IconButton, makeStyles, useTheme } from "@saleor/macaw-ui"; -import { isDarkTheme } from "@saleor/misc"; import clsx from "clsx"; import React from "react"; diff --git a/src/components/TablePagination/TablePaginationWithContext.tsx b/src/components/TablePagination/TablePaginationWithContext.tsx index acde8edd3..32e472b8f 100644 --- a/src/components/TablePagination/TablePaginationWithContext.tsx +++ b/src/components/TablePagination/TablePaginationWithContext.tsx @@ -1,4 +1,4 @@ -import { usePaginatorContext } from "@saleor/hooks/usePaginator"; +import { usePaginatorContext } from "@dashboard/hooks/usePaginator"; import React from "react"; import TablePagination, { PaginationProps } from "./TablePagination"; diff --git a/src/components/TableRowLink/TableRowLink.tsx b/src/components/TableRowLink/TableRowLink.tsx index 1ee193da7..eaa38ad59 100644 --- a/src/components/TableRowLink/TableRowLink.tsx +++ b/src/components/TableRowLink/TableRowLink.tsx @@ -1,6 +1,6 @@ +import { isExternalURL } from "@dashboard/utils/urls"; import { TableRow, TableRowTypeMap } from "@material-ui/core"; import { makeStyles } from "@saleor/macaw-ui"; -import { isExternalURL } from "@saleor/utils/urls"; import clsx from "clsx"; import React from "react"; import { Link } from "react-router-dom"; diff --git a/src/components/TextWithSelectField/TextWithSelectField.tsx b/src/components/TextWithSelectField/TextWithSelectField.tsx index 20b6fb901..ade2636bf 100644 --- a/src/components/TextWithSelectField/TextWithSelectField.tsx +++ b/src/components/TextWithSelectField/TextWithSelectField.tsx @@ -1,8 +1,8 @@ -import { TextField } from "@material-ui/core"; import SingleSelectField, { Choices, -} from "@saleor/components/SingleSelectField"; -import { ChangeEvent, FormChange } from "@saleor/hooks/useForm"; +} from "@dashboard/components/SingleSelectField"; +import { ChangeEvent, FormChange } from "@dashboard/hooks/useForm"; +import { TextField } from "@material-ui/core"; import clsx from "clsx"; import React from "react"; diff --git a/src/components/Timeline/Timeline.tsx b/src/components/Timeline/Timeline.tsx index c671797b3..124b215a8 100644 --- a/src/components/Timeline/Timeline.tsx +++ b/src/components/Timeline/Timeline.tsx @@ -1,7 +1,7 @@ +import { Button } from "@dashboard/components/Button"; import { Avatar, CardContent, TextField } from "@material-ui/core"; import deepPurple from "@material-ui/core/colors/deepPurple"; import PersonIcon from "@material-ui/icons/Person"; -import { Button } from "@saleor/components/Button"; import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/components/Timeline/TimelineEventHeader.tsx b/src/components/Timeline/TimelineEventHeader.tsx index 605f866fc..d19a8d661 100644 --- a/src/components/Timeline/TimelineEventHeader.tsx +++ b/src/components/Timeline/TimelineEventHeader.tsx @@ -1,5 +1,5 @@ +import useNavigator from "@dashboard/hooks/useNavigator"; import { Typography } from "@material-ui/core"; -import useNavigator from "@saleor/hooks/useNavigator"; import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; diff --git a/src/components/TypeDeleteWarningDialog/TypeDeleteWarningDialog.tsx b/src/components/TypeDeleteWarningDialog/TypeDeleteWarningDialog.tsx index de51fd253..16b900de0 100644 --- a/src/components/TypeDeleteWarningDialog/TypeDeleteWarningDialog.tsx +++ b/src/components/TypeDeleteWarningDialog/TypeDeleteWarningDialog.tsx @@ -1,7 +1,7 @@ +import { getById } from "@dashboard/misc"; +import ModalTitle from "@dashboard/orders/components/OrderDiscountCommonModal/ModalTitle"; import { Card, CardContent, CircularProgress, Modal } from "@material-ui/core"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { getById } from "@saleor/misc"; -import ModalTitle from "@saleor/orders/components/OrderDiscountCommonModal/ModalTitle"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/components/TypeDeleteWarningDialog/TypeDeleteWarningDialogContent.tsx b/src/components/TypeDeleteWarningDialog/TypeDeleteWarningDialogContent.tsx index a03739a9b..7cab66938 100644 --- a/src/components/TypeDeleteWarningDialog/TypeDeleteWarningDialogContent.tsx +++ b/src/components/TypeDeleteWarningDialog/TypeDeleteWarningDialogContent.tsx @@ -1,8 +1,8 @@ +import HorizontalSpacer from "@dashboard/apps/components/HorizontalSpacer"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import useNavigator from "@dashboard/hooks/useNavigator"; import { CardContent } from "@material-ui/core"; -import HorizontalSpacer from "@saleor/apps/components/HorizontalSpacer"; -import CardSpacer from "@saleor/components/CardSpacer"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import useNavigator from "@saleor/hooks/useNavigator"; import React, { useState } from "react"; import { MessageDescriptor, useIntl } from "react-intl"; diff --git a/src/components/UserChip/UserChip.tsx b/src/components/UserChip/UserChip.tsx index 868244936..c60303668 100644 --- a/src/components/UserChip/UserChip.tsx +++ b/src/components/UserChip/UserChip.tsx @@ -1,8 +1,8 @@ +import { UserFragment } from "@dashboard/graphql"; +import { getUserInitials, getUserName } from "@dashboard/misc"; +import { staffMemberDetailsUrl } from "@dashboard/staff/urls"; import { FormControlLabel, Switch } from "@material-ui/core"; -import { UserFragment } from "@saleor/graphql"; import { UserChipMenu, UserChipMenuItem } from "@saleor/macaw-ui"; -import { getUserInitials, getUserName } from "@saleor/misc"; -import { staffMemberDetailsUrl } from "@saleor/staff/urls"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; import { Link } from "react-router-dom"; diff --git a/src/components/VisibilityCard/VisibilityCard.tsx b/src/components/VisibilityCard/VisibilityCard.tsx index d47ec7c43..2bb1fc54a 100644 --- a/src/components/VisibilityCard/VisibilityCard.tsx +++ b/src/components/VisibilityCard/VisibilityCard.tsx @@ -1,14 +1,14 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import ControlledCheckbox from "@dashboard/components/ControlledCheckbox"; +import Hr from "@dashboard/components/Hr"; +import RadioSwitchField from "@dashboard/components/RadioSwitchField"; +import useCurrentDate from "@dashboard/hooks/useCurrentDate"; +import useDateLocalize from "@dashboard/hooks/useDateLocalize"; +import { ChangeEvent } from "@dashboard/hooks/useForm"; +import { UserError } from "@dashboard/types"; +import { getFieldError } from "@dashboard/utils/errors"; import { Card, CardContent, TextField, Typography } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; -import Hr from "@saleor/components/Hr"; -import RadioSwitchField from "@saleor/components/RadioSwitchField"; -import useCurrentDate from "@saleor/hooks/useCurrentDate"; -import useDateLocalize from "@saleor/hooks/useDateLocalize"; -import { ChangeEvent } from "@saleor/hooks/useForm"; import { makeStyles } from "@saleor/macaw-ui"; -import { UserError } from "@saleor/types"; -import { getFieldError } from "@saleor/utils/errors"; import clsx from "clsx"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/components/WindowTitle/index.tsx b/src/components/WindowTitle/index.tsx index 12f3a1041..e96514ca5 100644 --- a/src/components/WindowTitle/index.tsx +++ b/src/components/WindowTitle/index.tsx @@ -1,4 +1,4 @@ -import useShop from "@saleor/hooks/useShop"; +import useShop from "@dashboard/hooks/useShop"; import React from "react"; import { Helmet } from "react-helmet"; diff --git a/src/components/messages/MessageManagerProvider.tsx b/src/components/messages/MessageManagerProvider.tsx index 6c49b1c18..933bdf12d 100644 --- a/src/components/messages/MessageManagerProvider.tsx +++ b/src/components/messages/MessageManagerProvider.tsx @@ -1,5 +1,5 @@ -import { DEFAULT_NOTIFICATION_SHOW_TIME } from "@saleor/config"; -import { commonMessages } from "@saleor/intl"; +import { DEFAULT_NOTIFICATION_SHOW_TIME } from "@dashboard/config"; +import { commonMessages } from "@dashboard/intl"; import { Notification } from "@saleor/macaw-ui"; import React, { useCallback, useEffect, useRef, useState } from "react"; import { useIntl } from "react-intl"; diff --git a/src/configuration/ConfigurationPage.stories.tsx b/src/configuration/ConfigurationPage.stories.tsx index 0a02cdcff..766f5f1c1 100644 --- a/src/configuration/ConfigurationPage.stories.tsx +++ b/src/configuration/ConfigurationPage.stories.tsx @@ -1,7 +1,7 @@ -import { createConfigurationMenu } from "@saleor/configuration"; -import { UserFragment } from "@saleor/graphql"; -import { staffMember } from "@saleor/staff/fixtures"; -import Decorator from "@saleor/storybook/Decorator"; +import { createConfigurationMenu } from "@dashboard/configuration"; +import { UserFragment } from "@dashboard/graphql"; +import { staffMember } from "@dashboard/staff/fixtures"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/configuration/ConfigurationPage.tsx b/src/configuration/ConfigurationPage.tsx index b14e44615..e6eb467ee 100644 --- a/src/configuration/ConfigurationPage.tsx +++ b/src/configuration/ConfigurationPage.tsx @@ -1,8 +1,8 @@ +import { UserFragment } from "@dashboard/graphql"; +import { sectionNames } from "@dashboard/intl"; import { Typography } from "@material-ui/core"; import { useTheme } from "@material-ui/core/styles"; import useMediaQuery from "@material-ui/core/useMediaQuery"; -import { UserFragment } from "@saleor/graphql"; -import { sectionNames } from "@saleor/intl"; import { makeStyles, NavigationCard } from "@saleor/macaw-ui"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/configuration/index.tsx b/src/configuration/index.tsx index c4b34cff2..63a835cfd 100644 --- a/src/configuration/index.tsx +++ b/src/configuration/index.tsx @@ -1,36 +1,36 @@ -import { attributeListUrl } from "@saleor/attributes/urls"; -import { useUser } from "@saleor/auth"; -import { channelsListUrl } from "@saleor/channels/urls"; -import { WindowTitle } from "@saleor/components/WindowTitle"; -import { APP_VERSION as dashboardVersion } from "@saleor/config"; -import { CustomAppUrls } from "@saleor/custom-apps/urls"; -import { PermissionEnum } from "@saleor/graphql"; -import useShop from "@saleor/hooks/useShop"; -import Attributes from "@saleor/icons/Attributes"; -import Channels from "@saleor/icons/Channels"; -import Miscellaneous from "@saleor/icons/Miscellaneous"; -import Navigation from "@saleor/icons/Navigation"; -import PageTypes from "@saleor/icons/PageTypes"; -import PermissionGroups from "@saleor/icons/PermissionGroups"; -import Plugins from "@saleor/icons/Plugins"; -import ProductTypes from "@saleor/icons/ProductTypes"; -import ShippingMethods from "@saleor/icons/ShippingMethods"; -import SiteSettings from "@saleor/icons/SiteSettings"; -import StaffMembers from "@saleor/icons/StaffMembers"; -import Taxes from "@saleor/icons/Taxes"; -import Warehouses from "@saleor/icons/Warehouses"; -import { sectionNames } from "@saleor/intl"; -import { maybe } from "@saleor/misc"; -import { menuListUrl } from "@saleor/navigation/urls"; -import { pageTypeListUrl } from "@saleor/pageTypes/urls"; -import { permissionGroupListUrl } from "@saleor/permissionGroups/urls"; -import { pluginListUrl } from "@saleor/plugins/urls"; -import { productTypeListUrl } from "@saleor/productTypes/urls"; -import { shippingZonesListUrl } from "@saleor/shipping/urls"; -import { siteSettingsUrl } from "@saleor/siteSettings/urls"; -import { staffListUrl } from "@saleor/staff/urls"; -import { taxConfigurationListUrl } from "@saleor/taxes/urls"; -import { warehouseSection } from "@saleor/warehouses/urls"; +import { attributeListUrl } from "@dashboard/attributes/urls"; +import { useUser } from "@dashboard/auth"; +import { channelsListUrl } from "@dashboard/channels/urls"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; +import { APP_VERSION as dashboardVersion } from "@dashboard/config"; +import { CustomAppUrls } from "@dashboard/custom-apps/urls"; +import { PermissionEnum } from "@dashboard/graphql"; +import useShop from "@dashboard/hooks/useShop"; +import Attributes from "@dashboard/icons/Attributes"; +import Channels from "@dashboard/icons/Channels"; +import Miscellaneous from "@dashboard/icons/Miscellaneous"; +import Navigation from "@dashboard/icons/Navigation"; +import PageTypes from "@dashboard/icons/PageTypes"; +import PermissionGroups from "@dashboard/icons/PermissionGroups"; +import Plugins from "@dashboard/icons/Plugins"; +import ProductTypes from "@dashboard/icons/ProductTypes"; +import ShippingMethods from "@dashboard/icons/ShippingMethods"; +import SiteSettings from "@dashboard/icons/SiteSettings"; +import StaffMembers from "@dashboard/icons/StaffMembers"; +import Taxes from "@dashboard/icons/Taxes"; +import Warehouses from "@dashboard/icons/Warehouses"; +import { sectionNames } from "@dashboard/intl"; +import { maybe } from "@dashboard/misc"; +import { menuListUrl } from "@dashboard/navigation/urls"; +import { pageTypeListUrl } from "@dashboard/pageTypes/urls"; +import { permissionGroupListUrl } from "@dashboard/permissionGroups/urls"; +import { pluginListUrl } from "@dashboard/plugins/urls"; +import { productTypeListUrl } from "@dashboard/productTypes/urls"; +import { shippingZonesListUrl } from "@dashboard/shipping/urls"; +import { siteSettingsUrl } from "@dashboard/siteSettings/urls"; +import { staffListUrl } from "@dashboard/staff/urls"; +import { taxConfigurationListUrl } from "@dashboard/taxes/urls"; +import { warehouseSection } from "@dashboard/warehouses/urls"; import React from "react"; import { IntlShape, useIntl } from "react-intl"; diff --git a/src/configuration/types.ts b/src/configuration/types.ts index 74f5ce8b4..9eb2fa509 100644 --- a/src/configuration/types.ts +++ b/src/configuration/types.ts @@ -1,5 +1,5 @@ +import { PermissionEnum } from "@dashboard/graphql"; import { IconProps } from "@material-ui/core"; -import { PermissionEnum } from "@saleor/graphql"; export interface MenuItem { description: string; diff --git a/src/configuration/utils.ts b/src/configuration/utils.ts index c3232b533..96352b8e1 100644 --- a/src/configuration/utils.ts +++ b/src/configuration/utils.ts @@ -1,5 +1,5 @@ -import { hasAnyPermissions } from "@saleor/auth/misc"; -import { PermissionEnum, UserFragment } from "@saleor/graphql"; +import { hasAnyPermissions } from "@dashboard/auth/misc"; +import { PermissionEnum, UserFragment } from "@dashboard/graphql"; import { IntlShape } from "react-intl"; import { createConfigurationMenu } from "."; diff --git a/src/containers/BackgroundTasks/BackgroundTasksProvider.test.tsx b/src/containers/BackgroundTasks/BackgroundTasksProvider.test.tsx index 0cef5417c..fdcad1c09 100644 --- a/src/containers/BackgroundTasks/BackgroundTasksProvider.test.tsx +++ b/src/containers/BackgroundTasks/BackgroundTasksProvider.test.tsx @@ -1,5 +1,5 @@ import { createMockClient } from "@apollo/client/testing"; -import { JobStatusEnum } from "@saleor/graphql"; +import { JobStatusEnum } from "@dashboard/graphql"; import { renderHook } from "@testing-library/react-hooks"; import { diff --git a/src/containers/BackgroundTasks/BackgroundTasksProvider.tsx b/src/containers/BackgroundTasks/BackgroundTasksProvider.tsx index caf2be8c9..4de5ed306 100644 --- a/src/containers/BackgroundTasks/BackgroundTasksProvider.tsx +++ b/src/containers/BackgroundTasks/BackgroundTasksProvider.tsx @@ -1,6 +1,6 @@ import { ApolloClient, useApolloClient } from "@apollo/client"; -import { IMessageContext } from "@saleor/components/messages"; -import useNotifier from "@saleor/hooks/useNotifier"; +import { IMessageContext } from "@dashboard/components/messages"; +import useNotifier from "@dashboard/hooks/useNotifier"; import React from "react"; import { IntlShape, useIntl } from "react-intl"; diff --git a/src/containers/BackgroundTasks/tasks.ts b/src/containers/BackgroundTasks/tasks.ts index 2a1daae79..098137585 100644 --- a/src/containers/BackgroundTasks/tasks.ts +++ b/src/containers/BackgroundTasks/tasks.ts @@ -1,11 +1,11 @@ import { ApolloQueryResult } from "@apollo/client"; -import { IMessageContext } from "@saleor/components/messages"; +import { IMessageContext } from "@dashboard/components/messages"; import { CheckExportFileStatusQuery, CheckOrderInvoicesStatusQuery, JobStatusEnum, -} from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; +} from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; import { IntlShape } from "react-intl"; import messages from "./messages"; diff --git a/src/containers/ServiceWorker/ServiceWorker.tsx b/src/containers/ServiceWorker/ServiceWorker.tsx index e1b9e78c1..5a7f5c29a 100644 --- a/src/containers/ServiceWorker/ServiceWorker.tsx +++ b/src/containers/ServiceWorker/ServiceWorker.tsx @@ -1,5 +1,5 @@ -import { SW_INTERVAL } from "@saleor/config"; -import useNotifier from "@saleor/hooks/useNotifier"; +import { SW_INTERVAL } from "@dashboard/config"; +import useNotifier from "@dashboard/hooks/useNotifier"; import React from "react"; import { useIntl } from "react-intl"; import { useServiceWorker } from "src/hooks/useServiceWorker"; diff --git a/src/custom-apps/components/CustomAppCreatePage/CustomAppCreatePage.tsx b/src/custom-apps/components/CustomAppCreatePage/CustomAppCreatePage.tsx index 2a6cbf314..ab99202a2 100644 --- a/src/custom-apps/components/CustomAppCreatePage/CustomAppCreatePage.tsx +++ b/src/custom-apps/components/CustomAppCreatePage/CustomAppCreatePage.tsx @@ -1,22 +1,22 @@ -import AccountPermissions from "@saleor/components/AccountPermissions"; -import { Backlink } from "@saleor/components/Backlink"; -import Container from "@saleor/components/Container"; -import Form from "@saleor/components/Form"; -import Grid from "@saleor/components/Grid"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; -import { CustomAppUrls } from "@saleor/custom-apps/urls"; +import AccountPermissions from "@dashboard/components/AccountPermissions"; +import { Backlink } from "@dashboard/components/Backlink"; +import Container from "@dashboard/components/Container"; +import Form from "@dashboard/components/Form"; +import Grid from "@dashboard/components/Grid"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; +import { CustomAppUrls } from "@dashboard/custom-apps/urls"; import { AppErrorFragment, PermissionEnum, PermissionFragment, -} from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { sectionNames } from "@saleor/intl"; +} from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { sectionNames } from "@dashboard/intl"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getAppErrorMessage from "@dashboard/utils/errors/app"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { getFormErrors } from "@saleor/utils/errors"; -import getAppErrorMessage from "@saleor/utils/errors/app"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/custom-apps/components/CustomAppDefaultToken/CustomAppDefaultToken.tsx b/src/custom-apps/components/CustomAppDefaultToken/CustomAppDefaultToken.tsx index 8ded3295d..0ff813ab4 100644 --- a/src/custom-apps/components/CustomAppDefaultToken/CustomAppDefaultToken.tsx +++ b/src/custom-apps/components/CustomAppDefaultToken/CustomAppDefaultToken.tsx @@ -1,8 +1,8 @@ +import { Button } from "@dashboard/components/Button"; +import Link from "@dashboard/components/Link"; +import useClipboard from "@dashboard/hooks/useClipboard"; import { Card, CardContent, Paper, Typography } from "@material-ui/core"; import CloseIcon from "@material-ui/icons/Close"; -import { Button } from "@saleor/components/Button"; -import Link from "@saleor/components/Link"; -import useClipboard from "@saleor/hooks/useClipboard"; import { IconButton } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/custom-apps/components/CustomAppDetailsPage/CustomAppDetailsPage.tsx b/src/custom-apps/components/CustomAppDetailsPage/CustomAppDetailsPage.tsx index d3de2b4a4..c99875ca7 100644 --- a/src/custom-apps/components/CustomAppDetailsPage/CustomAppDetailsPage.tsx +++ b/src/custom-apps/components/CustomAppDetailsPage/CustomAppDetailsPage.tsx @@ -1,25 +1,25 @@ -import AccountPermissions from "@saleor/components/AccountPermissions"; -import { Backlink } from "@saleor/components/Backlink"; -import CardSpacer from "@saleor/components/CardSpacer"; -import Container from "@saleor/components/Container"; -import Form from "@saleor/components/Form"; -import Grid from "@saleor/components/Grid"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; -import WebhooksList from "@saleor/custom-apps/components/WebhooksList"; -import { CustomAppUrls } from "@saleor/custom-apps/urls"; +import AccountPermissions from "@dashboard/components/AccountPermissions"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import Container from "@dashboard/components/Container"; +import Form from "@dashboard/components/Form"; +import Grid from "@dashboard/components/Grid"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; +import WebhooksList from "@dashboard/custom-apps/components/WebhooksList"; +import { CustomAppUrls } from "@dashboard/custom-apps/urls"; import { AppErrorFragment, AppUpdateMutation, PermissionEnum, ShopInfoQuery, -} from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { sectionNames } from "@saleor/intl"; +} from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { sectionNames } from "@dashboard/intl"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getAppErrorMessage from "@dashboard/utils/errors/app"; import { Button, ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { getFormErrors } from "@saleor/utils/errors"; -import getAppErrorMessage from "@saleor/utils/errors/app"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/custom-apps/components/CustomAppInformation/CustomAppInformation.tsx b/src/custom-apps/components/CustomAppInformation/CustomAppInformation.tsx index 210af82b6..37356d9ee 100644 --- a/src/custom-apps/components/CustomAppInformation/CustomAppInformation.tsx +++ b/src/custom-apps/components/CustomAppInformation/CustomAppInformation.tsx @@ -1,9 +1,9 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import { AppErrorFragment } from "@dashboard/graphql"; +import { FormChange } from "@dashboard/hooks/useForm"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getAppErrorMessage from "@dashboard/utils/errors/app"; import { Card, CardContent, TextField } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import { AppErrorFragment } from "@saleor/graphql"; -import { FormChange } from "@saleor/hooks/useForm"; -import { getFormErrors } from "@saleor/utils/errors"; -import getAppErrorMessage from "@saleor/utils/errors/app"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/custom-apps/components/CustomAppListPage/CustomAppListPage.tsx b/src/custom-apps/components/CustomAppListPage/CustomAppListPage.tsx index 1810c1db2..1e9410776 100644 --- a/src/custom-apps/components/CustomAppListPage/CustomAppListPage.tsx +++ b/src/custom-apps/components/CustomAppListPage/CustomAppListPage.tsx @@ -1,15 +1,15 @@ +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import Container from "@dashboard/components/Container"; +import PageHeader from "@dashboard/components/PageHeader"; +import { TableButtonWrapper } from "@dashboard/components/TableButtonWrapper/TableButtonWrapper"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { CustomAppUrls } from "@dashboard/custom-apps/urls"; +import { AppListItemFragment } from "@dashboard/graphql"; +import { commonMessages, sectionNames } from "@dashboard/intl"; +import { renderCollection } from "@dashboard/misc"; import { Card, TableBody, TableCell, Typography } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import Container from "@saleor/components/Container"; -import PageHeader from "@saleor/components/PageHeader"; -import { TableButtonWrapper } from "@saleor/components/TableButtonWrapper/TableButtonWrapper"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { CustomAppUrls } from "@saleor/custom-apps/urls"; -import { AppListItemFragment } from "@saleor/graphql"; -import { commonMessages, sectionNames } from "@saleor/intl"; import { DeleteIcon, IconButton, ResponsiveTable } from "@saleor/macaw-ui"; -import { renderCollection } from "@saleor/misc"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/custom-apps/components/CustomAppTokens/CustomAppTokens.tsx b/src/custom-apps/components/CustomAppTokens/CustomAppTokens.tsx index db5577c7f..fd60661b1 100644 --- a/src/custom-apps/components/CustomAppTokens/CustomAppTokens.tsx +++ b/src/custom-apps/components/CustomAppTokens/CustomAppTokens.tsx @@ -1,12 +1,12 @@ +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { AppUpdateMutation } from "@dashboard/graphql"; +import { renderCollection } from "@dashboard/misc"; import { Card, TableBody, TableCell, TableHead } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { AppUpdateMutation } from "@saleor/graphql"; import { DeleteIcon, IconButton } from "@saleor/macaw-ui"; -import { renderCollection } from "@saleor/misc"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/custom-apps/components/TokenCreateDialog/TokenCreateDialog.tsx b/src/custom-apps/components/TokenCreateDialog/TokenCreateDialog.tsx index 2471a9848..227fe83c0 100644 --- a/src/custom-apps/components/TokenCreateDialog/TokenCreateDialog.tsx +++ b/src/custom-apps/components/TokenCreateDialog/TokenCreateDialog.tsx @@ -1,3 +1,12 @@ +import BackButton from "@dashboard/components/BackButton"; +import { Button } from "@dashboard/components/Button"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import Form from "@dashboard/components/Form"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useModalDialogOpen from "@dashboard/hooks/useModalDialogOpen"; +import { buttonMessages } from "@dashboard/intl"; import { Dialog, DialogActions, @@ -7,15 +16,6 @@ import { TextField, Typography, } from "@material-ui/core"; -import BackButton from "@saleor/components/BackButton"; -import { Button } from "@saleor/components/Button"; -import CardSpacer from "@saleor/components/CardSpacer"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import Form from "@saleor/components/Form"; -import FormSpacer from "@saleor/components/FormSpacer"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useModalDialogOpen from "@saleor/hooks/useModalDialogOpen"; -import { buttonMessages } from "@saleor/intl"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/custom-apps/components/TokenDeleteDialog/TokenDeleteDialog.tsx b/src/custom-apps/components/TokenDeleteDialog/TokenDeleteDialog.tsx index 40082c958..0fc480d6e 100644 --- a/src/custom-apps/components/TokenDeleteDialog/TokenDeleteDialog.tsx +++ b/src/custom-apps/components/TokenDeleteDialog/TokenDeleteDialog.tsx @@ -1,5 +1,5 @@ +import ActionDialog from "@dashboard/components/ActionDialog"; import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/custom-apps/components/WebhookDeleteDialog/WebhookDeleteDialog.tsx b/src/custom-apps/components/WebhookDeleteDialog/WebhookDeleteDialog.tsx index b5550526d..54d490542 100644 --- a/src/custom-apps/components/WebhookDeleteDialog/WebhookDeleteDialog.tsx +++ b/src/custom-apps/components/WebhookDeleteDialog/WebhookDeleteDialog.tsx @@ -1,5 +1,5 @@ +import ActionDialog from "@dashboard/components/ActionDialog"; import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/custom-apps/components/WebhookDetailsPage/WebhookDetailsPage.stories.tsx b/src/custom-apps/components/WebhookDetailsPage/WebhookDetailsPage.stories.tsx index 1b88c99dd..934112d53 100644 --- a/src/custom-apps/components/WebhookDetailsPage/WebhookDetailsPage.stories.tsx +++ b/src/custom-apps/components/WebhookDetailsPage/WebhookDetailsPage.stories.tsx @@ -1,5 +1,5 @@ -import { WebhookErrorCode } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; +import { WebhookErrorCode } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/custom-apps/components/WebhookDetailsPage/WebhookDetailsPage.tsx b/src/custom-apps/components/WebhookDetailsPage/WebhookDetailsPage.tsx index 6041851cd..adc5fdec3 100644 --- a/src/custom-apps/components/WebhookDetailsPage/WebhookDetailsPage.tsx +++ b/src/custom-apps/components/WebhookDetailsPage/WebhookDetailsPage.tsx @@ -1,30 +1,30 @@ -import { Backlink } from "@saleor/components/Backlink"; -import Container from "@saleor/components/Container"; -import Form from "@saleor/components/Form"; -import FormSpacer from "@saleor/components/FormSpacer"; -import Grid from "@saleor/components/Grid"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; -import WebhookEvents from "@saleor/custom-apps/components/WebhookEvents"; -import WebhookInfo from "@saleor/custom-apps/components/WebhookInfo"; -import WebhookStatus from "@saleor/custom-apps/components/WebhookStatus"; +import { Backlink } from "@dashboard/components/Backlink"; +import Container from "@dashboard/components/Container"; +import Form from "@dashboard/components/Form"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import Grid from "@dashboard/components/Grid"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; +import WebhookEvents from "@dashboard/custom-apps/components/WebhookEvents"; +import WebhookInfo from "@dashboard/custom-apps/components/WebhookInfo"; +import WebhookStatus from "@dashboard/custom-apps/components/WebhookStatus"; import { createAsyncEventsSelectHandler, createSyncEventsSelectHandler, -} from "@saleor/custom-apps/handlers"; -import { CustomAppUrls } from "@saleor/custom-apps/urls"; +} from "@dashboard/custom-apps/handlers"; +import { CustomAppUrls } from "@dashboard/custom-apps/urls"; import { mapAsyncEventsToChoices, mapSyncEventsToChoices, -} from "@saleor/custom-apps/utils"; +} from "@dashboard/custom-apps/utils"; import { WebhookDetailsFragment, WebhookErrorFragment, WebhookEventTypeAsyncEnum, WebhookEventTypeSyncEnum, -} from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; +} from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/custom-apps/components/WebhookDetailsPage/messages.ts b/src/custom-apps/components/WebhookDetailsPage/messages.ts index fdb486afd..9c8395317 100644 --- a/src/custom-apps/components/WebhookDetailsPage/messages.ts +++ b/src/custom-apps/components/WebhookDetailsPage/messages.ts @@ -1,6 +1,6 @@ -import { isUnnamed } from "@saleor/custom-apps/utils"; -import { WebhookDetailsQuery } from "@saleor/graphql"; -import { getStringOrPlaceholder } from "@saleor/misc"; +import { isUnnamed } from "@dashboard/custom-apps/utils"; +import { WebhookDetailsQuery } from "@dashboard/graphql"; +import { getStringOrPlaceholder } from "@dashboard/misc"; import { defineMessages, IntlShape } from "react-intl"; export const messages = defineMessages({ diff --git a/src/custom-apps/components/WebhookEvents/WebhookEvents.tsx b/src/custom-apps/components/WebhookEvents/WebhookEvents.tsx index 06a194d27..e832261ea 100644 --- a/src/custom-apps/components/WebhookEvents/WebhookEvents.tsx +++ b/src/custom-apps/components/WebhookEvents/WebhookEvents.tsx @@ -1,19 +1,19 @@ -import { Card, CardContent, Typography } from "@material-ui/core"; -import VerticalSpacer from "@saleor/apps/components/VerticalSpacer"; -import CardTitle from "@saleor/components/CardTitle"; -import Hr from "@saleor/components/Hr"; +import VerticalSpacer from "@dashboard/apps/components/VerticalSpacer"; +import CardTitle from "@dashboard/components/CardTitle"; +import Hr from "@dashboard/components/Hr"; import MultiAutocompleteSelectField, { MultiAutocompleteChoiceType, -} from "@saleor/components/MultiAutocompleteSelectField"; +} from "@dashboard/components/MultiAutocompleteSelectField"; import { mapAsyncEventsToChoices, mapSyncEventsToChoices, -} from "@saleor/custom-apps/utils"; +} from "@dashboard/custom-apps/utils"; import { WebhookEventTypeAsyncEnum, WebhookEventTypeSyncEnum, -} from "@saleor/graphql"; -import { ChangeEvent } from "@saleor/hooks/useForm"; +} from "@dashboard/graphql"; +import { ChangeEvent } from "@dashboard/hooks/useForm"; +import { Card, CardContent, Typography } from "@material-ui/core"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/custom-apps/components/WebhookInfo/WebhookInfo.tsx b/src/custom-apps/components/WebhookInfo/WebhookInfo.tsx index e57349dd8..180d64860 100644 --- a/src/custom-apps/components/WebhookInfo/WebhookInfo.tsx +++ b/src/custom-apps/components/WebhookInfo/WebhookInfo.tsx @@ -1,3 +1,11 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import Hr from "@dashboard/components/Hr"; +import Link from "@dashboard/components/Link"; +import { WebhookErrorFragment } from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getWebhookErrorMessage from "@dashboard/utils/errors/webhooks"; import { Card, CardContent, @@ -5,15 +13,7 @@ import { TextField, Typography, } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import FormSpacer from "@saleor/components/FormSpacer"; -import Hr from "@saleor/components/Hr"; -import Link from "@saleor/components/Link"; -import { WebhookErrorFragment } from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; import { Pill } from "@saleor/macaw-ui"; -import { getFormErrors } from "@saleor/utils/errors"; -import getWebhookErrorMessage from "@saleor/utils/errors/webhooks"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/custom-apps/components/WebhookStatus/WebhookStatus.tsx b/src/custom-apps/components/WebhookStatus/WebhookStatus.tsx index f9cf4b3c5..a6499d458 100644 --- a/src/custom-apps/components/WebhookStatus/WebhookStatus.tsx +++ b/src/custom-apps/components/WebhookStatus/WebhookStatus.tsx @@ -1,7 +1,7 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import ControlledCheckbox from "@dashboard/components/ControlledCheckbox"; +import { ChangeEvent } from "@dashboard/hooks/useForm"; import { Card, CardContent, Typography } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; -import { ChangeEvent } from "@saleor/hooks/useForm"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/custom-apps/components/WebhooksList/WebhooksList.tsx b/src/custom-apps/components/WebhooksList/WebhooksList.tsx index 3328d8178..e41ae6124 100644 --- a/src/custom-apps/components/WebhooksList/WebhooksList.tsx +++ b/src/custom-apps/components/WebhooksList/WebhooksList.tsx @@ -1,21 +1,21 @@ -import { Card, TableBody, TableCell, TableHead } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import { TableButtonWrapper } from "@saleor/components/TableButtonWrapper/TableButtonWrapper"; -import TableCellHeader from "@saleor/components/TableCellHeader"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { CustomAppUrls } from "@saleor/custom-apps/urls"; -import { isUnnamed } from "@saleor/custom-apps/utils"; -import { WebhookFragment } from "@saleor/graphql"; +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import { TableButtonWrapper } from "@dashboard/components/TableButtonWrapper/TableButtonWrapper"; +import TableCellHeader from "@dashboard/components/TableCellHeader"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { CustomAppUrls } from "@dashboard/custom-apps/urls"; +import { isUnnamed } from "@dashboard/custom-apps/utils"; +import { WebhookFragment } from "@dashboard/graphql"; import { commonMessages, commonStatusMessages, sectionNames, -} from "@saleor/intl"; +} from "@dashboard/intl"; +import { renderCollection, stopPropagation } from "@dashboard/misc"; +import { Card, TableBody, TableCell, TableHead } from "@material-ui/core"; import { DeleteIcon, IconButton, Pill } from "@saleor/macaw-ui"; -import { renderCollection, stopPropagation } from "@saleor/misc"; import clsx from "clsx"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/custom-apps/fixtures.ts b/src/custom-apps/fixtures.ts index 60407ca91..decb995e7 100644 --- a/src/custom-apps/fixtures.ts +++ b/src/custom-apps/fixtures.ts @@ -1,4 +1,4 @@ -import { WebhookDetailsFragment } from "@saleor/graphql"; +import { WebhookDetailsFragment } from "@dashboard/graphql"; export const webhook: WebhookDetailsFragment = { __typename: "Webhook", diff --git a/src/custom-apps/handlers.ts b/src/custom-apps/handlers.ts index 666c876ac..1bde84949 100644 --- a/src/custom-apps/handlers.ts +++ b/src/custom-apps/handlers.ts @@ -1,9 +1,9 @@ import { WebhookEventTypeAsyncEnum, WebhookEventTypeSyncEnum, -} from "@saleor/graphql"; -import { ChangeEvent } from "@saleor/hooks/useForm"; -import { toggle } from "@saleor/utils/lists"; +} from "@dashboard/graphql"; +import { ChangeEvent } from "@dashboard/hooks/useForm"; +import { toggle } from "@dashboard/utils/lists"; import { filterSelectedAsyncEvents } from "./utils"; diff --git a/src/custom-apps/index.tsx b/src/custom-apps/index.tsx index 005b69893..9dd286500 100644 --- a/src/custom-apps/index.tsx +++ b/src/custom-apps/index.tsx @@ -1,5 +1,5 @@ -import { WindowTitle } from "@saleor/components/WindowTitle"; -import { sectionNames } from "@saleor/intl"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; +import { sectionNames } from "@dashboard/intl"; import { parse as parseQs } from "qs"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/custom-apps/urls.ts b/src/custom-apps/urls.ts index 2d103308f..bcbd337e9 100644 --- a/src/custom-apps/urls.ts +++ b/src/custom-apps/urls.ts @@ -1,4 +1,4 @@ -import { stringifyQs } from "@saleor/utils/urls"; +import { stringifyQs } from "@dashboard/utils/urls"; import urlJoin from "url-join"; import { Dialog, SingleAction } from "../types"; diff --git a/src/custom-apps/utils.test.ts b/src/custom-apps/utils.test.ts index 56593ed6e..3a8db0624 100644 --- a/src/custom-apps/utils.test.ts +++ b/src/custom-apps/utils.test.ts @@ -1,5 +1,5 @@ -import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField"; -import { WebhookEventTypeAsyncEnum } from "@saleor/graphql"; +import { MultiAutocompleteChoiceType } from "@dashboard/components/MultiAutocompleteSelectField"; +import { WebhookEventTypeAsyncEnum } from "@dashboard/graphql"; import { filterSelectedAsyncEvents, mapAsyncEventsToChoices } from "./utils"; diff --git a/src/custom-apps/utils.tsx b/src/custom-apps/utils.tsx index 395ef7d94..11c76555d 100644 --- a/src/custom-apps/utils.tsx +++ b/src/custom-apps/utils.tsx @@ -1,10 +1,10 @@ -import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField"; -import PreviewPill from "@saleor/components/PreviewPill"; +import { MultiAutocompleteChoiceType } from "@dashboard/components/MultiAutocompleteSelectField"; +import PreviewPill from "@dashboard/components/PreviewPill"; import { WebhookEventTypeAsyncEnum, WebhookEventTypeSyncEnum, WebhookFragment, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import React from "react"; export function isUnnamed(webhook: WebhookFragment | undefined): boolean { diff --git a/src/custom-apps/views/CustomAppCreate/CustomAppCreate.tsx b/src/custom-apps/views/CustomAppCreate/CustomAppCreate.tsx index 42b64ed95..3392e2624 100644 --- a/src/custom-apps/views/CustomAppCreate/CustomAppCreate.tsx +++ b/src/custom-apps/views/CustomAppCreate/CustomAppCreate.tsx @@ -1,11 +1,11 @@ -import { WindowTitle } from "@saleor/components/WindowTitle"; -import { CustomAppUrls } from "@saleor/custom-apps/urls"; -import { AppCreateMutation, useAppCreateMutation } from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import useShop from "@saleor/hooks/useShop"; -import { commonMessages } from "@saleor/intl"; -import { extractMutationErrors } from "@saleor/misc"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; +import { CustomAppUrls } from "@dashboard/custom-apps/urls"; +import { AppCreateMutation, useAppCreateMutation } from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import useShop from "@dashboard/hooks/useShop"; +import { commonMessages } from "@dashboard/intl"; +import { extractMutationErrors } from "@dashboard/misc"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/custom-apps/views/CustomAppDetails/CustomAppDetails.tsx b/src/custom-apps/views/CustomAppDetails/CustomAppDetails.tsx index 0783b8bf3..6cb10534a 100644 --- a/src/custom-apps/views/CustomAppDetails/CustomAppDetails.tsx +++ b/src/custom-apps/views/CustomAppDetails/CustomAppDetails.tsx @@ -1,13 +1,13 @@ -import AppActivateDialog from "@saleor/apps/components/AppActivateDialog"; -import AppDeactivateDialog from "@saleor/apps/components/AppDeactivateDialog"; -import { appMessages } from "@saleor/apps/messages"; -import NotFoundPage from "@saleor/components/NotFoundPage"; -import { WindowTitle } from "@saleor/components/WindowTitle"; -import { getApiUrl } from "@saleor/config"; -import TokenCreateDialog from "@saleor/custom-apps/components/TokenCreateDialog"; -import TokenDeleteDialog from "@saleor/custom-apps/components/TokenDeleteDialog"; -import WebhookDeleteDialog from "@saleor/custom-apps/components/WebhookDeleteDialog"; -import { CustomAppUrls } from "@saleor/custom-apps/urls"; +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"; +import TokenCreateDialog from "@dashboard/custom-apps/components/TokenCreateDialog"; +import TokenDeleteDialog from "@dashboard/custom-apps/components/TokenDeleteDialog"; +import WebhookDeleteDialog from "@dashboard/custom-apps/components/WebhookDeleteDialog"; +import { CustomAppUrls } from "@dashboard/custom-apps/urls"; import { AppTokenCreateMutation, AppTokenDeleteMutation, @@ -20,14 +20,14 @@ import { useAppUpdateMutation, useWebhookDeleteMutation, WebhookDeleteMutation, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import useShop from "@saleor/hooks/useShop"; -import { commonMessages } from "@saleor/intl"; -import { extractMutationErrors, getStringOrPlaceholder } from "@saleor/misc"; -import getAppErrorMessage from "@saleor/utils/errors/app"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import useShop from "@dashboard/hooks/useShop"; +import { commonMessages } from "@dashboard/intl"; +import { extractMutationErrors, getStringOrPlaceholder } from "@dashboard/misc"; +import getAppErrorMessage from "@dashboard/utils/errors/app"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/custom-apps/views/CustomAppList.tsx b/src/custom-apps/views/CustomAppList.tsx index 1b73793cb..b418053b8 100644 --- a/src/custom-apps/views/CustomAppList.tsx +++ b/src/custom-apps/views/CustomAppList.tsx @@ -1,20 +1,20 @@ import { useApolloClient } from "@apollo/client"; -import AppDeleteDialog from "@saleor/apps/components/AppDeleteDialog"; -import { EXTENSION_LIST_QUERY } from "@saleor/apps/queries"; -import { WindowTitle } from "@saleor/components/WindowTitle"; +import AppDeleteDialog from "@dashboard/apps/components/AppDeleteDialog"; +import { EXTENSION_LIST_QUERY } from "@dashboard/apps/queries"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; import { AppSortField, AppTypeEnum, OrderDirection, useAppDeleteMutation, useAppsListQuery, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { sectionNames } from "@saleor/intl"; -import { findById } from "@saleor/misc"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { sectionNames } from "@dashboard/intl"; +import { findById } from "@dashboard/misc"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/custom-apps/views/CustomAppWebhookCreate.tsx b/src/custom-apps/views/CustomAppWebhookCreate.tsx index c660ada75..8a04babfe 100644 --- a/src/custom-apps/views/CustomAppWebhookCreate.tsx +++ b/src/custom-apps/views/CustomAppWebhookCreate.tsx @@ -1,13 +1,13 @@ -import { WindowTitle } from "@saleor/components/WindowTitle"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; import { useAppQuery, useWebhookCreateMutation, WebhookEventTypeAsyncEnum, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { commonMessages } from "@saleor/intl"; -import { extractMutationErrors } from "@saleor/misc"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { commonMessages } from "@dashboard/intl"; +import { extractMutationErrors } from "@dashboard/misc"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/custom-apps/views/CustomAppWebhookDetails.tsx b/src/custom-apps/views/CustomAppWebhookDetails.tsx index 7c66a19ca..7b0b68170 100644 --- a/src/custom-apps/views/CustomAppWebhookDetails.tsx +++ b/src/custom-apps/views/CustomAppWebhookDetails.tsx @@ -1,12 +1,12 @@ -import NotFoundPage from "@saleor/components/NotFoundPage"; -import { WindowTitle } from "@saleor/components/WindowTitle"; +import NotFoundPage from "@dashboard/components/NotFoundPage"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; import { useWebhookDetailsQuery, useWebhookUpdateMutation, WebhookEventTypeAsyncEnum, -} from "@saleor/graphql"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { commonMessages } from "@saleor/intl"; +} from "@dashboard/graphql"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { commonMessages } from "@dashboard/intl"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/customers/components/CustomerAddress/CustomerAddress.tsx b/src/customers/components/CustomerAddress/CustomerAddress.tsx index e4c6a97be..0ccc5625b 100644 --- a/src/customers/components/CustomerAddress/CustomerAddress.tsx +++ b/src/customers/components/CustomerAddress/CustomerAddress.tsx @@ -1,9 +1,9 @@ +import AddressFormatter from "@dashboard/components/AddressFormatter"; +import CardMenu from "@dashboard/components/CardMenu"; +import CardTitle from "@dashboard/components/CardTitle"; +import Skeleton from "@dashboard/components/Skeleton"; +import { AddressFragment, AddressTypeEnum } from "@dashboard/graphql"; import { Card, CardContent } from "@material-ui/core"; -import AddressFormatter from "@saleor/components/AddressFormatter"; -import CardMenu from "@saleor/components/CardMenu"; -import CardTitle from "@saleor/components/CardTitle"; -import Skeleton from "@saleor/components/Skeleton"; -import { AddressFragment, AddressTypeEnum } from "@saleor/graphql"; import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; import { defineMessages, useIntl } from "react-intl"; diff --git a/src/customers/components/CustomerAddressChoiceCard/CustomerAddressChoiceCard.tsx b/src/customers/components/CustomerAddressChoiceCard/CustomerAddressChoiceCard.tsx index d5ede7ea6..60689bcd7 100644 --- a/src/customers/components/CustomerAddressChoiceCard/CustomerAddressChoiceCard.tsx +++ b/src/customers/components/CustomerAddressChoiceCard/CustomerAddressChoiceCard.tsx @@ -1,7 +1,7 @@ +import AddressFormatter from "@dashboard/components/AddressFormatter"; +import { AddressFragment } from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; import { Card, CardContent, Typography } from "@material-ui/core"; -import AddressFormatter from "@saleor/components/AddressFormatter"; -import { AddressFragment } from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; import { EditIcon } from "@saleor/macaw-ui"; import clsx from "clsx"; import React from "react"; diff --git a/src/customers/components/CustomerAddressDialog/CustomerAddressDialog.tsx b/src/customers/components/CustomerAddressDialog/CustomerAddressDialog.tsx index bd0297633..980b4e505 100644 --- a/src/customers/components/CustomerAddressDialog/CustomerAddressDialog.tsx +++ b/src/customers/components/CustomerAddressDialog/CustomerAddressDialog.tsx @@ -1,27 +1,27 @@ +import AddressEdit from "@dashboard/components/AddressEdit"; +import { createCountryHandler } from "@dashboard/components/AddressEdit/createCountryHandler"; +import BackButton from "@dashboard/components/BackButton"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import Form from "@dashboard/components/Form"; +import { + AccountErrorFragment, + AddressFragment, + AddressInput, + CountryWithCodeFragment, +} from "@dashboard/graphql"; +import useAddressValidation from "@dashboard/hooks/useAddressValidation"; +import useModalDialogErrors from "@dashboard/hooks/useModalDialogErrors"; +import useStateFromProps from "@dashboard/hooks/useStateFromProps"; +import { buttonMessages } from "@dashboard/intl"; +import createSingleAutocompleteSelectHandler from "@dashboard/utils/handlers/singleAutocompleteSelectChangeHandler"; +import { mapCountriesToChoices } from "@dashboard/utils/maps"; import { Dialog, DialogActions, DialogContent, DialogTitle, } from "@material-ui/core"; -import AddressEdit from "@saleor/components/AddressEdit"; -import { createCountryHandler } from "@saleor/components/AddressEdit/createCountryHandler"; -import BackButton from "@saleor/components/BackButton"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import Form from "@saleor/components/Form"; -import { - AccountErrorFragment, - AddressFragment, - AddressInput, - CountryWithCodeFragment, -} from "@saleor/graphql"; -import useAddressValidation from "@saleor/hooks/useAddressValidation"; -import useModalDialogErrors from "@saleor/hooks/useModalDialogErrors"; -import useStateFromProps from "@saleor/hooks/useStateFromProps"; -import { buttonMessages } from "@saleor/intl"; import { ConfirmButtonTransitionState, makeStyles } from "@saleor/macaw-ui"; -import createSingleAutocompleteSelectHandler from "@saleor/utils/handlers/singleAutocompleteSelectChangeHandler"; -import { mapCountriesToChoices } from "@saleor/utils/maps"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/customers/components/CustomerAddressListPage/CustomerAddressListPage.stories.tsx b/src/customers/components/CustomerAddressListPage/CustomerAddressListPage.stories.tsx index 986c00d3d..2d41d57be 100644 --- a/src/customers/components/CustomerAddressListPage/CustomerAddressListPage.stories.tsx +++ b/src/customers/components/CustomerAddressListPage/CustomerAddressListPage.stories.tsx @@ -1,4 +1,4 @@ -import Decorator from "@saleor/storybook/Decorator"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/customers/components/CustomerAddressListPage/CustomerAddressListPage.tsx b/src/customers/components/CustomerAddressListPage/CustomerAddressListPage.tsx index 7f00cec3e..116acf834 100644 --- a/src/customers/components/CustomerAddressListPage/CustomerAddressListPage.tsx +++ b/src/customers/components/CustomerAddressListPage/CustomerAddressListPage.tsx @@ -1,12 +1,12 @@ +import { Backlink } from "@dashboard/components/Backlink"; +import { Button } from "@dashboard/components/Button"; +import Container from "@dashboard/components/Container"; +import PageHeader from "@dashboard/components/PageHeader"; +import { customerUrl } from "@dashboard/customers/urls"; +import { AddressTypeEnum, CustomerAddressesFragment } from "@dashboard/graphql"; +import { getStringOrPlaceholder, renderCollection } from "@dashboard/misc"; import { Typography } from "@material-ui/core"; -import { Backlink } from "@saleor/components/Backlink"; -import { Button } from "@saleor/components/Button"; -import Container from "@saleor/components/Container"; -import PageHeader from "@saleor/components/PageHeader"; -import { customerUrl } from "@saleor/customers/urls"; -import { AddressTypeEnum, CustomerAddressesFragment } from "@saleor/graphql"; import { makeStyles } from "@saleor/macaw-ui"; -import { getStringOrPlaceholder, renderCollection } from "@saleor/misc"; import React from "react"; import { defineMessages, useIntl } from "react-intl"; diff --git a/src/customers/components/CustomerAddresses/CustomerAddresses.tsx b/src/customers/components/CustomerAddresses/CustomerAddresses.tsx index ba595aac6..65946a9af 100644 --- a/src/customers/components/CustomerAddresses/CustomerAddresses.tsx +++ b/src/customers/components/CustomerAddresses/CustomerAddresses.tsx @@ -1,10 +1,10 @@ +import AddressFormatter from "@dashboard/components/AddressFormatter"; +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import { Hr } from "@dashboard/components/Hr"; +import { CustomerDetailsFragment } from "@dashboard/graphql"; +import { buttonMessages } from "@dashboard/intl"; import { Card, CardContent, Typography } from "@material-ui/core"; -import AddressFormatter from "@saleor/components/AddressFormatter"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import { Hr } from "@saleor/components/Hr"; -import { CustomerDetailsFragment } from "@saleor/graphql"; -import { buttonMessages } from "@saleor/intl"; import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/customers/components/CustomerCreateAddress/CustomerCreateAddress.tsx b/src/customers/components/CustomerCreateAddress/CustomerCreateAddress.tsx index ad5fd32e8..5b8687862 100644 --- a/src/customers/components/CustomerCreateAddress/CustomerCreateAddress.tsx +++ b/src/customers/components/CustomerCreateAddress/CustomerCreateAddress.tsx @@ -1,9 +1,9 @@ +import AddressEdit from "@dashboard/components/AddressEdit"; +import CardTitle from "@dashboard/components/CardTitle"; +import { FormSpacer } from "@dashboard/components/FormSpacer"; +import { SingleAutocompleteChoiceType } from "@dashboard/components/SingleAutocompleteSelectField"; +import { AccountErrorFragment } from "@dashboard/graphql"; import { Card, CardContent, Typography } from "@material-ui/core"; -import AddressEdit from "@saleor/components/AddressEdit"; -import CardTitle from "@saleor/components/CardTitle"; -import { FormSpacer } from "@saleor/components/FormSpacer"; -import { SingleAutocompleteChoiceType } from "@saleor/components/SingleAutocompleteSelectField"; -import { AccountErrorFragment } from "@saleor/graphql"; import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/customers/components/CustomerCreateDetails/CustomerCreateDetails.tsx b/src/customers/components/CustomerCreateDetails/CustomerCreateDetails.tsx index 2b0892d3b..a35ba417f 100644 --- a/src/customers/components/CustomerCreateDetails/CustomerCreateDetails.tsx +++ b/src/customers/components/CustomerCreateDetails/CustomerCreateDetails.tsx @@ -1,10 +1,10 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import { AccountErrorFragment } from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getAccountErrorMessage from "@dashboard/utils/errors/account"; import { Card, CardContent, TextField } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import { AccountErrorFragment } from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; import { makeStyles } from "@saleor/macaw-ui"; -import { getFormErrors } from "@saleor/utils/errors"; -import getAccountErrorMessage from "@saleor/utils/errors/account"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/customers/components/CustomerCreateNote/CustomerCreateNote.tsx b/src/customers/components/CustomerCreateNote/CustomerCreateNote.tsx index 6491b0312..2f158bbd7 100644 --- a/src/customers/components/CustomerCreateNote/CustomerCreateNote.tsx +++ b/src/customers/components/CustomerCreateNote/CustomerCreateNote.tsx @@ -1,9 +1,9 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import { FormSpacer } from "@dashboard/components/FormSpacer"; +import { AccountErrorFragment } from "@dashboard/graphql"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getAccountErrorMessage from "@dashboard/utils/errors/account"; import { Card, CardContent, TextField, Typography } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import { FormSpacer } from "@saleor/components/FormSpacer"; -import { AccountErrorFragment } from "@saleor/graphql"; -import { getFormErrors } from "@saleor/utils/errors"; -import getAccountErrorMessage from "@saleor/utils/errors/account"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/customers/components/CustomerCreatePage/CustomerCreatePage.stories.tsx b/src/customers/components/CustomerCreatePage/CustomerCreatePage.stories.tsx index c5d27007a..c93d7b01b 100644 --- a/src/customers/components/CustomerCreatePage/CustomerCreatePage.stories.tsx +++ b/src/customers/components/CustomerCreatePage/CustomerCreatePage.stories.tsx @@ -1,5 +1,5 @@ -import { AccountErrorCode } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; +import { AccountErrorCode } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/customers/components/CustomerCreatePage/CustomerCreatePage.tsx b/src/customers/components/CustomerCreatePage/CustomerCreatePage.tsx index bebb4ec86..34e6f69bb 100644 --- a/src/customers/components/CustomerCreatePage/CustomerCreatePage.tsx +++ b/src/customers/components/CustomerCreatePage/CustomerCreatePage.tsx @@ -1,25 +1,25 @@ -import { createCountryHandler } from "@saleor/components/AddressEdit/createCountryHandler"; -import { Backlink } from "@saleor/components/Backlink"; -import { CardSpacer } from "@saleor/components/CardSpacer"; -import Container from "@saleor/components/Container"; -import Form from "@saleor/components/Form"; -import Grid from "@saleor/components/Grid"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; -import { customerListUrl } from "@saleor/customers/urls"; +import { createCountryHandler } from "@dashboard/components/AddressEdit/createCountryHandler"; +import { Backlink } from "@dashboard/components/Backlink"; +import { CardSpacer } from "@dashboard/components/CardSpacer"; +import Container from "@dashboard/components/Container"; +import Form from "@dashboard/components/Form"; +import Grid from "@dashboard/components/Grid"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; +import { customerListUrl } from "@dashboard/customers/urls"; import { AccountErrorFragment, AddressInput, CustomerCreateDataQuery, -} from "@saleor/graphql"; -import useAddressValidation from "@saleor/hooks/useAddressValidation"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { sectionNames } from "@saleor/intl"; +} from "@dashboard/graphql"; +import useAddressValidation from "@dashboard/hooks/useAddressValidation"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { sectionNames } from "@dashboard/intl"; +import { extractMutationErrors } from "@dashboard/misc"; +import createSingleAutocompleteSelectHandler from "@dashboard/utils/handlers/singleAutocompleteSelectChangeHandler"; +import { mapCountriesToChoices } from "@dashboard/utils/maps"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { extractMutationErrors } from "@saleor/misc"; -import createSingleAutocompleteSelectHandler from "@saleor/utils/handlers/singleAutocompleteSelectChangeHandler"; -import { mapCountriesToChoices } from "@saleor/utils/maps"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/customers/components/CustomerDetails/CustomerDetails.tsx b/src/customers/components/CustomerDetails/CustomerDetails.tsx index 88b8fa81c..f314eecd0 100644 --- a/src/customers/components/CustomerDetails/CustomerDetails.tsx +++ b/src/customers/components/CustomerDetails/CustomerDetails.tsx @@ -1,12 +1,12 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import { ControlledCheckbox } from "@dashboard/components/ControlledCheckbox"; +import Skeleton from "@dashboard/components/Skeleton"; +import { AccountErrorFragment, CustomerDetailsQuery } from "@dashboard/graphql"; +import { maybe } from "@dashboard/misc"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getAccountErrorMessage from "@dashboard/utils/errors/account"; import { Card, CardContent, TextField, Typography } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import { ControlledCheckbox } from "@saleor/components/ControlledCheckbox"; -import Skeleton from "@saleor/components/Skeleton"; -import { AccountErrorFragment, CustomerDetailsQuery } from "@saleor/graphql"; import { makeStyles } from "@saleor/macaw-ui"; -import { maybe } from "@saleor/misc"; -import { getFormErrors } from "@saleor/utils/errors"; -import getAccountErrorMessage from "@saleor/utils/errors/account"; import moment from "moment-timezone"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/customers/components/CustomerDetailsPage/CustomerDetailsPage.stories.tsx b/src/customers/components/CustomerDetailsPage/CustomerDetailsPage.stories.tsx index 53f983989..ca3ba5815 100644 --- a/src/customers/components/CustomerDetailsPage/CustomerDetailsPage.stories.tsx +++ b/src/customers/components/CustomerDetailsPage/CustomerDetailsPage.stories.tsx @@ -1,6 +1,6 @@ -import { AccountErrorCode } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; -import { MockedUserProvider } from "@saleor/storybook/MockedUserProvider"; +import { AccountErrorCode } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; +import { MockedUserProvider } from "@dashboard/storybook/MockedUserProvider"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/customers/components/CustomerDetailsPage/CustomerDetailsPage.tsx b/src/customers/components/CustomerDetailsPage/CustomerDetailsPage.tsx index 8ca24c0f9..1cdb1d931 100644 --- a/src/customers/components/CustomerDetailsPage/CustomerDetailsPage.tsx +++ b/src/customers/components/CustomerDetailsPage/CustomerDetailsPage.tsx @@ -2,32 +2,35 @@ import { extensionMountPoints, mapToMenuItemsForCustomerDetails, useExtensions, -} from "@saleor/apps/useExtensions"; -import { Backlink } from "@saleor/components/Backlink"; -import CardMenu from "@saleor/components/CardMenu/CardMenu"; -import { CardSpacer } from "@saleor/components/CardSpacer"; -import Container from "@saleor/components/Container"; -import Form from "@saleor/components/Form"; -import Grid from "@saleor/components/Grid"; -import Metadata from "@saleor/components/Metadata/Metadata"; -import { MetadataFormData } from "@saleor/components/Metadata/types"; -import PageHeader from "@saleor/components/PageHeader"; -import RequirePermissions from "@saleor/components/RequirePermissions"; -import Savebar from "@saleor/components/Savebar"; -import { customerAddressesUrl, customerListUrl } from "@saleor/customers/urls"; -import CustomerGiftCardsCard from "@saleor/giftCards/components/GiftCardCustomerCard/CustomerGiftCardsCard"; +} from "@dashboard/apps/useExtensions"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardMenu from "@dashboard/components/CardMenu/CardMenu"; +import { CardSpacer } from "@dashboard/components/CardSpacer"; +import Container from "@dashboard/components/Container"; +import Form from "@dashboard/components/Form"; +import Grid from "@dashboard/components/Grid"; +import Metadata from "@dashboard/components/Metadata/Metadata"; +import { MetadataFormData } from "@dashboard/components/Metadata/types"; +import PageHeader from "@dashboard/components/PageHeader"; +import RequirePermissions from "@dashboard/components/RequirePermissions"; +import Savebar from "@dashboard/components/Savebar"; +import { + customerAddressesUrl, + customerListUrl, +} from "@dashboard/customers/urls"; +import CustomerGiftCardsCard from "@dashboard/giftCards/components/GiftCardCustomerCard/CustomerGiftCardsCard"; import { AccountErrorFragment, CustomerDetailsQuery, PermissionEnum, -} from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { sectionNames } from "@saleor/intl"; +} from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { sectionNames } from "@dashboard/intl"; +import { orderListUrl } from "@dashboard/orders/urls"; +import { mapEdgesToItems, mapMetadataItemToInput } from "@dashboard/utils/maps"; +import useMetadataChangeTrigger from "@dashboard/utils/metadata/useMetadataChangeTrigger"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { orderListUrl } from "@saleor/orders/urls"; -import { mapEdgesToItems, mapMetadataItemToInput } from "@saleor/utils/maps"; -import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/customers/components/CustomerInfo/CustomerInfo.tsx b/src/customers/components/CustomerInfo/CustomerInfo.tsx index b6436854c..7f7cc220e 100644 --- a/src/customers/components/CustomerInfo/CustomerInfo.tsx +++ b/src/customers/components/CustomerInfo/CustomerInfo.tsx @@ -1,12 +1,12 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import Grid from "@dashboard/components/Grid"; +import Hr from "@dashboard/components/Hr"; +import { AccountErrorFragment } from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getAccountErrorMessage from "@dashboard/utils/errors/account"; import { Card, CardContent, TextField, Typography } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import Grid from "@saleor/components/Grid"; -import Hr from "@saleor/components/Hr"; -import { AccountErrorFragment } from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; import { makeStyles } from "@saleor/macaw-ui"; -import { getFormErrors } from "@saleor/utils/errors"; -import getAccountErrorMessage from "@saleor/utils/errors/account"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/customers/components/CustomerList/CustomerList.tsx b/src/customers/components/CustomerList/CustomerList.tsx index c109c3780..f19a07314 100644 --- a/src/customers/components/CustomerList/CustomerList.tsx +++ b/src/customers/components/CustomerList/CustomerList.tsx @@ -1,21 +1,29 @@ -import { TableBody, TableCell, TableFooter } from "@material-ui/core"; -import { useUserPermissions } from "@saleor/auth/hooks/useUserPermissions"; -import Checkbox from "@saleor/components/Checkbox"; +import { useUserPermissions } from "@dashboard/auth/hooks/useUserPermissions"; +import Checkbox from "@dashboard/components/Checkbox"; import RequirePermissions, { hasPermissions, -} from "@saleor/components/RequirePermissions"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableCellHeader from "@saleor/components/TableCellHeader"; -import TableHead from "@saleor/components/TableHead"; -import { TablePaginationWithContext } from "@saleor/components/TablePagination"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { CustomerListUrlSortField, customerUrl } from "@saleor/customers/urls"; -import { ListCustomersQuery, PermissionEnum } from "@saleor/graphql"; +} from "@dashboard/components/RequirePermissions"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableCellHeader from "@dashboard/components/TableCellHeader"; +import TableHead from "@dashboard/components/TableHead"; +import { TablePaginationWithContext } from "@dashboard/components/TablePagination"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { + CustomerListUrlSortField, + customerUrl, +} from "@dashboard/customers/urls"; +import { ListCustomersQuery, PermissionEnum } from "@dashboard/graphql"; +import { getUserName, renderCollection } from "@dashboard/misc"; +import { + ListActions, + ListProps, + RelayToFlat, + SortPage, +} from "@dashboard/types"; +import { getArrowDirection } from "@dashboard/utils/sort"; +import { TableBody, TableCell, TableFooter } from "@material-ui/core"; import { makeStyles } from "@saleor/macaw-ui"; -import { getUserName, renderCollection } from "@saleor/misc"; -import { ListActions, ListProps, RelayToFlat, SortPage } from "@saleor/types"; -import { getArrowDirection } from "@saleor/utils/sort"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/customers/components/CustomerListPage/CustomerListPage.stories.tsx b/src/customers/components/CustomerListPage/CustomerListPage.stories.tsx index 956474de4..1348485cc 100644 --- a/src/customers/components/CustomerListPage/CustomerListPage.stories.tsx +++ b/src/customers/components/CustomerListPage/CustomerListPage.stories.tsx @@ -5,10 +5,10 @@ import { searchPageProps, sortPageProps, tabPageProps, -} from "@saleor/fixtures"; -import Decorator from "@saleor/storybook/Decorator"; -import { MockedUserProvider } from "@saleor/storybook/MockedUserProvider"; -import { PaginatorContextDecorator } from "@saleor/storybook/PaginatorContextDecorator"; +} from "@dashboard/fixtures"; +import Decorator from "@dashboard/storybook/Decorator"; +import { MockedUserProvider } from "@dashboard/storybook/MockedUserProvider"; +import { PaginatorContextDecorator } from "@dashboard/storybook/PaginatorContextDecorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/customers/components/CustomerListPage/CustomerListPage.tsx b/src/customers/components/CustomerListPage/CustomerListPage.tsx index 2fc189db9..cbb52e340 100644 --- a/src/customers/components/CustomerListPage/CustomerListPage.tsx +++ b/src/customers/components/CustomerListPage/CustomerListPage.tsx @@ -1,24 +1,22 @@ -import { Card } from "@material-ui/core"; import { extensionMountPoints, mapToMenuItems, mapToMenuItemsForCustomerOverviewActions, useExtensions, -} from "@saleor/apps/useExtensions"; -import { useUserPermissions } from "@saleor/auth/hooks/useUserPermissions"; -import ButtonWithSelect from "@saleor/components/ButtonWithSelect"; -import CardMenu from "@saleor/components/CardMenu/CardMenu"; -import Container from "@saleor/components/Container"; -import FilterBar from "@saleor/components/FilterBar"; -import PageHeader from "@saleor/components/PageHeader"; +} from "@dashboard/apps/useExtensions"; +import { useUserPermissions } from "@dashboard/auth/hooks/useUserPermissions"; +import ButtonWithSelect from "@dashboard/components/ButtonWithSelect"; +import CardMenu from "@dashboard/components/CardMenu/CardMenu"; +import Container from "@dashboard/components/Container"; +import FilterBar from "@dashboard/components/FilterBar"; +import PageHeader from "@dashboard/components/PageHeader"; import { customerAddUrl, CustomerListUrlSortField, -} from "@saleor/customers/urls"; -import { ListCustomersQuery } from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { sectionNames } from "@saleor/intl"; -import { makeStyles } from "@saleor/macaw-ui"; +} from "@dashboard/customers/urls"; +import { ListCustomersQuery } from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { sectionNames } from "@dashboard/intl"; import { FilterPageProps, ListActions, @@ -26,7 +24,9 @@ import { RelayToFlat, SortPage, TabPageProps, -} from "@saleor/types"; +} from "@dashboard/types"; +import { Card } from "@material-ui/core"; +import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/customers/components/CustomerListPage/filters.ts b/src/customers/components/CustomerListPage/filters.ts index 2f8f1ddb2..1de8f5d78 100644 --- a/src/customers/components/CustomerListPage/filters.ts +++ b/src/customers/components/CustomerListPage/filters.ts @@ -1,11 +1,11 @@ -import { IFilter } from "@saleor/components/Filter"; -import { hasPermissions } from "@saleor/components/RequirePermissions"; -import { PermissionEnum, UserFragment } from "@saleor/graphql"; -import { FilterOpts, MinMax } from "@saleor/types"; +import { IFilter } from "@dashboard/components/Filter"; +import { hasPermissions } from "@dashboard/components/RequirePermissions"; +import { PermissionEnum, UserFragment } from "@dashboard/graphql"; +import { FilterOpts, MinMax } from "@dashboard/types"; import { createDateField, createNumberField, -} from "@saleor/utils/filters/fields"; +} from "@dashboard/utils/filters/fields"; import { defineMessages, IntlShape } from "react-intl"; export enum CustomerFilterKeys { diff --git a/src/customers/components/CustomerOrders/CustomerOrders.tsx b/src/customers/components/CustomerOrders/CustomerOrders.tsx index 48cef4daa..a81bb99bd 100644 --- a/src/customers/components/CustomerOrders/CustomerOrders.tsx +++ b/src/customers/components/CustomerOrders/CustomerOrders.tsx @@ -1,15 +1,15 @@ +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import { DateTime } from "@dashboard/components/Date"; +import Money from "@dashboard/components/Money"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { CustomerDetailsQuery } from "@dashboard/graphql"; +import { orderUrl } from "@dashboard/orders/urls"; +import { RelayToFlat } from "@dashboard/types"; import { Card, TableBody, TableCell, TableHead } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import { DateTime } from "@saleor/components/Date"; -import Money from "@saleor/components/Money"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { CustomerDetailsQuery } from "@saleor/graphql"; import { makeStyles, Pill } from "@saleor/macaw-ui"; -import { orderUrl } from "@saleor/orders/urls"; -import { RelayToFlat } from "@saleor/types"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/customers/components/CustomerStats/CustomerStats.tsx b/src/customers/components/CustomerStats/CustomerStats.tsx index d95b3518e..deecff4fd 100644 --- a/src/customers/components/CustomerStats/CustomerStats.tsx +++ b/src/customers/components/CustomerStats/CustomerStats.tsx @@ -1,10 +1,10 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import { DateTime } from "@dashboard/components/Date"; +import { Hr } from "@dashboard/components/Hr"; +import RequirePermissions from "@dashboard/components/RequirePermissions"; +import Skeleton from "@dashboard/components/Skeleton"; +import { CustomerDetailsQuery, PermissionEnum } from "@dashboard/graphql"; import { Card, CardContent, Typography } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import { DateTime } from "@saleor/components/Date"; -import { Hr } from "@saleor/components/Hr"; -import RequirePermissions from "@saleor/components/RequirePermissions"; -import Skeleton from "@saleor/components/Skeleton"; -import { CustomerDetailsQuery, PermissionEnum } from "@saleor/graphql"; import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/customers/fixtures.ts b/src/customers/fixtures.ts index ce1f236a6..969c14375 100644 --- a/src/customers/fixtures.ts +++ b/src/customers/fixtures.ts @@ -3,8 +3,8 @@ import { CustomerDetailsQuery, ListCustomersQuery, PaymentChargeStatusEnum, -} from "@saleor/graphql"; -import { RelayToFlat } from "@saleor/types"; +} from "@dashboard/graphql"; +import { RelayToFlat } from "@dashboard/types"; export const customers = [ { diff --git a/src/customers/hooks/useCustomerDetails.ts b/src/customers/hooks/useCustomerDetails.ts index 4e222cd5a..c36d24927 100644 --- a/src/customers/hooks/useCustomerDetails.ts +++ b/src/customers/hooks/useCustomerDetails.ts @@ -1,4 +1,4 @@ -import { CustomerDetailsContext } from "@saleor/customers/providers/CustomerDetailsProvider"; +import { CustomerDetailsContext } from "@dashboard/customers/providers/CustomerDetailsProvider"; import { useContext } from "react"; export const useCustomerDetails = () => { diff --git a/src/customers/index.tsx b/src/customers/index.tsx index 24a4ca710..a0f34c707 100644 --- a/src/customers/index.tsx +++ b/src/customers/index.tsx @@ -1,5 +1,5 @@ -import { sectionNames } from "@saleor/intl"; -import { asSortParams } from "@saleor/utils/sort"; +import { sectionNames } from "@dashboard/intl"; +import { asSortParams } from "@dashboard/utils/sort"; import { parse as parseQs } from "qs"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/customers/providers/CustomerDetailsProvider.tsx b/src/customers/providers/CustomerDetailsProvider.tsx index e103fdf70..ede5e05be 100644 --- a/src/customers/providers/CustomerDetailsProvider.tsx +++ b/src/customers/providers/CustomerDetailsProvider.tsx @@ -1,4 +1,7 @@ -import { CustomerDetailsQuery, useCustomerDetailsQuery } from "@saleor/graphql"; +import { + CustomerDetailsQuery, + useCustomerDetailsQuery, +} from "@dashboard/graphql"; import React, { createContext } from "react"; export interface CustomerDetailsProviderProps { diff --git a/src/customers/urls.ts b/src/customers/urls.ts index 27a8a2a63..567e4d460 100644 --- a/src/customers/urls.ts +++ b/src/customers/urls.ts @@ -1,4 +1,4 @@ -import { stringifyQs } from "@saleor/utils/urls"; +import { stringifyQs } from "@dashboard/utils/urls"; import urlJoin from "url-join"; import { diff --git a/src/customers/views/CustomerAddresses.tsx b/src/customers/views/CustomerAddresses.tsx index 5206937f4..90872350f 100644 --- a/src/customers/views/CustomerAddresses.tsx +++ b/src/customers/views/CustomerAddresses.tsx @@ -1,18 +1,18 @@ -import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; -import { WindowTitle } from "@saleor/components/WindowTitle"; +import ActionDialog from "@dashboard/components/ActionDialog"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; import { useCreateCustomerAddressMutation, useCustomerAddressesQuery, useRemoveCustomerAddressMutation, useSetCustomerDefaultAddressMutation, useUpdateCustomerAddressMutation, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import useShop from "@saleor/hooks/useShop"; -import { commonMessages } from "@saleor/intl"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import useShop from "@dashboard/hooks/useShop"; +import { commonMessages } from "@dashboard/intl"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import { DialogContentText } from "@material-ui/core"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/customers/views/CustomerCreate.tsx b/src/customers/views/CustomerCreate.tsx index 81021cf0b..165ef3a4d 100644 --- a/src/customers/views/CustomerCreate.tsx +++ b/src/customers/views/CustomerCreate.tsx @@ -1,10 +1,10 @@ -import { WindowTitle } from "@saleor/components/WindowTitle"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; import { useCreateCustomerMutation, useCustomerCreateDataQuery, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/customers/views/CustomerDetails.tsx b/src/customers/views/CustomerDetails.tsx index b6caab286..6988eabc3 100644 --- a/src/customers/views/CustomerDetails.tsx +++ b/src/customers/views/CustomerDetails.tsx @@ -1,18 +1,18 @@ -import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; -import NotFoundPage from "@saleor/components/NotFoundPage"; -import { WindowTitle } from "@saleor/components/WindowTitle"; +import ActionDialog from "@dashboard/components/ActionDialog"; +import NotFoundPage from "@dashboard/components/NotFoundPage"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; import { useRemoveCustomerMutation, useUpdateCustomerMutation, useUpdateMetadataMutation, useUpdatePrivateMetadataMutation, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { commonMessages } from "@saleor/intl"; -import { extractMutationErrors, getStringOrPlaceholder } from "@saleor/misc"; -import createMetadataUpdateHandler from "@saleor/utils/handlers/metadataUpdateHandler"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { commonMessages } from "@dashboard/intl"; +import { extractMutationErrors, getStringOrPlaceholder } from "@dashboard/misc"; +import createMetadataUpdateHandler from "@dashboard/utils/handlers/metadataUpdateHandler"; +import { DialogContentText } from "@material-ui/core"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/customers/views/CustomerList/CustomerList.tsx b/src/customers/views/CustomerList/CustomerList.tsx index 5780bf483..1060f4928 100644 --- a/src/customers/views/CustomerList/CustomerList.tsx +++ b/src/customers/views/CustomerList/CustomerList.tsx @@ -1,32 +1,32 @@ -import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; -import DeleteFilterTabDialog from "@saleor/components/DeleteFilterTabDialog"; +import ActionDialog from "@dashboard/components/ActionDialog"; +import DeleteFilterTabDialog from "@dashboard/components/DeleteFilterTabDialog"; import SaveFilterTabDialog, { SaveFilterTabDialogFormData, -} from "@saleor/components/SaveFilterTabDialog"; -import { WindowTitle } from "@saleor/components/WindowTitle"; +} from "@dashboard/components/SaveFilterTabDialog"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; import { useBulkRemoveCustomersMutation, useListCustomersQuery, -} from "@saleor/graphql"; -import useBulkActions from "@saleor/hooks/useBulkActions"; -import useListSettings from "@saleor/hooks/useListSettings"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; +} from "@dashboard/graphql"; +import useBulkActions from "@dashboard/hooks/useBulkActions"; +import useListSettings from "@dashboard/hooks/useListSettings"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { usePaginationReset } from "@dashboard/hooks/usePaginationReset"; import usePaginator, { createPaginationState, PaginatorContext, -} from "@saleor/hooks/usePaginator"; -import { commonMessages, sectionNames } from "@saleor/intl"; +} from "@dashboard/hooks/usePaginator"; +import { commonMessages, sectionNames } from "@dashboard/intl"; +import { maybe } from "@dashboard/misc"; +import { ListViews } from "@dashboard/types"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createFilterHandlers from "@dashboard/utils/handlers/filterHandlers"; +import createSortHandler from "@dashboard/utils/handlers/sortHandler"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; +import { getSortParams } from "@dashboard/utils/sort"; +import { DialogContentText } from "@material-ui/core"; import { DeleteIcon, IconButton } from "@saleor/macaw-ui"; -import { maybe } from "@saleor/misc"; -import { ListViews } from "@saleor/types"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createFilterHandlers from "@saleor/utils/handlers/filterHandlers"; -import createSortHandler from "@saleor/utils/handlers/sortHandler"; -import { mapEdgesToItems } from "@saleor/utils/maps"; -import { getSortParams } from "@saleor/utils/sort"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/customers/views/CustomerList/filters.test.ts b/src/customers/views/CustomerList/filters.test.ts index 047a4797f..cad94df7b 100644 --- a/src/customers/views/CustomerList/filters.test.ts +++ b/src/customers/views/CustomerList/filters.test.ts @@ -1,9 +1,9 @@ -import { createFilterStructure } from "@saleor/customers/components/CustomerListPage"; -import { CustomerListUrlFilters } from "@saleor/customers/urls"; -import { date } from "@saleor/fixtures"; -import { PermissionEnum } from "@saleor/graphql"; -import { getFilterQueryParams } from "@saleor/utils/filters"; -import { stringifyQs } from "@saleor/utils/urls"; +import { createFilterStructure } from "@dashboard/customers/components/CustomerListPage"; +import { CustomerListUrlFilters } from "@dashboard/customers/urls"; +import { date } from "@dashboard/fixtures"; +import { PermissionEnum } from "@dashboard/graphql"; +import { getFilterQueryParams } from "@dashboard/utils/filters"; +import { stringifyQs } from "@dashboard/utils/urls"; import { getExistingKeys, setFilterOptsStatus } from "@test/filters"; import { config } from "@test/intl"; import { createIntl } from "react-intl"; diff --git a/src/customers/views/CustomerList/filters.ts b/src/customers/views/CustomerList/filters.ts index f24b1961a..3865691a7 100644 --- a/src/customers/views/CustomerList/filters.ts +++ b/src/customers/views/CustomerList/filters.ts @@ -1,10 +1,10 @@ -import { FilterElement } from "@saleor/components/Filter"; +import { FilterElement } from "@dashboard/components/Filter"; import { CustomerFilterKeys, CustomerListFilterOpts, -} from "@saleor/customers/components/CustomerListPage"; -import { CustomerFilterInput } from "@saleor/graphql"; -import { maybe } from "@saleor/misc"; +} from "@dashboard/customers/components/CustomerListPage"; +import { CustomerFilterInput } from "@dashboard/graphql"; +import { maybe } from "@dashboard/misc"; import { createFilterTabUtils, diff --git a/src/customers/views/CustomerList/sort.ts b/src/customers/views/CustomerList/sort.ts index 684fbd29a..40c4f6dfa 100644 --- a/src/customers/views/CustomerList/sort.ts +++ b/src/customers/views/CustomerList/sort.ts @@ -1,6 +1,6 @@ -import { CustomerListUrlSortField } from "@saleor/customers/urls"; -import { UserSortField } from "@saleor/graphql"; -import { createGetSortQueryVariables } from "@saleor/utils/sort"; +import { CustomerListUrlSortField } from "@dashboard/customers/urls"; +import { UserSortField } from "@dashboard/graphql"; +import { createGetSortQueryVariables } from "@dashboard/utils/sort"; export function getSortQueryField( sort: CustomerListUrlSortField, diff --git a/src/discounts/components/DiscountCategories/DiscountCategories.tsx b/src/discounts/components/DiscountCategories/DiscountCategories.tsx index 5e160a89f..39b5785c0 100644 --- a/src/discounts/components/DiscountCategories/DiscountCategories.tsx +++ b/src/discounts/components/DiscountCategories/DiscountCategories.tsx @@ -1,17 +1,20 @@ +import { categoryUrl } from "@dashboard/categories/urls"; +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import Checkbox from "@dashboard/components/Checkbox"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import { TableButtonWrapper } from "@dashboard/components/TableButtonWrapper/TableButtonWrapper"; +import TableHead from "@dashboard/components/TableHead"; +import { TablePaginationWithContext } from "@dashboard/components/TablePagination"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { + SaleDetailsFragment, + VoucherDetailsFragment, +} from "@dashboard/graphql"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import { Card, TableBody, TableCell, TableFooter } from "@material-ui/core"; -import { categoryUrl } from "@saleor/categories/urls"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import Checkbox from "@saleor/components/Checkbox"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import { TableButtonWrapper } from "@saleor/components/TableButtonWrapper/TableButtonWrapper"; -import TableHead from "@saleor/components/TableHead"; -import { TablePaginationWithContext } from "@saleor/components/TablePagination"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { SaleDetailsFragment, VoucherDetailsFragment } from "@saleor/graphql"; import { DeleteIcon, IconButton } from "@saleor/macaw-ui"; -import { mapEdgesToItems } from "@saleor/utils/maps"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/discounts/components/DiscountCollections/DiscountCollections.tsx b/src/discounts/components/DiscountCollections/DiscountCollections.tsx index 6edcba115..c164624d2 100644 --- a/src/discounts/components/DiscountCollections/DiscountCollections.tsx +++ b/src/discounts/components/DiscountCollections/DiscountCollections.tsx @@ -1,17 +1,20 @@ +import { collectionUrl } from "@dashboard/collections/urls"; +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import Checkbox from "@dashboard/components/Checkbox"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import { TableButtonWrapper } from "@dashboard/components/TableButtonWrapper/TableButtonWrapper"; +import TableHead from "@dashboard/components/TableHead"; +import { TablePaginationWithContext } from "@dashboard/components/TablePagination"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { + SaleDetailsFragment, + VoucherDetailsFragment, +} from "@dashboard/graphql"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import { Card, TableBody, TableCell, TableFooter } from "@material-ui/core"; -import { collectionUrl } from "@saleor/collections/urls"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import Checkbox from "@saleor/components/Checkbox"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import { TableButtonWrapper } from "@saleor/components/TableButtonWrapper/TableButtonWrapper"; -import TableHead from "@saleor/components/TableHead"; -import { TablePaginationWithContext } from "@saleor/components/TablePagination"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { SaleDetailsFragment, VoucherDetailsFragment } from "@saleor/graphql"; import { DeleteIcon, IconButton } from "@saleor/macaw-ui"; -import { mapEdgesToItems } from "@saleor/utils/maps"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/discounts/components/DiscountCountrySelectDialog/DiscountCountrySelectDialog.tsx b/src/discounts/components/DiscountCountrySelectDialog/DiscountCountrySelectDialog.tsx index 4166941f5..2695bb673 100644 --- a/src/discounts/components/DiscountCountrySelectDialog/DiscountCountrySelectDialog.tsx +++ b/src/discounts/components/DiscountCountrySelectDialog/DiscountCountrySelectDialog.tsx @@ -1,3 +1,14 @@ +import BackButton from "@dashboard/components/BackButton"; +import Checkbox from "@dashboard/components/Checkbox"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import Form from "@dashboard/components/Form"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import Hr from "@dashboard/components/Hr"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { CountryWithCodeFragment } from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useScrollableDialogStyle from "@dashboard/styles/useScrollableDialogStyle"; import { Dialog, DialogActions, @@ -8,18 +19,7 @@ import { TextField, Typography, } from "@material-ui/core"; -import BackButton from "@saleor/components/BackButton"; -import Checkbox from "@saleor/components/Checkbox"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import Form from "@saleor/components/Form"; -import FormSpacer from "@saleor/components/FormSpacer"; -import Hr from "@saleor/components/Hr"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { CountryWithCodeFragment } from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import useScrollableDialogStyle from "@saleor/styles/useScrollableDialogStyle"; import { filter } from "fuzzaldrin"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/discounts/components/DiscountDates/DiscountDates.tsx b/src/discounts/components/DiscountDates/DiscountDates.tsx index 443c1c248..1910df205 100644 --- a/src/discounts/components/DiscountDates/DiscountDates.tsx +++ b/src/discounts/components/DiscountDates/DiscountDates.tsx @@ -1,11 +1,11 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import { ControlledCheckbox } from "@dashboard/components/ControlledCheckbox"; +import Grid from "@dashboard/components/Grid"; +import { DiscountErrorFragment } from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getDiscountErrorMessage from "@dashboard/utils/errors/discounts"; import { Card, CardContent, TextField } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import { ControlledCheckbox } from "@saleor/components/ControlledCheckbox"; -import Grid from "@saleor/components/Grid"; -import { DiscountErrorFragment } from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; -import { getFormErrors } from "@saleor/utils/errors"; -import getDiscountErrorMessage from "@saleor/utils/errors/discounts"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/discounts/components/DiscountProducts/DiscountProducts.tsx b/src/discounts/components/DiscountProducts/DiscountProducts.tsx index f9892f432..5b08755fd 100644 --- a/src/discounts/components/DiscountProducts/DiscountProducts.tsx +++ b/src/discounts/components/DiscountProducts/DiscountProducts.tsx @@ -1,18 +1,21 @@ +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import { ChannelsAvailabilityDropdown } from "@dashboard/components/ChannelsAvailabilityDropdown"; +import Checkbox from "@dashboard/components/Checkbox"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import { TableButtonWrapper } from "@dashboard/components/TableButtonWrapper/TableButtonWrapper"; +import TableCellAvatar from "@dashboard/components/TableCellAvatar"; +import TableHead from "@dashboard/components/TableHead"; +import { TablePaginationWithContext } from "@dashboard/components/TablePagination"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { + SaleDetailsFragment, + VoucherDetailsFragment, +} from "@dashboard/graphql"; +import { productUrl } from "@dashboard/products/urls"; import { Card, TableBody, TableCell, TableFooter } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import { ChannelsAvailabilityDropdown } from "@saleor/components/ChannelsAvailabilityDropdown"; -import Checkbox from "@saleor/components/Checkbox"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import { TableButtonWrapper } from "@saleor/components/TableButtonWrapper/TableButtonWrapper"; -import TableCellAvatar from "@saleor/components/TableCellAvatar"; -import TableHead from "@saleor/components/TableHead"; -import { TablePaginationWithContext } from "@saleor/components/TablePagination"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { SaleDetailsFragment, VoucherDetailsFragment } from "@saleor/graphql"; import { DeleteIcon, IconButton } from "@saleor/macaw-ui"; -import { productUrl } from "@saleor/products/urls"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/discounts/components/DiscountProducts/styles.ts b/src/discounts/components/DiscountProducts/styles.ts index 030d70d12..7952be5aa 100644 --- a/src/discounts/components/DiscountProducts/styles.ts +++ b/src/discounts/components/DiscountProducts/styles.ts @@ -1,4 +1,4 @@ -import { AVATAR_MARGIN } from "@saleor/components/TableCellAvatar/Avatar"; +import { AVATAR_MARGIN } from "@dashboard/components/TableCellAvatar/Avatar"; import { makeStyles } from "@saleor/macaw-ui"; export const useStyles = makeStyles( diff --git a/src/discounts/components/DiscountVariants/DiscountVariants.tsx b/src/discounts/components/DiscountVariants/DiscountVariants.tsx index 235e5e7d2..d8c2f5872 100644 --- a/src/discounts/components/DiscountVariants/DiscountVariants.tsx +++ b/src/discounts/components/DiscountVariants/DiscountVariants.tsx @@ -1,17 +1,17 @@ +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import Checkbox from "@dashboard/components/Checkbox"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import { TableButtonWrapper } from "@dashboard/components/TableButtonWrapper/TableButtonWrapper"; +import TableCellAvatar from "@dashboard/components/TableCellAvatar"; +import TableHead from "@dashboard/components/TableHead"; +import { TablePaginationWithContext } from "@dashboard/components/TablePagination"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { SaleDetailsFragment } from "@dashboard/graphql"; +import { productVariantEditPath } from "@dashboard/products/urls"; import { Card, TableBody, TableCell, TableFooter } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import Checkbox from "@saleor/components/Checkbox"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import { TableButtonWrapper } from "@saleor/components/TableButtonWrapper/TableButtonWrapper"; -import TableCellAvatar from "@saleor/components/TableCellAvatar"; -import TableHead from "@saleor/components/TableHead"; -import { TablePaginationWithContext } from "@saleor/components/TablePagination"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { SaleDetailsFragment } from "@saleor/graphql"; import { DeleteIcon, IconButton } from "@saleor/macaw-ui"; -import { productVariantEditPath } from "@saleor/products/urls"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/discounts/components/DiscountVariants/styles.ts b/src/discounts/components/DiscountVariants/styles.ts index 303fed76b..9c5b1750e 100644 --- a/src/discounts/components/DiscountVariants/styles.ts +++ b/src/discounts/components/DiscountVariants/styles.ts @@ -1,4 +1,4 @@ -import { AVATAR_MARGIN } from "@saleor/components/TableCellAvatar/Avatar"; +import { AVATAR_MARGIN } from "@dashboard/components/TableCellAvatar/Avatar"; import { makeStyles } from "@saleor/macaw-ui"; export const useStyles = makeStyles( diff --git a/src/discounts/components/SaleCreatePage/SaleCreatePage.stories.tsx b/src/discounts/components/SaleCreatePage/SaleCreatePage.stories.tsx index c1fff9a6d..129978c28 100644 --- a/src/discounts/components/SaleCreatePage/SaleCreatePage.stories.tsx +++ b/src/discounts/components/SaleCreatePage/SaleCreatePage.stories.tsx @@ -1,7 +1,7 @@ -import { channelsList } from "@saleor/channels/fixtures"; -import { createSaleChannels } from "@saleor/channels/utils"; -import { DiscountErrorCode } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; +import { channelsList } from "@dashboard/channels/fixtures"; +import { createSaleChannels } from "@dashboard/channels/utils"; +import { DiscountErrorCode } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/discounts/components/SaleCreatePage/SaleCreatePage.tsx b/src/discounts/components/SaleCreatePage/SaleCreatePage.tsx index 4fef093f9..638b1bf16 100644 --- a/src/discounts/components/SaleCreatePage/SaleCreatePage.tsx +++ b/src/discounts/components/SaleCreatePage/SaleCreatePage.tsx @@ -1,24 +1,24 @@ -import { validateSalePrice } from "@saleor/channels/utils"; -import { Backlink } from "@saleor/components/Backlink"; -import CardSpacer from "@saleor/components/CardSpacer"; -import ChannelsAvailabilityCard from "@saleor/components/ChannelsAvailabilityCard"; -import Container from "@saleor/components/Container"; -import Form from "@saleor/components/Form"; -import Grid from "@saleor/components/Grid"; -import Metadata, { MetadataFormData } from "@saleor/components/Metadata"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; -import { createSaleChannelsChangeHandler } from "@saleor/discounts/handlers"; -import { SALE_CREATE_FORM_ID } from "@saleor/discounts/views/SaleCreate/consts"; +import { validateSalePrice } from "@dashboard/channels/utils"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import ChannelsAvailabilityCard from "@dashboard/components/ChannelsAvailabilityCard"; +import Container from "@dashboard/components/Container"; +import Form from "@dashboard/components/Form"; +import Grid from "@dashboard/components/Grid"; +import Metadata, { MetadataFormData } from "@dashboard/components/Metadata"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; +import { createSaleChannelsChangeHandler } from "@dashboard/discounts/handlers"; +import { SALE_CREATE_FORM_ID } from "@dashboard/discounts/views/SaleCreate/consts"; import { DiscountErrorFragment, PermissionEnum, SaleType as SaleTypeEnum, -} from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import { sectionNames } from "@saleor/intl"; +} from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import { sectionNames } from "@dashboard/intl"; +import useMetadataChangeTrigger from "@dashboard/utils/metadata/useMetadataChangeTrigger"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/discounts/components/SaleDetailsPage/SaleDetailsPage.stories.tsx b/src/discounts/components/SaleDetailsPage/SaleDetailsPage.stories.tsx index 18913e3f0..90b2d0e39 100644 --- a/src/discounts/components/SaleDetailsPage/SaleDetailsPage.stories.tsx +++ b/src/discounts/components/SaleDetailsPage/SaleDetailsPage.stories.tsx @@ -1,10 +1,10 @@ -import { channelsList } from "@saleor/channels/fixtures"; -import { createSaleChannels } from "@saleor/channels/utils"; -import { sale } from "@saleor/discounts/fixtures"; -import { listActionsProps } from "@saleor/fixtures"; -import { DiscountErrorCode } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; -import { PaginatorContextDecorator } from "@saleor/storybook/PaginatorContextDecorator"; +import { channelsList } from "@dashboard/channels/fixtures"; +import { createSaleChannels } from "@dashboard/channels/utils"; +import { sale } from "@dashboard/discounts/fixtures"; +import { listActionsProps } from "@dashboard/fixtures"; +import { DiscountErrorCode } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; +import { PaginatorContextDecorator } from "@dashboard/storybook/PaginatorContextDecorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/discounts/components/SaleDetailsPage/SaleDetailsPage.tsx b/src/discounts/components/SaleDetailsPage/SaleDetailsPage.tsx index 417bb3393..3cfa0cc7a 100644 --- a/src/discounts/components/SaleDetailsPage/SaleDetailsPage.tsx +++ b/src/discounts/components/SaleDetailsPage/SaleDetailsPage.tsx @@ -1,33 +1,33 @@ -import { ChannelSaleData, validateSalePrice } from "@saleor/channels/utils"; -import { Backlink } from "@saleor/components/Backlink"; -import CardSpacer from "@saleor/components/CardSpacer"; -import ChannelsAvailabilityCard from "@saleor/components/ChannelsAvailabilityCard"; -import Container from "@saleor/components/Container"; -import Form from "@saleor/components/Form"; -import Grid from "@saleor/components/Grid"; -import Metadata, { MetadataFormData } from "@saleor/components/Metadata"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; -import { Tab, TabContainer } from "@saleor/components/Tab"; +import { ChannelSaleData, validateSalePrice } from "@dashboard/channels/utils"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import ChannelsAvailabilityCard from "@dashboard/components/ChannelsAvailabilityCard"; +import Container from "@dashboard/components/Container"; +import Form from "@dashboard/components/Form"; +import Grid from "@dashboard/components/Grid"; +import Metadata, { MetadataFormData } from "@dashboard/components/Metadata"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; +import { Tab, TabContainer } from "@dashboard/components/Tab"; import { createSaleChannelsChangeHandler, createSaleUpdateHandler, -} from "@saleor/discounts/handlers"; -import { itemsQuantityMessages } from "@saleor/discounts/translations"; -import { saleListUrl } from "@saleor/discounts/urls"; -import { SALE_UPDATE_FORM_ID } from "@saleor/discounts/views/SaleDetails/types"; +} from "@dashboard/discounts/handlers"; +import { itemsQuantityMessages } from "@dashboard/discounts/translations"; +import { saleListUrl } from "@dashboard/discounts/urls"; +import { SALE_UPDATE_FORM_ID } from "@dashboard/discounts/views/SaleDetails/types"; import { DiscountErrorFragment, PermissionEnum, SaleDetailsFragment, SaleType as SaleTypeEnum, -} from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { sectionNames } from "@saleor/intl"; +} from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { sectionNames } from "@dashboard/intl"; +import { mapEdgesToItems, mapMetadataItemToInput } from "@dashboard/utils/maps"; +import useMetadataChangeTrigger from "@dashboard/utils/metadata/useMetadataChangeTrigger"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { mapEdgesToItems, mapMetadataItemToInput } from "@saleor/utils/maps"; -import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/discounts/components/SaleInfo/SaleInfo.tsx b/src/discounts/components/SaleInfo/SaleInfo.tsx index 3ed327ff5..2552700f7 100644 --- a/src/discounts/components/SaleInfo/SaleInfo.tsx +++ b/src/discounts/components/SaleInfo/SaleInfo.tsx @@ -1,9 +1,9 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import { DiscountErrorFragment } from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getDiscountErrorMessage from "@dashboard/utils/errors/discounts"; import { Card, CardContent, TextField } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import { DiscountErrorFragment } from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; -import { getFormErrors } from "@saleor/utils/errors"; -import getDiscountErrorMessage from "@saleor/utils/errors/discounts"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/discounts/components/SaleList/SaleList.tsx b/src/discounts/components/SaleList/SaleList.tsx index d49c16796..c2ea15c46 100644 --- a/src/discounts/components/SaleList/SaleList.tsx +++ b/src/discounts/components/SaleList/SaleList.tsx @@ -1,23 +1,28 @@ +import Checkbox from "@dashboard/components/Checkbox"; +import Date from "@dashboard/components/Date"; +import Money from "@dashboard/components/Money"; +import Percent from "@dashboard/components/Percent"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableCellHeader from "@dashboard/components/TableCellHeader"; +import TableHead from "@dashboard/components/TableHead"; +import { TablePaginationWithContext } from "@dashboard/components/TablePagination"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import TooltipTableCellHeader from "@dashboard/components/TooltipTableCellHeader"; +import { commonTooltipMessages } from "@dashboard/components/TooltipTableCellHeader/messages"; +import { SaleListUrlSortField, saleUrl } from "@dashboard/discounts/urls"; +import { canBeSorted } from "@dashboard/discounts/views/SaleList/sort"; +import { SaleFragment, SaleType } from "@dashboard/graphql"; +import { maybe, renderCollection } from "@dashboard/misc"; +import { + ChannelProps, + ListActions, + ListProps, + SortPage, +} from "@dashboard/types"; +import { getArrowDirection } from "@dashboard/utils/sort"; import { TableBody, TableCell, TableFooter } from "@material-ui/core"; -import Checkbox from "@saleor/components/Checkbox"; -import Date from "@saleor/components/Date"; -import Money from "@saleor/components/Money"; -import Percent from "@saleor/components/Percent"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableCellHeader from "@saleor/components/TableCellHeader"; -import TableHead from "@saleor/components/TableHead"; -import { TablePaginationWithContext } from "@saleor/components/TablePagination"; -import TableRowLink from "@saleor/components/TableRowLink"; -import TooltipTableCellHeader from "@saleor/components/TooltipTableCellHeader"; -import { commonTooltipMessages } from "@saleor/components/TooltipTableCellHeader/messages"; -import { SaleListUrlSortField, saleUrl } from "@saleor/discounts/urls"; -import { canBeSorted } from "@saleor/discounts/views/SaleList/sort"; -import { SaleFragment, SaleType } from "@saleor/graphql"; import { makeStyles } from "@saleor/macaw-ui"; -import { maybe, renderCollection } from "@saleor/misc"; -import { ChannelProps, ListActions, ListProps, SortPage } from "@saleor/types"; -import { getArrowDirection } from "@saleor/utils/sort"; import clsx from "clsx"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/discounts/components/SaleListPage/SaleListPage.stories.tsx b/src/discounts/components/SaleListPage/SaleListPage.stories.tsx index 9ad123541..2926277c2 100644 --- a/src/discounts/components/SaleListPage/SaleListPage.stories.tsx +++ b/src/discounts/components/SaleListPage/SaleListPage.stories.tsx @@ -1,15 +1,15 @@ -import { saleList } from "@saleor/discounts/fixtures"; -import { SaleListUrlSortField } from "@saleor/discounts/urls"; +import { saleList } from "@dashboard/discounts/fixtures"; +import { SaleListUrlSortField } from "@dashboard/discounts/urls"; import { filterPageProps, listActionsProps, pageListProps, sortPageProps, tabPageProps, -} from "@saleor/fixtures"; -import { DiscountStatusEnum, DiscountValueTypeEnum } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; -import { PaginatorContextDecorator } from "@saleor/storybook/PaginatorContextDecorator"; +} from "@dashboard/fixtures"; +import { DiscountStatusEnum, DiscountValueTypeEnum } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; +import { PaginatorContextDecorator } from "@dashboard/storybook/PaginatorContextDecorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/discounts/components/SaleListPage/SaleListPage.tsx b/src/discounts/components/SaleListPage/SaleListPage.tsx index d27d9bc04..29f78516b 100644 --- a/src/discounts/components/SaleListPage/SaleListPage.tsx +++ b/src/discounts/components/SaleListPage/SaleListPage.tsx @@ -1,12 +1,11 @@ -import { Card } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import Container from "@saleor/components/Container"; -import { getByName } from "@saleor/components/Filter/utils"; -import FilterBar from "@saleor/components/FilterBar"; -import PageHeader from "@saleor/components/PageHeader"; -import { saleAddUrl, SaleListUrlSortField } from "@saleor/discounts/urls"; -import { SaleFragment } from "@saleor/graphql"; -import { sectionNames } from "@saleor/intl"; +import { Button } from "@dashboard/components/Button"; +import Container from "@dashboard/components/Container"; +import { getByName } from "@dashboard/components/Filter/utils"; +import FilterBar from "@dashboard/components/FilterBar"; +import PageHeader from "@dashboard/components/PageHeader"; +import { saleAddUrl, SaleListUrlSortField } from "@dashboard/discounts/urls"; +import { SaleFragment } from "@dashboard/graphql"; +import { sectionNames } from "@dashboard/intl"; import { ChannelProps, FilterPageProps, @@ -14,7 +13,8 @@ import { PageListProps, SortPage, TabPageProps, -} from "@saleor/types"; +} from "@dashboard/types"; +import { Card } from "@material-ui/core"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/discounts/components/SaleListPage/filters.ts b/src/discounts/components/SaleListPage/filters.ts index 23c164565..527387d9d 100644 --- a/src/discounts/components/SaleListPage/filters.ts +++ b/src/discounts/components/SaleListPage/filters.ts @@ -1,11 +1,11 @@ -import { IFilter } from "@saleor/components/Filter"; -import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField"; -import { DiscountStatusEnum, DiscountValueTypeEnum } from "@saleor/graphql"; -import { FilterOpts, MinMax } from "@saleor/types"; +import { IFilter } from "@dashboard/components/Filter"; +import { MultiAutocompleteChoiceType } from "@dashboard/components/MultiAutocompleteSelectField"; +import { DiscountStatusEnum, DiscountValueTypeEnum } from "@dashboard/graphql"; +import { FilterOpts, MinMax } from "@dashboard/types"; import { createDateField, createOptionsField, -} from "@saleor/utils/filters/fields"; +} from "@dashboard/utils/filters/fields"; import { defineMessages, IntlShape } from "react-intl"; export enum SaleFilterKeys { diff --git a/src/discounts/components/SaleSummary/SaleSummary.tsx b/src/discounts/components/SaleSummary/SaleSummary.tsx index 90b9396c5..2375e8fe5 100644 --- a/src/discounts/components/SaleSummary/SaleSummary.tsx +++ b/src/discounts/components/SaleSummary/SaleSummary.tsx @@ -1,15 +1,15 @@ +import CardSpacer from "@dashboard/components/CardSpacer"; +import CardTitle from "@dashboard/components/CardTitle"; +import Date from "@dashboard/components/Date"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import Hr from "@dashboard/components/Hr"; +import Money from "@dashboard/components/Money"; +import Percent from "@dashboard/components/Percent"; +import Skeleton from "@dashboard/components/Skeleton"; +import { SaleDetailsFragment, SaleType } from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; +import { ChannelProps } from "@dashboard/types"; import { Card, CardContent, Typography } from "@material-ui/core"; -import CardSpacer from "@saleor/components/CardSpacer"; -import CardTitle from "@saleor/components/CardTitle"; -import Date from "@saleor/components/Date"; -import FormSpacer from "@saleor/components/FormSpacer"; -import Hr from "@saleor/components/Hr"; -import Money from "@saleor/components/Money"; -import Percent from "@saleor/components/Percent"; -import Skeleton from "@saleor/components/Skeleton"; -import { SaleDetailsFragment, SaleType } from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; -import { ChannelProps } from "@saleor/types"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/discounts/components/SaleType/SaleType.tsx b/src/discounts/components/SaleType/SaleType.tsx index 9414e74ce..18ef4ec46 100644 --- a/src/discounts/components/SaleType/SaleType.tsx +++ b/src/discounts/components/SaleType/SaleType.tsx @@ -1,10 +1,10 @@ -import { Card, CardContent } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; +import CardTitle from "@dashboard/components/CardTitle"; import RadioGroupField, { RadioGroupFieldChoice, -} from "@saleor/components/RadioGroupField"; -import { SaleType as SaleTypeEnum } from "@saleor/graphql"; -import { FormChange } from "@saleor/hooks/useForm"; +} from "@dashboard/components/RadioGroupField"; +import { SaleType as SaleTypeEnum } from "@dashboard/graphql"; +import { FormChange } from "@dashboard/hooks/useForm"; +import { Card, CardContent } from "@material-ui/core"; import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; import { IntlShape, useIntl } from "react-intl"; diff --git a/src/discounts/components/SaleValue/SaleValue.tsx b/src/discounts/components/SaleValue/SaleValue.tsx index 931a0d095..7787f4028 100644 --- a/src/discounts/components/SaleValue/SaleValue.tsx +++ b/src/discounts/components/SaleValue/SaleValue.tsx @@ -1,3 +1,11 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { DiscountErrorFragment } from "@dashboard/graphql"; +import { renderCollection } from "@dashboard/misc"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getDiscountErrorMessage from "@dashboard/utils/errors/discounts"; import { Card, CardContent, @@ -6,14 +14,6 @@ import { TableHead, Typography, } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { DiscountErrorFragment } from "@saleor/graphql"; -import { renderCollection } from "@saleor/misc"; -import { getFormErrors } from "@saleor/utils/errors"; -import getDiscountErrorMessage from "@saleor/utils/errors/discounts"; import * as React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/discounts/components/SaleValue/SaleValueTextField.tsx b/src/discounts/components/SaleValue/SaleValueTextField.tsx index f95728cee..d073649cd 100644 --- a/src/discounts/components/SaleValue/SaleValueTextField.tsx +++ b/src/discounts/components/SaleValue/SaleValueTextField.tsx @@ -1,5 +1,5 @@ +import { SaleType } from "@dashboard/graphql"; import { TextField } from "@material-ui/core"; -import { SaleType } from "@saleor/graphql"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/discounts/components/VoucherCreatePage/VoucherCreatePage.stories.tsx b/src/discounts/components/VoucherCreatePage/VoucherCreatePage.stories.tsx index 8ffc057a7..9229d63ff 100644 --- a/src/discounts/components/VoucherCreatePage/VoucherCreatePage.stories.tsx +++ b/src/discounts/components/VoucherCreatePage/VoucherCreatePage.stories.tsx @@ -1,7 +1,7 @@ -import { channelsList } from "@saleor/channels/fixtures"; -import { createVoucherChannels } from "@saleor/channels/utils"; -import { DiscountErrorCode } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; +import { channelsList } from "@dashboard/channels/fixtures"; +import { createVoucherChannels } from "@dashboard/channels/utils"; +import { DiscountErrorCode } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/discounts/components/VoucherCreatePage/VoucherCreatePage.tsx b/src/discounts/components/VoucherCreatePage/VoucherCreatePage.tsx index 82ffaa8f3..612f82d23 100644 --- a/src/discounts/components/VoucherCreatePage/VoucherCreatePage.tsx +++ b/src/discounts/components/VoucherCreatePage/VoucherCreatePage.tsx @@ -1,30 +1,30 @@ -import { ChannelVoucherData } from "@saleor/channels/utils"; -import { Backlink } from "@saleor/components/Backlink"; -import CardSpacer from "@saleor/components/CardSpacer"; -import ChannelsAvailabilityCard from "@saleor/components/ChannelsAvailabilityCard"; -import Container from "@saleor/components/Container"; -import Form from "@saleor/components/Form"; -import Grid from "@saleor/components/Grid"; -import Metadata from "@saleor/components/Metadata"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; +import { ChannelVoucherData } from "@dashboard/channels/utils"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import ChannelsAvailabilityCard from "@dashboard/components/ChannelsAvailabilityCard"; +import Container from "@dashboard/components/Container"; +import Form from "@dashboard/components/Form"; +import Grid from "@dashboard/components/Grid"; +import Metadata from "@dashboard/components/Metadata"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; import { createChannelsChangeHandler, createDiscountTypeChangeHandler, -} from "@saleor/discounts/handlers"; -import { voucherListUrl } from "@saleor/discounts/urls"; -import { VOUCHER_CREATE_FORM_ID } from "@saleor/discounts/views/VoucherCreate/types"; +} from "@dashboard/discounts/handlers"; +import { voucherListUrl } from "@dashboard/discounts/urls"; +import { VOUCHER_CREATE_FORM_ID } from "@dashboard/discounts/views/VoucherCreate/types"; import { DiscountErrorFragment, PermissionEnum, VoucherTypeEnum, -} from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { sectionNames } from "@saleor/intl"; +} from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { sectionNames } from "@dashboard/intl"; +import { validatePrice } from "@dashboard/products/utils/validation"; +import useMetadataChangeTrigger from "@dashboard/utils/metadata/useMetadataChangeTrigger"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { validatePrice } from "@saleor/products/utils/validation"; -import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/discounts/components/VoucherDates/VoucherDates.tsx b/src/discounts/components/VoucherDates/VoucherDates.tsx index 029fb97f8..d6da3c000 100644 --- a/src/discounts/components/VoucherDates/VoucherDates.tsx +++ b/src/discounts/components/VoucherDates/VoucherDates.tsx @@ -1,11 +1,11 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import { ControlledCheckbox } from "@dashboard/components/ControlledCheckbox"; +import Grid from "@dashboard/components/Grid"; +import { DiscountErrorFragment } from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getDiscountErrorMessage from "@dashboard/utils/errors/discounts"; import { Card, CardContent, TextField } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import { ControlledCheckbox } from "@saleor/components/ControlledCheckbox"; -import Grid from "@saleor/components/Grid"; -import { DiscountErrorFragment } from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; -import { getFormErrors } from "@saleor/utils/errors"; -import getDiscountErrorMessage from "@saleor/utils/errors/discounts"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/discounts/components/VoucherDetailsPage/VoucherDetailsPage.stories.tsx b/src/discounts/components/VoucherDetailsPage/VoucherDetailsPage.stories.tsx index 7bdaedd04..3b18e6e10 100644 --- a/src/discounts/components/VoucherDetailsPage/VoucherDetailsPage.stories.tsx +++ b/src/discounts/components/VoucherDetailsPage/VoucherDetailsPage.stories.tsx @@ -1,9 +1,9 @@ -import { channelsList } from "@saleor/channels/fixtures"; -import { createChannelsDataWithDiscountPrice } from "@saleor/channels/utils"; -import { listActionsProps, pageListProps } from "@saleor/fixtures"; -import { DiscountErrorCode } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; -import { PaginatorContextDecorator } from "@saleor/storybook/PaginatorContextDecorator"; +import { channelsList } from "@dashboard/channels/fixtures"; +import { createChannelsDataWithDiscountPrice } from "@dashboard/channels/utils"; +import { listActionsProps, pageListProps } from "@dashboard/fixtures"; +import { DiscountErrorCode } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; +import { PaginatorContextDecorator } from "@dashboard/storybook/PaginatorContextDecorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/discounts/components/VoucherDetailsPage/VoucherDetailsPage.tsx b/src/discounts/components/VoucherDetailsPage/VoucherDetailsPage.tsx index ab0bdbd56..ed558df6d 100644 --- a/src/discounts/components/VoucherDetailsPage/VoucherDetailsPage.tsx +++ b/src/discounts/components/VoucherDetailsPage/VoucherDetailsPage.tsx @@ -1,36 +1,39 @@ -import { Typography } from "@material-ui/core"; -import { ChannelVoucherData } from "@saleor/channels/utils"; -import { Backlink } from "@saleor/components/Backlink"; -import CardSpacer from "@saleor/components/CardSpacer"; -import ChannelsAvailabilityCard from "@saleor/components/ChannelsAvailabilityCard"; -import Container from "@saleor/components/Container"; -import CountryList from "@saleor/components/CountryList"; -import Form from "@saleor/components/Form"; -import Grid from "@saleor/components/Grid"; -import Metadata, { MetadataFormData } from "@saleor/components/Metadata"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; -import { Tab, TabContainer } from "@saleor/components/Tab"; +import { ChannelVoucherData } from "@dashboard/channels/utils"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import ChannelsAvailabilityCard from "@dashboard/components/ChannelsAvailabilityCard"; +import Container from "@dashboard/components/Container"; +import CountryList from "@dashboard/components/CountryList"; +import Form from "@dashboard/components/Form"; +import Grid from "@dashboard/components/Grid"; +import Metadata, { MetadataFormData } from "@dashboard/components/Metadata"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; +import { Tab, TabContainer } from "@dashboard/components/Tab"; import { createChannelsChangeHandler, createDiscountTypeChangeHandler, createVoucherUpdateHandler, -} from "@saleor/discounts/handlers"; -import { itemsQuantityMessages } from "@saleor/discounts/translations"; -import { DiscountTypeEnum, RequirementsPicker } from "@saleor/discounts/types"; -import { voucherListUrl } from "@saleor/discounts/urls"; +} from "@dashboard/discounts/handlers"; +import { itemsQuantityMessages } from "@dashboard/discounts/translations"; +import { + DiscountTypeEnum, + RequirementsPicker, +} from "@dashboard/discounts/types"; +import { voucherListUrl } from "@dashboard/discounts/urls"; import { DiscountErrorFragment, DiscountValueTypeEnum, PermissionEnum, VoucherDetailsFragment, VoucherTypeEnum, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { sectionNames } from "@saleor/intl"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { sectionNames } from "@dashboard/intl"; +import { mapEdgesToItems, mapMetadataItemToInput } from "@dashboard/utils/maps"; +import useMetadataChangeTrigger from "@dashboard/utils/metadata/useMetadataChangeTrigger"; +import { Typography } from "@material-ui/core"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { mapEdgesToItems, mapMetadataItemToInput } from "@saleor/utils/maps"; -import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/discounts/components/VoucherInfo/VoucherInfo.tsx b/src/discounts/components/VoucherInfo/VoucherInfo.tsx index 829e03e7f..2b332f03e 100644 --- a/src/discounts/components/VoucherInfo/VoucherInfo.tsx +++ b/src/discounts/components/VoucherInfo/VoucherInfo.tsx @@ -1,10 +1,10 @@ +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import { DiscountErrorFragment } from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getDiscountErrorMessage from "@dashboard/utils/errors/discounts"; import { Card, CardContent, TextField } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import { DiscountErrorFragment } from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; -import { getFormErrors } from "@saleor/utils/errors"; -import getDiscountErrorMessage from "@saleor/utils/errors/discounts"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/discounts/components/VoucherLimits/VoucherLimits.tsx b/src/discounts/components/VoucherLimits/VoucherLimits.tsx index e365d9f47..44a1411d3 100644 --- a/src/discounts/components/VoucherLimits/VoucherLimits.tsx +++ b/src/discounts/components/VoucherLimits/VoucherLimits.tsx @@ -1,10 +1,10 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import { ControlledCheckbox } from "@dashboard/components/ControlledCheckbox"; +import { Grid } from "@dashboard/components/Grid"; +import { DiscountErrorFragment } from "@dashboard/graphql"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getDiscountErrorMessage from "@dashboard/utils/errors/discounts"; import { Card, CardContent, TextField, Typography } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import { ControlledCheckbox } from "@saleor/components/ControlledCheckbox"; -import { Grid } from "@saleor/components/Grid"; -import { DiscountErrorFragment } from "@saleor/graphql"; -import { getFormErrors } from "@saleor/utils/errors"; -import getDiscountErrorMessage from "@saleor/utils/errors/discounts"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/discounts/components/VoucherList/VoucherList.tsx b/src/discounts/components/VoucherList/VoucherList.tsx index d44c0b199..204a154dd 100644 --- a/src/discounts/components/VoucherList/VoucherList.tsx +++ b/src/discounts/components/VoucherList/VoucherList.tsx @@ -1,23 +1,28 @@ +import Checkbox from "@dashboard/components/Checkbox"; +import Date from "@dashboard/components/Date"; +import Money from "@dashboard/components/Money"; +import Percent from "@dashboard/components/Percent"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableCellHeader from "@dashboard/components/TableCellHeader"; +import TableHead from "@dashboard/components/TableHead"; +import { TablePaginationWithContext } from "@dashboard/components/TablePagination"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import TooltipTableCellHeader from "@dashboard/components/TooltipTableCellHeader"; +import { commonTooltipMessages } from "@dashboard/components/TooltipTableCellHeader/messages"; +import { VoucherListUrlSortField, voucherUrl } from "@dashboard/discounts/urls"; +import { canBeSorted } from "@dashboard/discounts/views/VoucherList/sort"; +import { DiscountValueTypeEnum, VoucherFragment } from "@dashboard/graphql"; +import { maybe, renderCollection } from "@dashboard/misc"; +import { + ChannelProps, + ListActions, + ListProps, + SortPage, +} from "@dashboard/types"; +import { getArrowDirection } from "@dashboard/utils/sort"; import { TableBody, TableCell, TableFooter } from "@material-ui/core"; -import Checkbox from "@saleor/components/Checkbox"; -import Date from "@saleor/components/Date"; -import Money from "@saleor/components/Money"; -import Percent from "@saleor/components/Percent"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableCellHeader from "@saleor/components/TableCellHeader"; -import TableHead from "@saleor/components/TableHead"; -import { TablePaginationWithContext } from "@saleor/components/TablePagination"; -import TableRowLink from "@saleor/components/TableRowLink"; -import TooltipTableCellHeader from "@saleor/components/TooltipTableCellHeader"; -import { commonTooltipMessages } from "@saleor/components/TooltipTableCellHeader/messages"; -import { VoucherListUrlSortField, voucherUrl } from "@saleor/discounts/urls"; -import { canBeSorted } from "@saleor/discounts/views/VoucherList/sort"; -import { DiscountValueTypeEnum, VoucherFragment } from "@saleor/graphql"; import { makeStyles } from "@saleor/macaw-ui"; -import { maybe, renderCollection } from "@saleor/misc"; -import { ChannelProps, ListActions, ListProps, SortPage } from "@saleor/types"; -import { getArrowDirection } from "@saleor/utils/sort"; import clsx from "clsx"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/discounts/components/VoucherListPage/VoucherListPage.stories.tsx b/src/discounts/components/VoucherListPage/VoucherListPage.stories.tsx index 0efd34faa..a40cb9881 100644 --- a/src/discounts/components/VoucherListPage/VoucherListPage.stories.tsx +++ b/src/discounts/components/VoucherListPage/VoucherListPage.stories.tsx @@ -1,5 +1,5 @@ -import { voucherList } from "@saleor/discounts/fixtures"; -import { VoucherListUrlSortField } from "@saleor/discounts/urls"; +import { voucherList } from "@dashboard/discounts/fixtures"; +import { VoucherListUrlSortField } from "@dashboard/discounts/urls"; import { filterPageProps, listActionsProps, @@ -7,10 +7,10 @@ import { searchPageProps, sortPageProps, tabPageProps, -} from "@saleor/fixtures"; -import { DiscountStatusEnum, VoucherDiscountType } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; -import { PaginatorContextDecorator } from "@saleor/storybook/PaginatorContextDecorator"; +} from "@dashboard/fixtures"; +import { DiscountStatusEnum, VoucherDiscountType } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; +import { PaginatorContextDecorator } from "@dashboard/storybook/PaginatorContextDecorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/discounts/components/VoucherListPage/VoucherListPage.tsx b/src/discounts/components/VoucherListPage/VoucherListPage.tsx index 26bc934ab..dc9a1de30 100644 --- a/src/discounts/components/VoucherListPage/VoucherListPage.tsx +++ b/src/discounts/components/VoucherListPage/VoucherListPage.tsx @@ -1,12 +1,14 @@ -import { Card } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import Container from "@saleor/components/Container"; -import { getByName } from "@saleor/components/Filter/utils"; -import FilterBar from "@saleor/components/FilterBar"; -import PageHeader from "@saleor/components/PageHeader"; -import { voucherAddUrl, VoucherListUrlSortField } from "@saleor/discounts/urls"; -import { VoucherFragment } from "@saleor/graphql"; -import { sectionNames } from "@saleor/intl"; +import { Button } from "@dashboard/components/Button"; +import Container from "@dashboard/components/Container"; +import { getByName } from "@dashboard/components/Filter/utils"; +import FilterBar from "@dashboard/components/FilterBar"; +import PageHeader from "@dashboard/components/PageHeader"; +import { + voucherAddUrl, + VoucherListUrlSortField, +} from "@dashboard/discounts/urls"; +import { VoucherFragment } from "@dashboard/graphql"; +import { sectionNames } from "@dashboard/intl"; import { ChannelProps, FilterPageProps, @@ -14,7 +16,8 @@ import { PageListProps, SortPage, TabPageProps, -} from "@saleor/types"; +} from "@dashboard/types"; +import { Card } from "@material-ui/core"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/discounts/components/VoucherListPage/filters.ts b/src/discounts/components/VoucherListPage/filters.ts index 53abbb531..54a5fac6d 100644 --- a/src/discounts/components/VoucherListPage/filters.ts +++ b/src/discounts/components/VoucherListPage/filters.ts @@ -1,12 +1,12 @@ -import { IFilter } from "@saleor/components/Filter"; -import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField"; -import { DiscountStatusEnum, VoucherDiscountType } from "@saleor/graphql"; -import { FilterOpts, MinMax } from "@saleor/types"; +import { IFilter } from "@dashboard/components/Filter"; +import { MultiAutocompleteChoiceType } from "@dashboard/components/MultiAutocompleteSelectField"; +import { DiscountStatusEnum, VoucherDiscountType } from "@dashboard/graphql"; +import { FilterOpts, MinMax } from "@dashboard/types"; import { createDateField, createNumberField, createOptionsField, -} from "@saleor/utils/filters/fields"; +} from "@dashboard/utils/filters/fields"; import { defineMessages, IntlShape } from "react-intl"; export enum VoucherFilterKeys { diff --git a/src/discounts/components/VoucherRequirements/VoucherRequirements.tsx b/src/discounts/components/VoucherRequirements/VoucherRequirements.tsx index e20d4cd11..e227558cc 100644 --- a/src/discounts/components/VoucherRequirements/VoucherRequirements.tsx +++ b/src/discounts/components/VoucherRequirements/VoucherRequirements.tsx @@ -1,3 +1,17 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import { FormSpacer } from "@dashboard/components/FormSpacer"; +import PriceField from "@dashboard/components/PriceField"; +import RadioGroupField from "@dashboard/components/RadioGroupField"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableHead from "@dashboard/components/TableHead"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { ChannelInput } from "@dashboard/discounts/handlers"; +import { RequirementsPicker } from "@dashboard/discounts/types"; +import { DiscountErrorFragment } from "@dashboard/graphql"; +import { renderCollection } from "@dashboard/misc"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getDiscountErrorMessage from "@dashboard/utils/errors/discounts"; import { Card, CardContent, @@ -6,20 +20,6 @@ import { TextField, Typography, } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import { FormSpacer } from "@saleor/components/FormSpacer"; -import PriceField from "@saleor/components/PriceField"; -import RadioGroupField from "@saleor/components/RadioGroupField"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableHead from "@saleor/components/TableHead"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { ChannelInput } from "@saleor/discounts/handlers"; -import { RequirementsPicker } from "@saleor/discounts/types"; -import { DiscountErrorFragment } from "@saleor/graphql"; -import { renderCollection } from "@saleor/misc"; -import { getFormErrors } from "@saleor/utils/errors"; -import getDiscountErrorMessage from "@saleor/utils/errors/discounts"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/discounts/components/VoucherSummary/VoucherSummary.tsx b/src/discounts/components/VoucherSummary/VoucherSummary.tsx index c04deebc2..7d5a432fd 100644 --- a/src/discounts/components/VoucherSummary/VoucherSummary.tsx +++ b/src/discounts/components/VoucherSummary/VoucherSummary.tsx @@ -1,15 +1,18 @@ +import CardSpacer from "@dashboard/components/CardSpacer"; +import CardTitle from "@dashboard/components/CardTitle"; +import Date from "@dashboard/components/Date"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import Hr from "@dashboard/components/Hr"; +import Money from "@dashboard/components/Money"; +import Percent from "@dashboard/components/Percent"; +import Skeleton from "@dashboard/components/Skeleton"; +import { + DiscountValueTypeEnum, + VoucherDetailsFragment, +} from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; +import { ChannelProps } from "@dashboard/types"; import { Card, CardContent, Typography } from "@material-ui/core"; -import CardSpacer from "@saleor/components/CardSpacer"; -import CardTitle from "@saleor/components/CardTitle"; -import Date from "@saleor/components/Date"; -import FormSpacer from "@saleor/components/FormSpacer"; -import Hr from "@saleor/components/Hr"; -import Money from "@saleor/components/Money"; -import Percent from "@saleor/components/Percent"; -import Skeleton from "@saleor/components/Skeleton"; -import { DiscountValueTypeEnum, VoucherDetailsFragment } from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; -import { ChannelProps } from "@saleor/types"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/discounts/components/VoucherTypes/VoucherTypes.tsx b/src/discounts/components/VoucherTypes/VoucherTypes.tsx index 1fbedd4f0..2771d6809 100644 --- a/src/discounts/components/VoucherTypes/VoucherTypes.tsx +++ b/src/discounts/components/VoucherTypes/VoucherTypes.tsx @@ -1,11 +1,11 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import Grid from "@dashboard/components/Grid"; +import RadioGroupField from "@dashboard/components/RadioGroupField"; +import { DiscountTypeEnum } from "@dashboard/discounts/types"; +import { DiscountErrorFragment } from "@dashboard/graphql"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getDiscountErrorMessage from "@dashboard/utils/errors/discounts"; import { Card, CardContent } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import Grid from "@saleor/components/Grid"; -import RadioGroupField from "@saleor/components/RadioGroupField"; -import { DiscountTypeEnum } from "@saleor/discounts/types"; -import { DiscountErrorFragment } from "@saleor/graphql"; -import { getFormErrors } from "@saleor/utils/errors"; -import getDiscountErrorMessage from "@saleor/utils/errors/discounts"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/discounts/components/VoucherValue/VoucherValue.tsx b/src/discounts/components/VoucherValue/VoucherValue.tsx index c881269f3..db3313e50 100644 --- a/src/discounts/components/VoucherValue/VoucherValue.tsx +++ b/src/discounts/components/VoucherValue/VoucherValue.tsx @@ -1,3 +1,18 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import ControlledCheckbox from "@dashboard/components/ControlledCheckbox"; +import { FormSpacer } from "@dashboard/components/FormSpacer"; +import RadioGroupField from "@dashboard/components/RadioGroupField"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableHead from "@dashboard/components/TableHead"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import TextFieldWithChoice from "@dashboard/components/TextFieldWithChoice"; +import { ChannelInput } from "@dashboard/discounts/handlers"; +import { DiscountTypeEnum } from "@dashboard/discounts/types"; +import { DiscountErrorFragment } from "@dashboard/graphql"; +import { renderCollection } from "@dashboard/misc"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getDiscountErrorMessage from "@dashboard/utils/errors/discounts"; import { Card, CardContent, @@ -5,21 +20,6 @@ import { TableCell, Typography, } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; -import { FormSpacer } from "@saleor/components/FormSpacer"; -import RadioGroupField from "@saleor/components/RadioGroupField"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableHead from "@saleor/components/TableHead"; -import TableRowLink from "@saleor/components/TableRowLink"; -import TextFieldWithChoice from "@saleor/components/TextFieldWithChoice"; -import { ChannelInput } from "@saleor/discounts/handlers"; -import { DiscountTypeEnum } from "@saleor/discounts/types"; -import { DiscountErrorFragment } from "@saleor/graphql"; -import { renderCollection } from "@saleor/misc"; -import { getFormErrors } from "@saleor/utils/errors"; -import getDiscountErrorMessage from "@saleor/utils/errors/discounts"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/discounts/data.ts b/src/discounts/data.ts index 477de92d6..a4f73a6c6 100644 --- a/src/discounts/data.ts +++ b/src/discounts/data.ts @@ -1,5 +1,5 @@ -import { ChannelVoucherData } from "@saleor/channels/utils"; -import { VoucherChannelListingAddInput } from "@saleor/graphql"; +import { ChannelVoucherData } from "@dashboard/channels/utils"; +import { VoucherChannelListingAddInput } from "@dashboard/graphql"; import { VoucherDetailsPageFormData } from "./components/VoucherDetailsPage"; import { RequirementsPicker } from "./types"; diff --git a/src/discounts/fixtures.ts b/src/discounts/fixtures.ts index ab2359d55..4c0b88c7c 100644 --- a/src/discounts/fixtures.ts +++ b/src/discounts/fixtures.ts @@ -7,7 +7,7 @@ import { VoucherDetailsFragment, VoucherFragment, VoucherTypeEnum, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; export const saleList: SaleFragment[] = [ { diff --git a/src/discounts/handlers.ts b/src/discounts/handlers.ts index 44ba8733d..a974fef0c 100644 --- a/src/discounts/handlers.ts +++ b/src/discounts/handlers.ts @@ -2,22 +2,26 @@ import { ChannelVoucherData, validateSalePrice, validateVoucherPrice, -} from "@saleor/channels/utils"; +} from "@dashboard/channels/utils"; import { ChannelSaleFormData, SaleDetailsPageFormData, -} from "@saleor/discounts/components/SaleDetailsPage"; -import { VoucherDetailsPageFormData } from "@saleor/discounts/components/VoucherDetailsPage"; -import { DiscountTypeEnum } from "@saleor/discounts/types"; +} from "@dashboard/discounts/components/SaleDetailsPage"; +import { VoucherDetailsPageFormData } from "@dashboard/discounts/components/VoucherDetailsPage"; +import { DiscountTypeEnum } from "@dashboard/discounts/types"; import { DiscountErrorCode, DiscountErrorFragment, SaleType, VoucherTypeEnum, -} from "@saleor/graphql"; -import { ChangeEvent, FormChange, SubmitPromise } from "@saleor/hooks/useForm"; -import { RequireOnlyOne } from "@saleor/misc"; -import { arrayDiff } from "@saleor/utils/arrays"; +} from "@dashboard/graphql"; +import { + ChangeEvent, + FormChange, + SubmitPromise, +} from "@dashboard/hooks/useForm"; +import { RequireOnlyOne } from "@dashboard/misc"; +import { arrayDiff } from "@dashboard/utils/arrays"; import { getAddedChannelsInputFromFormData } from "./data"; diff --git a/src/discounts/index.tsx b/src/discounts/index.tsx index 323d8b0cf..742a8161c 100644 --- a/src/discounts/index.tsx +++ b/src/discounts/index.tsx @@ -1,5 +1,5 @@ -import { sectionNames } from "@saleor/intl"; -import { asSortParams } from "@saleor/utils/sort"; +import { sectionNames } from "@dashboard/intl"; +import { asSortParams } from "@dashboard/utils/sort"; import { parse as parseQs } from "qs"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/discounts/translations.ts b/src/discounts/translations.ts index 1da856413..61c6188aa 100644 --- a/src/discounts/translations.ts +++ b/src/discounts/translations.ts @@ -1,4 +1,4 @@ -import { VoucherTypeEnum } from "@saleor/graphql"; +import { VoucherTypeEnum } from "@dashboard/graphql"; import { defineMessages, IntlShape } from "react-intl"; const messages = defineMessages({ diff --git a/src/discounts/urls.ts b/src/discounts/urls.ts index d7900d3ba..3ec335936 100644 --- a/src/discounts/urls.ts +++ b/src/discounts/urls.ts @@ -1,5 +1,5 @@ -import { ChannelsAction } from "@saleor/channels/urls"; -import { stringifyQs } from "@saleor/utils/urls"; +import { ChannelsAction } from "@dashboard/channels/urls"; +import { stringifyQs } from "@dashboard/utils/urls"; import urlJoin from "url-join"; import { diff --git a/src/discounts/views/SaleCreate/SaleCreate.tsx b/src/discounts/views/SaleCreate/SaleCreate.tsx index 0cceee6db..205e54281 100644 --- a/src/discounts/views/SaleCreate/SaleCreate.tsx +++ b/src/discounts/views/SaleCreate/SaleCreate.tsx @@ -1,28 +1,28 @@ -import { ChannelsAction } from "@saleor/channels/urls"; -import { createSortedSaleData } from "@saleor/channels/utils"; -import useAppChannel from "@saleor/components/AppLayout/AppChannelContext"; -import ChannelsAvailabilityDialog from "@saleor/components/ChannelsAvailabilityDialog"; -import { WindowTitle } from "@saleor/components/WindowTitle"; -import SaleCreatePage from "@saleor/discounts/components/SaleCreatePage"; -import { ChannelSaleFormData } from "@saleor/discounts/components/SaleDetailsPage"; +import { ChannelsAction } from "@dashboard/channels/urls"; +import { createSortedSaleData } from "@dashboard/channels/utils"; +import useAppChannel from "@dashboard/components/AppLayout/AppChannelContext"; +import ChannelsAvailabilityDialog from "@dashboard/components/ChannelsAvailabilityDialog"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; +import SaleCreatePage from "@dashboard/discounts/components/SaleCreatePage"; +import { ChannelSaleFormData } from "@dashboard/discounts/components/SaleDetailsPage"; import { saleAddUrl, SaleCreateUrlQueryParams, saleListUrl, saleUrl, -} from "@saleor/discounts/urls"; +} from "@dashboard/discounts/urls"; import { useSaleChannelListingUpdateMutation, useSaleCreateMutation, useUpdateMetadataMutation, useUpdatePrivateMetadataMutation, -} from "@saleor/graphql"; -import useChannels from "@saleor/hooks/useChannels"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { sectionNames } from "@saleor/intl"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createMetadataCreateHandler from "@saleor/utils/handlers/metadataCreateHandler"; +} from "@dashboard/graphql"; +import useChannels from "@dashboard/hooks/useChannels"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { sectionNames } from "@dashboard/intl"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createMetadataCreateHandler from "@dashboard/utils/handlers/metadataCreateHandler"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/discounts/views/SaleCreate/handlers.ts b/src/discounts/views/SaleCreate/handlers.ts index 0f50c3279..334f8e24c 100644 --- a/src/discounts/views/SaleCreate/handlers.ts +++ b/src/discounts/views/SaleCreate/handlers.ts @@ -1,6 +1,6 @@ import { FetchResult } from "@apollo/client"; -import { FormData } from "@saleor/discounts/components/SaleCreatePage"; -import { getSaleChannelsVariables } from "@saleor/discounts/handlers"; +import { FormData } from "@dashboard/discounts/components/SaleCreatePage"; +import { getSaleChannelsVariables } from "@dashboard/discounts/handlers"; import { DiscountValueTypeEnum, SaleChannelListingUpdateMutation, @@ -8,13 +8,13 @@ import { SaleCreateMutation, SaleCreateMutationVariables, SaleType, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import { decimal, extractMutationErrors, getMutationErrors, joinDateTime, -} from "@saleor/misc"; +} from "@dashboard/misc"; function discountValueTypeEnum(type: SaleType): DiscountValueTypeEnum { return type.toString() === DiscountValueTypeEnum.FIXED diff --git a/src/discounts/views/SaleDetails/SaleDetails.tsx b/src/discounts/views/SaleDetails/SaleDetails.tsx index 81d89c6e1..f7edad281 100644 --- a/src/discounts/views/SaleDetails/SaleDetails.tsx +++ b/src/discounts/views/SaleDetails/SaleDetails.tsx @@ -1,29 +1,28 @@ -import { DialogContentText } from "@material-ui/core"; import { ChannelSaleData, createChannelsDataWithSaleDiscountPrice, createSortedChannelsDataFromSale, -} from "@saleor/channels/utils"; -import ActionDialog from "@saleor/components/ActionDialog"; -import useAppChannel from "@saleor/components/AppLayout/AppChannelContext"; -import AssignCategoriesDialog from "@saleor/components/AssignCategoryDialog"; -import AssignCollectionDialog from "@saleor/components/AssignCollectionDialog"; -import AssignProductDialog from "@saleor/components/AssignProductDialog"; -import AssignVariantDialog from "@saleor/components/AssignVariantDialog"; -import { Button } from "@saleor/components/Button"; -import ChannelsAvailabilityDialog from "@saleor/components/ChannelsAvailabilityDialog"; -import { WindowTitle } from "@saleor/components/WindowTitle"; -import { DEFAULT_INITIAL_SEARCH_DATA, PAGINATE_BY } from "@saleor/config"; +} from "@dashboard/channels/utils"; +import ActionDialog from "@dashboard/components/ActionDialog"; +import useAppChannel from "@dashboard/components/AppLayout/AppChannelContext"; +import AssignCategoriesDialog from "@dashboard/components/AssignCategoryDialog"; +import AssignCollectionDialog from "@dashboard/components/AssignCollectionDialog"; +import AssignProductDialog from "@dashboard/components/AssignProductDialog"; +import AssignVariantDialog from "@dashboard/components/AssignVariantDialog"; +import { Button } from "@dashboard/components/Button"; +import ChannelsAvailabilityDialog from "@dashboard/components/ChannelsAvailabilityDialog"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; +import { DEFAULT_INITIAL_SEARCH_DATA, PAGINATE_BY } from "@dashboard/config"; import SaleDetailsPage, { SaleDetailsPageTab, SaleTabItemsCount, -} from "@saleor/discounts/components/SaleDetailsPage"; +} from "@dashboard/discounts/components/SaleDetailsPage"; import { saleListUrl, saleUrl, SaleUrlDialog, SaleUrlQueryParams, -} from "@saleor/discounts/urls"; +} from "@dashboard/discounts/urls"; import { SaleDetailsQueryVariables, useSaleCataloguesAddMutation, @@ -33,24 +32,25 @@ import { useSaleUpdateMutation, useUpdateMetadataMutation, useUpdatePrivateMetadataMutation, -} from "@saleor/graphql"; -import useBulkActions from "@saleor/hooks/useBulkActions"; -import useChannels from "@saleor/hooks/useChannels"; +} from "@dashboard/graphql"; +import useBulkActions from "@dashboard/hooks/useBulkActions"; +import useChannels from "@dashboard/hooks/useChannels"; import useLocalPaginator, { useSectionLocalPaginationState, -} from "@saleor/hooks/useLocalPaginator"; -import useLocalStorage from "@saleor/hooks/useLocalStorage"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { PaginatorContext } from "@saleor/hooks/usePaginator"; -import { commonMessages, sectionNames } from "@saleor/intl"; -import { maybe } from "@saleor/misc"; -import useCategorySearch from "@saleor/searches/useCategorySearch"; -import useCollectionSearch from "@saleor/searches/useCollectionSearch"; -import useProductSearch from "@saleor/searches/useProductSearch"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createMetadataUpdateHandler from "@saleor/utils/handlers/metadataUpdateHandler"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/hooks/useLocalPaginator"; +import useLocalStorage from "@dashboard/hooks/useLocalStorage"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { PaginatorContext } from "@dashboard/hooks/usePaginator"; +import { commonMessages, sectionNames } from "@dashboard/intl"; +import { maybe } from "@dashboard/misc"; +import useCategorySearch from "@dashboard/searches/useCategorySearch"; +import useCollectionSearch from "@dashboard/searches/useCollectionSearch"; +import useProductSearch from "@dashboard/searches/useProductSearch"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createMetadataUpdateHandler from "@dashboard/utils/handlers/metadataUpdateHandler"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; +import { DialogContentText } from "@material-ui/core"; import React, { useState } from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/discounts/views/SaleDetails/handlers.ts b/src/discounts/views/SaleDetails/handlers.ts index 7b5159532..0545e6cd4 100644 --- a/src/discounts/views/SaleDetails/handlers.ts +++ b/src/discounts/views/SaleDetails/handlers.ts @@ -2,16 +2,16 @@ import { FetchResult } from "@apollo/client"; import { ChannelSaleFormData, SaleDetailsPageFormData, -} from "@saleor/discounts/components/SaleDetailsPage"; -import { getSaleChannelsVariables } from "@saleor/discounts/handlers"; +} from "@dashboard/discounts/components/SaleDetailsPage"; +import { getSaleChannelsVariables } from "@dashboard/discounts/handlers"; import { DiscountValueTypeEnum, SaleDetailsFragment, SaleType, SaleUpdateMutation, SaleUpdateMutationVariables, -} from "@saleor/graphql"; -import { joinDateTime } from "@saleor/misc"; +} from "@dashboard/graphql"; +import { joinDateTime } from "@dashboard/misc"; function discountValueTypeEnum(type: SaleType): DiscountValueTypeEnum { return type.toString() === DiscountValueTypeEnum.FIXED diff --git a/src/discounts/views/SaleList/SaleList.tsx b/src/discounts/views/SaleList/SaleList.tsx index 15b1df003..cf85d6278 100644 --- a/src/discounts/views/SaleList/SaleList.tsx +++ b/src/discounts/views/SaleList/SaleList.tsx @@ -1,30 +1,33 @@ -import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; -import useAppChannel from "@saleor/components/AppLayout/AppChannelContext"; -import DeleteFilterTabDialog from "@saleor/components/DeleteFilterTabDialog"; +import ActionDialog from "@dashboard/components/ActionDialog"; +import useAppChannel from "@dashboard/components/AppLayout/AppChannelContext"; +import DeleteFilterTabDialog from "@dashboard/components/DeleteFilterTabDialog"; import SaveFilterTabDialog, { SaveFilterTabDialogFormData, -} from "@saleor/components/SaveFilterTabDialog"; -import { WindowTitle } from "@saleor/components/WindowTitle"; -import { useSaleBulkDeleteMutation, useSaleListQuery } from "@saleor/graphql"; -import useBulkActions from "@saleor/hooks/useBulkActions"; -import useListSettings from "@saleor/hooks/useListSettings"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; +} from "@dashboard/components/SaveFilterTabDialog"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; +import { + useSaleBulkDeleteMutation, + useSaleListQuery, +} from "@dashboard/graphql"; +import useBulkActions from "@dashboard/hooks/useBulkActions"; +import useListSettings from "@dashboard/hooks/useListSettings"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { usePaginationReset } from "@dashboard/hooks/usePaginationReset"; import usePaginator, { createPaginationState, PaginatorContext, -} from "@saleor/hooks/usePaginator"; -import { commonMessages, sectionNames } from "@saleor/intl"; +} from "@dashboard/hooks/usePaginator"; +import { commonMessages, sectionNames } from "@dashboard/intl"; +import { maybe } from "@dashboard/misc"; +import { ListViews } from "@dashboard/types"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createFilterHandlers from "@dashboard/utils/handlers/filterHandlers"; +import createSortHandler from "@dashboard/utils/handlers/sortHandler"; +import { mapEdgesToItems, mapNodeToChoice } from "@dashboard/utils/maps"; +import { getSortParams } from "@dashboard/utils/sort"; +import { DialogContentText } from "@material-ui/core"; import { DeleteIcon, IconButton } from "@saleor/macaw-ui"; -import { maybe } from "@saleor/misc"; -import { ListViews } from "@saleor/types"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createFilterHandlers from "@saleor/utils/handlers/filterHandlers"; -import createSortHandler from "@saleor/utils/handlers/sortHandler"; -import { mapEdgesToItems, mapNodeToChoice } from "@saleor/utils/maps"; -import { getSortParams } from "@saleor/utils/sort"; import React, { useEffect } from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/discounts/views/SaleList/filters.test.ts b/src/discounts/views/SaleList/filters.test.ts index 986f0aac3..ffd1f266d 100644 --- a/src/discounts/views/SaleList/filters.test.ts +++ b/src/discounts/views/SaleList/filters.test.ts @@ -1,9 +1,9 @@ -import { createFilterStructure } from "@saleor/discounts/components/SaleListPage"; -import { SaleListUrlFilters } from "@saleor/discounts/urls"; -import { date } from "@saleor/fixtures"; -import { DiscountStatusEnum, DiscountValueTypeEnum } from "@saleor/graphql"; -import { getFilterQueryParams } from "@saleor/utils/filters"; -import { stringifyQs } from "@saleor/utils/urls"; +import { createFilterStructure } from "@dashboard/discounts/components/SaleListPage"; +import { SaleListUrlFilters } from "@dashboard/discounts/urls"; +import { date } from "@dashboard/fixtures"; +import { DiscountStatusEnum, DiscountValueTypeEnum } from "@dashboard/graphql"; +import { getFilterQueryParams } from "@dashboard/utils/filters"; +import { stringifyQs } from "@dashboard/utils/urls"; import { getExistingKeys, setFilterOptsStatus } from "@test/filters"; import { config } from "@test/intl"; import { createIntl } from "react-intl"; diff --git a/src/discounts/views/SaleList/filters.ts b/src/discounts/views/SaleList/filters.ts index 5cf1574ab..bd2f14c2a 100644 --- a/src/discounts/views/SaleList/filters.ts +++ b/src/discounts/views/SaleList/filters.ts @@ -1,15 +1,18 @@ -import { FilterElement, FilterElementRegular } from "@saleor/components/Filter"; -import { SingleAutocompleteChoiceType } from "@saleor/components/SingleAutocompleteSelectField"; +import { + FilterElement, + FilterElementRegular, +} from "@dashboard/components/Filter"; +import { SingleAutocompleteChoiceType } from "@dashboard/components/SingleAutocompleteSelectField"; import { SaleFilterKeys, SaleListFilterOpts, -} from "@saleor/discounts/components/SaleListPage"; +} from "@dashboard/discounts/components/SaleListPage"; import { DiscountStatusEnum, DiscountValueTypeEnum, SaleFilterInput, -} from "@saleor/graphql"; -import { findValueInEnum, joinDateTime, maybe } from "@saleor/misc"; +} from "@dashboard/graphql"; +import { findValueInEnum, joinDateTime, maybe } from "@dashboard/misc"; import { createFilterTabUtils, diff --git a/src/discounts/views/SaleList/sort.ts b/src/discounts/views/SaleList/sort.ts index d5f4fe990..bdda0e6b4 100644 --- a/src/discounts/views/SaleList/sort.ts +++ b/src/discounts/views/SaleList/sort.ts @@ -1,6 +1,6 @@ -import { SaleListUrlSortField } from "@saleor/discounts/urls"; -import { SaleSortField } from "@saleor/graphql"; -import { createGetSortQueryVariables } from "@saleor/utils/sort"; +import { SaleListUrlSortField } from "@dashboard/discounts/urls"; +import { SaleSortField } from "@dashboard/graphql"; +import { createGetSortQueryVariables } from "@dashboard/utils/sort"; export const DEFAULT_SORT_KEY = SaleListUrlSortField.name; diff --git a/src/discounts/views/VoucherCreate/VoucherCreate.tsx b/src/discounts/views/VoucherCreate/VoucherCreate.tsx index 5a72de42a..b5b9be6b0 100644 --- a/src/discounts/views/VoucherCreate/VoucherCreate.tsx +++ b/src/discounts/views/VoucherCreate/VoucherCreate.tsx @@ -1,23 +1,23 @@ -import { ChannelsAction } from "@saleor/channels/urls"; +import { ChannelsAction } from "@dashboard/channels/urls"; import { ChannelVoucherData, createSortedVoucherData, -} from "@saleor/channels/utils"; -import useAppChannel from "@saleor/components/AppLayout/AppChannelContext"; -import ChannelsAvailabilityDialog from "@saleor/components/ChannelsAvailabilityDialog"; -import { WindowTitle } from "@saleor/components/WindowTitle"; +} from "@dashboard/channels/utils"; +import useAppChannel from "@dashboard/components/AppLayout/AppChannelContext"; +import ChannelsAvailabilityDialog from "@dashboard/components/ChannelsAvailabilityDialog"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; import { useUpdateMetadataMutation, useUpdatePrivateMetadataMutation, useVoucherChannelListingUpdateMutation, useVoucherCreateMutation, -} from "@saleor/graphql"; -import useChannels from "@saleor/hooks/useChannels"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { sectionNames } from "@saleor/intl"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createMetadataCreateHandler from "@saleor/utils/handlers/metadataCreateHandler"; +} from "@dashboard/graphql"; +import useChannels from "@dashboard/hooks/useChannels"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { sectionNames } from "@dashboard/intl"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createMetadataCreateHandler from "@dashboard/utils/handlers/metadataCreateHandler"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/discounts/views/VoucherCreate/handlers.ts b/src/discounts/views/VoucherCreate/handlers.ts index e1ffc60f4..96d562bd9 100644 --- a/src/discounts/views/VoucherCreate/handlers.ts +++ b/src/discounts/views/VoucherCreate/handlers.ts @@ -1,7 +1,10 @@ import { FetchResult } from "@apollo/client"; -import { VoucherDetailsPageFormData } from "@saleor/discounts/components/VoucherDetailsPage"; -import { getChannelsVariables } from "@saleor/discounts/handlers"; -import { DiscountTypeEnum, RequirementsPicker } from "@saleor/discounts/types"; +import { VoucherDetailsPageFormData } from "@dashboard/discounts/components/VoucherDetailsPage"; +import { getChannelsVariables } from "@dashboard/discounts/handlers"; +import { + DiscountTypeEnum, + RequirementsPicker, +} from "@dashboard/discounts/types"; import { DiscountValueTypeEnum, VoucherChannelListingUpdateMutation, @@ -9,12 +12,12 @@ import { VoucherCreateMutation, VoucherCreateMutationVariables, VoucherTypeEnum, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import { extractMutationErrors, getMutationErrors, joinDateTime, -} from "@saleor/misc"; +} from "@dashboard/misc"; export function createHandler( voucherCreate: ( diff --git a/src/discounts/views/VoucherDetails/VoucherDetails.tsx b/src/discounts/views/VoucherDetails/VoucherDetails.tsx index 3a1a9b22d..739b883b1 100644 --- a/src/discounts/views/VoucherDetails/VoucherDetails.tsx +++ b/src/discounts/views/VoucherDetails/VoucherDetails.tsx @@ -1,29 +1,28 @@ -import { DialogContentText } from "@material-ui/core"; import { ChannelVoucherData, createChannelsDataWithDiscountPrice, createSortedChannelsDataFromVoucher, -} from "@saleor/channels/utils"; -import ActionDialog from "@saleor/components/ActionDialog"; -import useAppChannel from "@saleor/components/AppLayout/AppChannelContext"; -import AssignCategoriesDialog from "@saleor/components/AssignCategoryDialog"; -import AssignCollectionDialog from "@saleor/components/AssignCollectionDialog"; -import AssignProductDialog from "@saleor/components/AssignProductDialog"; -import { Button } from "@saleor/components/Button"; -import ChannelsAvailabilityDialog from "@saleor/components/ChannelsAvailabilityDialog"; -import { WindowTitle } from "@saleor/components/WindowTitle"; -import { DEFAULT_INITIAL_SEARCH_DATA, PAGINATE_BY } from "@saleor/config"; -import DiscountCountrySelectDialog from "@saleor/discounts/components/DiscountCountrySelectDialog"; +} from "@dashboard/channels/utils"; +import ActionDialog from "@dashboard/components/ActionDialog"; +import useAppChannel from "@dashboard/components/AppLayout/AppChannelContext"; +import AssignCategoriesDialog from "@dashboard/components/AssignCategoryDialog"; +import AssignCollectionDialog from "@dashboard/components/AssignCollectionDialog"; +import AssignProductDialog from "@dashboard/components/AssignProductDialog"; +import { Button } from "@dashboard/components/Button"; +import ChannelsAvailabilityDialog from "@dashboard/components/ChannelsAvailabilityDialog"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; +import { DEFAULT_INITIAL_SEARCH_DATA, PAGINATE_BY } from "@dashboard/config"; +import DiscountCountrySelectDialog from "@dashboard/discounts/components/DiscountCountrySelectDialog"; import VoucherDetailsPage, { VoucherDetailsPageTab, VoucherTabItemsCount, -} from "@saleor/discounts/components/VoucherDetailsPage"; +} from "@dashboard/discounts/components/VoucherDetailsPage"; import { voucherListUrl, voucherUrl, VoucherUrlDialog, VoucherUrlQueryParams, -} from "@saleor/discounts/urls"; +} from "@dashboard/discounts/urls"; import { useUpdateMetadataMutation, useUpdatePrivateMetadataMutation, @@ -34,23 +33,24 @@ import { useVoucherDetailsQuery, useVoucherUpdateMutation, VoucherDetailsQueryVariables, -} from "@saleor/graphql"; -import useBulkActions from "@saleor/hooks/useBulkActions"; -import useChannels from "@saleor/hooks/useChannels"; +} from "@dashboard/graphql"; +import useBulkActions from "@dashboard/hooks/useBulkActions"; +import useChannels from "@dashboard/hooks/useChannels"; import useLocalPaginator, { useSectionLocalPaginationState, -} from "@saleor/hooks/useLocalPaginator"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { PaginatorContext } from "@saleor/hooks/usePaginator"; -import useShop from "@saleor/hooks/useShop"; -import { commonMessages, sectionNames } from "@saleor/intl"; -import useCategorySearch from "@saleor/searches/useCategorySearch"; -import useCollectionSearch from "@saleor/searches/useCollectionSearch"; -import useProductSearch from "@saleor/searches/useProductSearch"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createMetadataUpdateHandler from "@saleor/utils/handlers/metadataUpdateHandler"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/hooks/useLocalPaginator"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { PaginatorContext } from "@dashboard/hooks/usePaginator"; +import useShop from "@dashboard/hooks/useShop"; +import { commonMessages, sectionNames } from "@dashboard/intl"; +import useCategorySearch from "@dashboard/searches/useCategorySearch"; +import useCollectionSearch from "@dashboard/searches/useCollectionSearch"; +import useProductSearch from "@dashboard/searches/useProductSearch"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createMetadataUpdateHandler from "@dashboard/utils/handlers/metadataUpdateHandler"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; +import { DialogContentText } from "@material-ui/core"; import React, { useMemo, useState } from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/discounts/views/VoucherDetails/handlers.ts b/src/discounts/views/VoucherDetails/handlers.ts index d6c3cd7f1..65237f424 100644 --- a/src/discounts/views/VoucherDetails/handlers.ts +++ b/src/discounts/views/VoucherDetails/handlers.ts @@ -1,8 +1,11 @@ import { FetchResult } from "@apollo/client"; -import { ChannelVoucherData } from "@saleor/channels/utils"; -import { VoucherDetailsPageFormData } from "@saleor/discounts/components/VoucherDetailsPage"; -import { getChannelsVariables } from "@saleor/discounts/handlers"; -import { DiscountTypeEnum, RequirementsPicker } from "@saleor/discounts/types"; +import { ChannelVoucherData } from "@dashboard/channels/utils"; +import { VoucherDetailsPageFormData } from "@dashboard/discounts/components/VoucherDetailsPage"; +import { getChannelsVariables } from "@dashboard/discounts/handlers"; +import { + DiscountTypeEnum, + RequirementsPicker, +} from "@dashboard/discounts/types"; import { DiscountValueTypeEnum, VoucherChannelListingUpdateMutation, @@ -11,8 +14,8 @@ import { VoucherTypeEnum, VoucherUpdateMutation, VoucherUpdateMutationVariables, -} from "@saleor/graphql"; -import { joinDateTime } from "@saleor/misc"; +} from "@dashboard/graphql"; +import { joinDateTime } from "@dashboard/misc"; export function createUpdateHandler( voucher: VoucherDetailsFragment, diff --git a/src/discounts/views/VoucherList/VoucherList.tsx b/src/discounts/views/VoucherList/VoucherList.tsx index 5ee1d02cc..44172e307 100644 --- a/src/discounts/views/VoucherList/VoucherList.tsx +++ b/src/discounts/views/VoucherList/VoucherList.tsx @@ -1,33 +1,33 @@ -import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; -import useAppChannel from "@saleor/components/AppLayout/AppChannelContext"; -import DeleteFilterTabDialog from "@saleor/components/DeleteFilterTabDialog"; +import ActionDialog from "@dashboard/components/ActionDialog"; +import useAppChannel from "@dashboard/components/AppLayout/AppChannelContext"; +import DeleteFilterTabDialog from "@dashboard/components/DeleteFilterTabDialog"; import SaveFilterTabDialog, { SaveFilterTabDialogFormData, -} from "@saleor/components/SaveFilterTabDialog"; -import { WindowTitle } from "@saleor/components/WindowTitle"; +} from "@dashboard/components/SaveFilterTabDialog"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; import { useVoucherBulkDeleteMutation, useVoucherListQuery, -} from "@saleor/graphql"; -import useBulkActions from "@saleor/hooks/useBulkActions"; -import useListSettings from "@saleor/hooks/useListSettings"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; +} from "@dashboard/graphql"; +import useBulkActions from "@dashboard/hooks/useBulkActions"; +import useListSettings from "@dashboard/hooks/useListSettings"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { usePaginationReset } from "@dashboard/hooks/usePaginationReset"; import usePaginator, { createPaginationState, PaginatorContext, -} from "@saleor/hooks/usePaginator"; -import { commonMessages, sectionNames } from "@saleor/intl"; +} from "@dashboard/hooks/usePaginator"; +import { commonMessages, sectionNames } from "@dashboard/intl"; +import { maybe } from "@dashboard/misc"; +import { ListViews } from "@dashboard/types"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createFilterHandlers from "@dashboard/utils/handlers/filterHandlers"; +import createSortHandler from "@dashboard/utils/handlers/sortHandler"; +import { mapEdgesToItems, mapNodeToChoice } from "@dashboard/utils/maps"; +import { getSortParams } from "@dashboard/utils/sort"; +import { DialogContentText } from "@material-ui/core"; import { DeleteIcon, IconButton } from "@saleor/macaw-ui"; -import { maybe } from "@saleor/misc"; -import { ListViews } from "@saleor/types"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createFilterHandlers from "@saleor/utils/handlers/filterHandlers"; -import createSortHandler from "@saleor/utils/handlers/sortHandler"; -import { mapEdgesToItems, mapNodeToChoice } from "@saleor/utils/maps"; -import { getSortParams } from "@saleor/utils/sort"; import React, { useEffect } from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/discounts/views/VoucherList/filters.test.ts b/src/discounts/views/VoucherList/filters.test.ts index 00f17aa61..c5e38f969 100644 --- a/src/discounts/views/VoucherList/filters.test.ts +++ b/src/discounts/views/VoucherList/filters.test.ts @@ -1,9 +1,9 @@ -import { createFilterStructure } from "@saleor/discounts/components/VoucherListPage"; -import { VoucherListUrlFilters } from "@saleor/discounts/urls"; -import { date } from "@saleor/fixtures"; -import { DiscountStatusEnum, VoucherDiscountType } from "@saleor/graphql"; -import { getFilterQueryParams } from "@saleor/utils/filters"; -import { stringifyQs } from "@saleor/utils/urls"; +import { createFilterStructure } from "@dashboard/discounts/components/VoucherListPage"; +import { VoucherListUrlFilters } from "@dashboard/discounts/urls"; +import { date } from "@dashboard/fixtures"; +import { DiscountStatusEnum, VoucherDiscountType } from "@dashboard/graphql"; +import { getFilterQueryParams } from "@dashboard/utils/filters"; +import { stringifyQs } from "@dashboard/utils/urls"; import { getExistingKeys, setFilterOptsStatus } from "@test/filters"; import { config } from "@test/intl"; import { createIntl } from "react-intl"; diff --git a/src/discounts/views/VoucherList/filters.ts b/src/discounts/views/VoucherList/filters.ts index 3fdc427d2..bfc1a0593 100644 --- a/src/discounts/views/VoucherList/filters.ts +++ b/src/discounts/views/VoucherList/filters.ts @@ -1,15 +1,18 @@ -import { FilterElement, FilterElementRegular } from "@saleor/components/Filter"; -import { SingleAutocompleteChoiceType } from "@saleor/components/SingleAutocompleteSelectField"; +import { + FilterElement, + FilterElementRegular, +} from "@dashboard/components/Filter"; +import { SingleAutocompleteChoiceType } from "@dashboard/components/SingleAutocompleteSelectField"; import { VoucherFilterKeys, VoucherListFilterOpts, -} from "@saleor/discounts/components/VoucherListPage"; +} from "@dashboard/discounts/components/VoucherListPage"; import { DiscountStatusEnum, VoucherDiscountType, VoucherFilterInput, -} from "@saleor/graphql"; -import { findValueInEnum, joinDateTime, maybe } from "@saleor/misc"; +} from "@dashboard/graphql"; +import { findValueInEnum, joinDateTime, maybe } from "@dashboard/misc"; import { createFilterTabUtils, diff --git a/src/discounts/views/VoucherList/sort.ts b/src/discounts/views/VoucherList/sort.ts index c2253d769..f0be420aa 100644 --- a/src/discounts/views/VoucherList/sort.ts +++ b/src/discounts/views/VoucherList/sort.ts @@ -1,6 +1,6 @@ -import { VoucherListUrlSortField } from "@saleor/discounts/urls"; -import { VoucherSortField } from "@saleor/graphql"; -import { createGetSortQueryVariables } from "@saleor/utils/sort"; +import { VoucherListUrlSortField } from "@dashboard/discounts/urls"; +import { VoucherSortField } from "@dashboard/graphql"; +import { createGetSortQueryVariables } from "@dashboard/utils/sort"; export const DEFAULT_SORT_KEY = VoucherListUrlSortField.code; diff --git a/src/fixtures.ts b/src/fixtures.ts index 7d7073359..cca3e70d2 100644 --- a/src/fixtures.ts +++ b/src/fixtures.ts @@ -3,7 +3,7 @@ import { ShopInfoQuery, ShopLimitFragment, UserDetailsQuery, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import { PaginatorContextValues } from "./hooks/usePaginator"; import { diff --git a/src/giftCards/GiftCardBulkCreateDialog/GiftCardBulkCreateDialog.tsx b/src/giftCards/GiftCardBulkCreateDialog/GiftCardBulkCreateDialog.tsx index 81d852444..7b0894f30 100644 --- a/src/giftCards/GiftCardBulkCreateDialog/GiftCardBulkCreateDialog.tsx +++ b/src/giftCards/GiftCardBulkCreateDialog/GiftCardBulkCreateDialog.tsx @@ -1,14 +1,14 @@ -import { Dialog, DialogTitle } from "@material-ui/core"; -import { IMessage } from "@saleor/components/messages"; +import { IMessage } from "@dashboard/components/messages"; import { GiftCardBulkCreateInput, useChannelCurrenciesQuery, useGiftCardBulkCreateMutation, -} from "@saleor/graphql"; -import useCurrentDate from "@saleor/hooks/useCurrentDate"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { DialogProps } from "@saleor/types"; -import { getFormErrors } from "@saleor/utils/errors"; +} from "@dashboard/graphql"; +import useCurrentDate from "@dashboard/hooks/useCurrentDate"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { DialogProps } from "@dashboard/types"; +import { getFormErrors } from "@dashboard/utils/errors"; +import { Dialog, DialogTitle } from "@material-ui/core"; import React, { useEffect, useState } from "react"; import { useIntl } from "react-intl"; diff --git a/src/giftCards/GiftCardBulkCreateDialog/GiftCardBulkCreateDialogForm.tsx b/src/giftCards/GiftCardBulkCreateDialog/GiftCardBulkCreateDialogForm.tsx index 66551ffba..047487f79 100644 --- a/src/giftCards/GiftCardBulkCreateDialog/GiftCardBulkCreateDialogForm.tsx +++ b/src/giftCards/GiftCardBulkCreateDialog/GiftCardBulkCreateDialogForm.tsx @@ -1,19 +1,19 @@ +import VerticalSpacer from "@dashboard/apps/components/VerticalSpacer"; +import DialogButtons from "@dashboard/components/ActionDialog/DialogButtons"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import GiftCardTagInput from "@dashboard/giftCards/components/GiftCardTagInput"; +import { + GiftCardSettingsExpiryTypeEnum, + TimePeriodTypeEnum, + useGiftCardSettingsQuery, +} from "@dashboard/graphql"; +import useForm from "@dashboard/hooks/useForm"; import { DialogContent, Divider, TextField, Typography, } from "@material-ui/core"; -import VerticalSpacer from "@saleor/apps/components/VerticalSpacer"; -import DialogButtons from "@saleor/components/ActionDialog/DialogButtons"; -import CardSpacer from "@saleor/components/CardSpacer"; -import GiftCardTagInput from "@saleor/giftCards/components/GiftCardTagInput"; -import { - GiftCardSettingsExpiryTypeEnum, - TimePeriodTypeEnum, - useGiftCardSettingsQuery, -} from "@saleor/graphql"; -import useForm from "@saleor/hooks/useForm"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/giftCards/GiftCardBulkCreateDialog/types.ts b/src/giftCards/GiftCardBulkCreateDialog/types.ts index 4bdf48632..3810b1506 100644 --- a/src/giftCards/GiftCardBulkCreateDialog/types.ts +++ b/src/giftCards/GiftCardBulkCreateDialog/types.ts @@ -1,5 +1,5 @@ -import { GiftCardErrorFragment, TimePeriodTypeEnum } from "@saleor/graphql"; -import { FormChange } from "@saleor/hooks/useForm"; +import { GiftCardErrorFragment, TimePeriodTypeEnum } from "@dashboard/graphql"; +import { FormChange } from "@dashboard/hooks/useForm"; import { GiftCardExpiryType } from "../GiftCardCreateDialog/types"; diff --git a/src/giftCards/GiftCardBulkCreateDialog/utils.ts b/src/giftCards/GiftCardBulkCreateDialog/utils.ts index 2d490869d..6ddead870 100644 --- a/src/giftCards/GiftCardBulkCreateDialog/utils.ts +++ b/src/giftCards/GiftCardBulkCreateDialog/utils.ts @@ -1,4 +1,4 @@ -import { GiftCardErrorCode, GiftCardErrorFragment } from "@saleor/graphql"; +import { GiftCardErrorCode, GiftCardErrorFragment } from "@dashboard/graphql"; import reduce from "lodash/reduce"; import { diff --git a/src/giftCards/GiftCardCreateDialog/GiftCardBulkCreateSuccessDialog.tsx b/src/giftCards/GiftCardCreateDialog/GiftCardBulkCreateSuccessDialog.tsx index 6479981d5..7ab082651 100644 --- a/src/giftCards/GiftCardCreateDialog/GiftCardBulkCreateSuccessDialog.tsx +++ b/src/giftCards/GiftCardCreateDialog/GiftCardBulkCreateSuccessDialog.tsx @@ -1,3 +1,5 @@ +import { Button } from "@dashboard/components/Button"; +import { DialogProps } from "@dashboard/types"; import { Dialog, DialogActions, @@ -5,8 +7,6 @@ import { DialogTitle, Typography, } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import { DialogProps } from "@saleor/types"; import React, { useState } from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/giftCards/GiftCardCreateDialog/GiftCardCreateDialogCodeContent.tsx b/src/giftCards/GiftCardCreateDialog/GiftCardCreateDialogCodeContent.tsx index 2a0b4d9e1..84f15a913 100644 --- a/src/giftCards/GiftCardCreateDialog/GiftCardCreateDialogCodeContent.tsx +++ b/src/giftCards/GiftCardCreateDialog/GiftCardCreateDialogCodeContent.tsx @@ -1,10 +1,10 @@ +import HorizontalSpacer from "@dashboard/apps/components/HorizontalSpacer"; +import VerticalSpacer from "@dashboard/apps/components/VerticalSpacer"; +import { Button } from "@dashboard/components/Button"; +import useClipboard from "@dashboard/hooks/useClipboard"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { buttonMessages } from "@dashboard/intl"; import { DialogActions, DialogContent, Typography } from "@material-ui/core"; -import HorizontalSpacer from "@saleor/apps/components/HorizontalSpacer"; -import VerticalSpacer from "@saleor/apps/components/VerticalSpacer"; -import { Button } from "@saleor/components/Button"; -import useClipboard from "@saleor/hooks/useClipboard"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { buttonMessages } from "@saleor/intl"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/giftCards/GiftCardCreateDialog/GiftCardCreateDialogContent.tsx b/src/giftCards/GiftCardCreateDialog/GiftCardCreateDialogContent.tsx index cd2e0d691..a6825e006 100644 --- a/src/giftCards/GiftCardCreateDialog/GiftCardCreateDialogContent.tsx +++ b/src/giftCards/GiftCardCreateDialog/GiftCardCreateDialogContent.tsx @@ -1,12 +1,12 @@ -import { DialogTitle } from "@material-ui/core"; import { GiftCardCreateInput, useChannelCurrenciesQuery, useGiftCardCreateMutation, -} from "@saleor/graphql"; -import useCurrentDate from "@saleor/hooks/useCurrentDate"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { DialogProps } from "@saleor/types"; +} from "@dashboard/graphql"; +import useCurrentDate from "@dashboard/hooks/useCurrentDate"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { DialogProps } from "@dashboard/types"; +import { DialogTitle } from "@material-ui/core"; import React, { useState } from "react"; import { useIntl } from "react-intl"; diff --git a/src/giftCards/GiftCardCreateDialog/GiftCardCreateDialogForm.tsx b/src/giftCards/GiftCardCreateDialog/GiftCardCreateDialogForm.tsx index 3077d07bd..2f5f216cb 100644 --- a/src/giftCards/GiftCardCreateDialog/GiftCardCreateDialogForm.tsx +++ b/src/giftCards/GiftCardCreateDialog/GiftCardCreateDialogForm.tsx @@ -1,19 +1,19 @@ -import { DialogContent, Divider, TextField } from "@material-ui/core"; -import VerticalSpacer from "@saleor/apps/components/VerticalSpacer"; -import DialogButtons from "@saleor/components/ActionDialog/DialogButtons"; -import CardSpacer from "@saleor/components/CardSpacer"; -import GiftCardTagInput from "@saleor/giftCards/components/GiftCardTagInput"; +import VerticalSpacer from "@dashboard/apps/components/VerticalSpacer"; +import DialogButtons from "@dashboard/components/ActionDialog/DialogButtons"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import GiftCardTagInput from "@dashboard/giftCards/components/GiftCardTagInput"; import { GiftCardErrorFragment, GiftCardSettingsExpiryTypeEnum, TimePeriodTypeEnum, useGiftCardSettingsQuery, -} from "@saleor/graphql"; -import useForm from "@saleor/hooks/useForm"; -import { commonMessages } from "@saleor/intl"; +} from "@dashboard/graphql"; +import useForm from "@dashboard/hooks/useForm"; +import { commonMessages } from "@dashboard/intl"; +import Label from "@dashboard/orders/components/OrderHistory/Label"; +import { getFormErrors } from "@dashboard/utils/errors"; +import { DialogContent, Divider, TextField } from "@material-ui/core"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import Label from "@saleor/orders/components/OrderHistory/Label"; -import { getFormErrors } from "@saleor/utils/errors"; import React, { useState } from "react"; import { useIntl } from "react-intl"; diff --git a/src/giftCards/GiftCardCreateDialog/GiftCardCreateExpirySelect/GiftCardCreateExpirySelect.tsx b/src/giftCards/GiftCardCreateDialog/GiftCardCreateExpirySelect/GiftCardCreateExpirySelect.tsx index 6b48b5a85..20c8e43e6 100644 --- a/src/giftCards/GiftCardCreateDialog/GiftCardCreateExpirySelect/GiftCardCreateExpirySelect.tsx +++ b/src/giftCards/GiftCardCreateDialog/GiftCardCreateExpirySelect/GiftCardCreateExpirySelect.tsx @@ -1,17 +1,17 @@ -import { TextField, Typography } from "@material-ui/core"; -import VerticalSpacer from "@saleor/apps/components/VerticalSpacer"; -import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; -import RadioGroupField from "@saleor/components/RadioGroupField"; -import TimePeriodField from "@saleor/giftCards/components/TimePeriodField"; +import VerticalSpacer from "@dashboard/apps/components/VerticalSpacer"; +import ControlledCheckbox from "@dashboard/components/ControlledCheckbox"; +import RadioGroupField from "@dashboard/components/RadioGroupField"; +import TimePeriodField from "@dashboard/giftCards/components/TimePeriodField"; import { GiftCardBulkCreateFormErrors, GiftCardCreateCommonFormData, -} from "@saleor/giftCards/GiftCardBulkCreateDialog/types"; -import { GiftCardExpiryType } from "@saleor/giftCards/GiftCardCreateDialog/types"; -import { getExpiryPeriodTerminationDate } from "@saleor/giftCards/GiftCardCreateDialog/utils"; -import { getGiftCardErrorMessage } from "@saleor/giftCards/GiftCardUpdate/messages"; -import useCurrentDate from "@saleor/hooks/useCurrentDate"; -import { FormChange } from "@saleor/hooks/useForm"; +} from "@dashboard/giftCards/GiftCardBulkCreateDialog/types"; +import { GiftCardExpiryType } from "@dashboard/giftCards/GiftCardCreateDialog/types"; +import { getExpiryPeriodTerminationDate } from "@dashboard/giftCards/GiftCardCreateDialog/utils"; +import { getGiftCardErrorMessage } from "@dashboard/giftCards/GiftCardUpdate/messages"; +import useCurrentDate from "@dashboard/hooks/useCurrentDate"; +import { FormChange } from "@dashboard/hooks/useForm"; +import { TextField, Typography } from "@material-ui/core"; import React from "react"; import { FormattedMessage, MessageDescriptor, useIntl } from "react-intl"; diff --git a/src/giftCards/GiftCardCreateDialog/GiftCardCreateMoneyInput.tsx b/src/giftCards/GiftCardCreateDialog/GiftCardCreateMoneyInput.tsx index c5f6b380c..1053c0780 100644 --- a/src/giftCards/GiftCardCreateDialog/GiftCardCreateMoneyInput.tsx +++ b/src/giftCards/GiftCardCreateDialog/GiftCardCreateMoneyInput.tsx @@ -1,8 +1,8 @@ -import TextWithSelectField from "@saleor/components/TextWithSelectField"; -import { useChannelCurrenciesQuery } from "@saleor/graphql"; -import { ChangeEvent, FormChange } from "@saleor/hooks/useForm"; -import useLocalStorage from "@saleor/hooks/useLocalStorage"; -import { mapSingleValueNodeToChoice } from "@saleor/utils/maps"; +import TextWithSelectField from "@dashboard/components/TextWithSelectField"; +import { useChannelCurrenciesQuery } from "@dashboard/graphql"; +import { ChangeEvent, FormChange } from "@dashboard/hooks/useForm"; +import useLocalStorage from "@dashboard/hooks/useLocalStorage"; +import { mapSingleValueNodeToChoice } from "@dashboard/utils/maps"; import * as React from "react"; import { useEffect } from "react"; import { useIntl } from "react-intl"; diff --git a/src/giftCards/GiftCardCreateDialog/GiftCardCreateRequiresActivationSection.tsx b/src/giftCards/GiftCardCreateDialog/GiftCardCreateRequiresActivationSection.tsx index 9f30cc2e3..859c46a5c 100644 --- a/src/giftCards/GiftCardCreateDialog/GiftCardCreateRequiresActivationSection.tsx +++ b/src/giftCards/GiftCardCreateDialog/GiftCardCreateRequiresActivationSection.tsx @@ -1,7 +1,7 @@ -import { Typography } from "@material-ui/core"; import ControlledCheckbox, { ControlledCheckboxProps, -} from "@saleor/components/ControlledCheckbox"; +} from "@dashboard/components/ControlledCheckbox"; +import { Typography } from "@material-ui/core"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/giftCards/GiftCardCreateDialog/GiftCardCustomerSelectField.tsx b/src/giftCards/GiftCardCreateDialog/GiftCardCustomerSelectField.tsx index 6f1c2f9e9..16a348f96 100644 --- a/src/giftCards/GiftCardCreateDialog/GiftCardCustomerSelectField.tsx +++ b/src/giftCards/GiftCardCreateDialog/GiftCardCustomerSelectField.tsx @@ -1,9 +1,9 @@ -import SingleAutocompleteSelectField from "@saleor/components/SingleAutocompleteSelectField"; -import { DEFAULT_INITIAL_SEARCH_DATA } from "@saleor/config"; -import { commonMessages } from "@saleor/intl"; -import { getFullName } from "@saleor/misc"; -import useCustomerSearch from "@saleor/searches/useCustomerSearch"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +import SingleAutocompleteSelectField from "@dashboard/components/SingleAutocompleteSelectField"; +import { DEFAULT_INITIAL_SEARCH_DATA } from "@dashboard/config"; +import { commonMessages } from "@dashboard/intl"; +import { getFullName } from "@dashboard/misc"; +import useCustomerSearch from "@dashboard/searches/useCustomerSearch"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/giftCards/GiftCardCreateDialog/types.ts b/src/giftCards/GiftCardCreateDialog/types.ts index e10bf197a..a386de8f3 100644 --- a/src/giftCards/GiftCardCreateDialog/types.ts +++ b/src/giftCards/GiftCardCreateDialog/types.ts @@ -1,5 +1,5 @@ -import { GiftCardErrorFragment } from "@saleor/graphql"; -import { FormChange } from "@saleor/hooks/useForm"; +import { GiftCardErrorFragment } from "@dashboard/graphql"; +import { FormChange } from "@dashboard/hooks/useForm"; import { GiftCardCreateFormData } from "./GiftCardCreateDialogForm"; diff --git a/src/giftCards/GiftCardCreateDialog/utils.ts b/src/giftCards/GiftCardCreateDialog/utils.ts index 35cf50430..45676e4fc 100644 --- a/src/giftCards/GiftCardCreateDialog/utils.ts +++ b/src/giftCards/GiftCardCreateDialog/utils.ts @@ -1,6 +1,6 @@ -import { IMessage } from "@saleor/components/messages"; -import { GiftCardCreateMutation, TimePeriodTypeEnum } from "@saleor/graphql"; -import commonErrorMessages from "@saleor/utils/errors/common"; +import { IMessage } from "@dashboard/components/messages"; +import { GiftCardCreateMutation, TimePeriodTypeEnum } from "@dashboard/graphql"; +import commonErrorMessages from "@dashboard/utils/errors/common"; import moment from "moment-timezone"; import { IntlShape } from "react-intl"; diff --git a/src/giftCards/GiftCardExportDialogContent/GiftCardExportDialogContent.tsx b/src/giftCards/GiftCardExportDialogContent/GiftCardExportDialogContent.tsx index 01858b267..2a828abfd 100644 --- a/src/giftCards/GiftCardExportDialogContent/GiftCardExportDialogContent.tsx +++ b/src/giftCards/GiftCardExportDialogContent/GiftCardExportDialogContent.tsx @@ -1,25 +1,25 @@ +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import { Task } from "@dashboard/containers/BackgroundTasks/types"; +import { + useExportGiftCardsMutation, + useGiftCardTotalCountQuery, +} from "@dashboard/graphql"; +import useBackgroundTask from "@dashboard/hooks/useBackgroundTask"; +import useForm from "@dashboard/hooks/useForm"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import ExportDialogSettings from "@dashboard/products/components/ProductExportDialog/ExportDialogSettings"; +import { + ExportSettingsFormData, + exportSettingsInitialFormData, + exportSettingsInitialFormDataWithIds, +} from "@dashboard/products/components/ProductExportDialog/types"; +import { DialogProps } from "@dashboard/types"; import { DialogActions, DialogContent, DialogTitle, Typography, } from "@material-ui/core"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import { Task } from "@saleor/containers/BackgroundTasks/types"; -import { - useExportGiftCardsMutation, - useGiftCardTotalCountQuery, -} from "@saleor/graphql"; -import useBackgroundTask from "@saleor/hooks/useBackgroundTask"; -import useForm from "@saleor/hooks/useForm"; -import useNotifier from "@saleor/hooks/useNotifier"; -import ExportDialogSettings from "@saleor/products/components/ProductExportDialog/ExportDialogSettings"; -import { - ExportSettingsFormData, - exportSettingsInitialFormData, - exportSettingsInitialFormDataWithIds, -} from "@saleor/products/components/ProductExportDialog/types"; -import { DialogProps } from "@saleor/types"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/giftCards/GiftCardExportDialogContent/utils.ts b/src/giftCards/GiftCardExportDialogContent/utils.ts index 0999cf779..21ee0e608 100644 --- a/src/giftCards/GiftCardExportDialogContent/utils.ts +++ b/src/giftCards/GiftCardExportDialogContent/utils.ts @@ -1,5 +1,5 @@ -import { ExportScope } from "@saleor/graphql"; -import { ExportSettingsFormData } from "@saleor/products/components/ProductExportDialog/types"; +import { ExportScope } from "@dashboard/graphql"; +import { ExportSettingsFormData } from "@dashboard/products/components/ProductExportDialog/types"; interface ExportGiftCardsInputProps { ids: string[] | null; diff --git a/src/giftCards/GiftCardSettings/GiftCardExpirySettingsCard/GiftCardExpirySettingsCard.tsx b/src/giftCards/GiftCardSettings/GiftCardExpirySettingsCard/GiftCardExpirySettingsCard.tsx index ffd39b4ce..2bf0d906a 100644 --- a/src/giftCards/GiftCardSettings/GiftCardExpirySettingsCard/GiftCardExpirySettingsCard.tsx +++ b/src/giftCards/GiftCardSettings/GiftCardExpirySettingsCard/GiftCardExpirySettingsCard.tsx @@ -1,8 +1,8 @@ -import { Card, CardContent } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; +import CardTitle from "@dashboard/components/CardTitle"; import GiftCardSettingsExpirySelect, { GiftCardSettingsExpirySelectProps, -} from "@saleor/giftCards/components/GiftCardSettingsExpirySelect"; +} from "@dashboard/giftCards/components/GiftCardSettingsExpirySelect"; +import { Card, CardContent } from "@material-ui/core"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/giftCards/GiftCardSettings/GiftCardSettingsPage.tsx b/src/giftCards/GiftCardSettings/GiftCardSettingsPage.tsx index b5969e1cc..5092d244e 100644 --- a/src/giftCards/GiftCardSettings/GiftCardSettingsPage.tsx +++ b/src/giftCards/GiftCardSettings/GiftCardSettingsPage.tsx @@ -1,19 +1,19 @@ -import { Typography } from "@material-ui/core"; -import { Backlink } from "@saleor/components/Backlink"; -import Container from "@saleor/components/Container"; -import Form from "@saleor/components/Form"; -import { Grid } from "@saleor/components/Grid"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; +import { Backlink } from "@dashboard/components/Backlink"; +import Container from "@dashboard/components/Container"; +import Form from "@dashboard/components/Form"; +import { Grid } from "@dashboard/components/Grid"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; import { GiftCardSettingsExpiryTypeEnum, TimePeriodTypeEnum, useGiftCardSettingsQuery, useGiftCardSettingsUpdateMutation, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { sectionNames } from "@saleor/intl"; -import { getFormErrors } from "@saleor/utils/errors"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { sectionNames } from "@dashboard/intl"; +import { getFormErrors } from "@dashboard/utils/errors"; +import { Typography } from "@material-ui/core"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/giftCards/GiftCardSettings/messages.ts b/src/giftCards/GiftCardSettings/messages.ts index a921a2d42..ed2f3aedf 100644 --- a/src/giftCards/GiftCardSettings/messages.ts +++ b/src/giftCards/GiftCardSettings/messages.ts @@ -1,5 +1,5 @@ -import { GiftCardSettingsErrorFragment } from "@saleor/graphql"; -import { getCommonFormFieldErrorMessage } from "@saleor/utils/errors/common"; +import { GiftCardSettingsErrorFragment } from "@dashboard/graphql"; +import { getCommonFormFieldErrorMessage } from "@dashboard/utils/errors/common"; import { defineMessages, IntlShape } from "react-intl"; export const giftCardSettingsPageMessages = defineMessages({ diff --git a/src/giftCards/GiftCardSettings/types.ts b/src/giftCards/GiftCardSettings/types.ts index 9768dcafb..22ab2e829 100644 --- a/src/giftCards/GiftCardSettings/types.ts +++ b/src/giftCards/GiftCardSettings/types.ts @@ -1,4 +1,4 @@ -import { TimePeriodTypeEnum } from "@saleor/graphql"; +import { TimePeriodTypeEnum } from "@dashboard/graphql"; export interface GiftCardSettingsFormData { expiryPeriodActive: boolean; diff --git a/src/giftCards/GiftCardSettings/utils.ts b/src/giftCards/GiftCardSettings/utils.ts index 81d8b79df..5fd6cd4cd 100644 --- a/src/giftCards/GiftCardSettings/utils.ts +++ b/src/giftCards/GiftCardSettings/utils.ts @@ -1,7 +1,7 @@ import { GiftCardSettingsExpiryTypeEnum, GiftCardSettingsUpdateInput, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import { GiftCardSettingsFormData } from "./types"; diff --git a/src/giftCards/GiftCardUpdate/GiftCardHistory/GiftCardHistory.tsx b/src/giftCards/GiftCardUpdate/GiftCardHistory/GiftCardHistory.tsx index 71a042cb6..2395b4f42 100644 --- a/src/giftCards/GiftCardUpdate/GiftCardHistory/GiftCardHistory.tsx +++ b/src/giftCards/GiftCardUpdate/GiftCardHistory/GiftCardHistory.tsx @@ -1,16 +1,16 @@ -import { Typography } from "@material-ui/core"; -import Form from "@saleor/components/Form"; -import Hr from "@saleor/components/Hr"; -import Skeleton from "@saleor/components/Skeleton"; +import Form from "@dashboard/components/Form"; +import Hr from "@dashboard/components/Hr"; +import Skeleton from "@dashboard/components/Skeleton"; import Timeline, { TimelineAddNote, TimelineNote, -} from "@saleor/components/Timeline"; +} from "@dashboard/components/Timeline"; import { GiftCardEventsEnum, useGiftCardAddNoteMutation, -} from "@saleor/graphql"; -import useNotifier from "@saleor/hooks/useNotifier"; +} from "@dashboard/graphql"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { Typography } from "@material-ui/core"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/giftCards/GiftCardUpdate/GiftCardHistory/GiftCardTimelineEvent.tsx b/src/giftCards/GiftCardUpdate/GiftCardHistory/GiftCardTimelineEvent.tsx index 9024f10c6..34079df82 100644 --- a/src/giftCards/GiftCardUpdate/GiftCardHistory/GiftCardTimelineEvent.tsx +++ b/src/giftCards/GiftCardUpdate/GiftCardHistory/GiftCardTimelineEvent.tsx @@ -1,10 +1,10 @@ -import { appPath } from "@saleor/apps/urls"; -import Link from "@saleor/components/Link"; -import { TimelineEvent } from "@saleor/components/Timeline"; -import { customerPath } from "@saleor/customers/urls"; -import { GiftCardEventFragment, GiftCardEventsEnum } from "@saleor/graphql"; -import { orderUrl } from "@saleor/orders/urls"; -import { staffMemberDetailsUrl } from "@saleor/staff/urls"; +import { appPath } 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 { orderUrl } from "@dashboard/orders/urls"; +import { staffMemberDetailsUrl } from "@dashboard/staff/urls"; import React from "react"; import { IntlShape, useIntl } from "react-intl"; diff --git a/src/giftCards/GiftCardUpdate/GiftCardResendCodeDialog/GiftCardResendCodeDialog.tsx b/src/giftCards/GiftCardUpdate/GiftCardResendCodeDialog/GiftCardResendCodeDialog.tsx index b4d569e9c..3e459f75b 100644 --- a/src/giftCards/GiftCardUpdate/GiftCardResendCodeDialog/GiftCardResendCodeDialog.tsx +++ b/src/giftCards/GiftCardUpdate/GiftCardResendCodeDialog/GiftCardResendCodeDialog.tsx @@ -1,17 +1,20 @@ +import VerticalSpacer from "@dashboard/apps/components/VerticalSpacer"; +import ActionDialog from "@dashboard/components/ActionDialog"; +import { useChannelsSearch } from "@dashboard/components/ChannelsAvailabilityDialog/utils"; +import ControlledCheckbox from "@dashboard/components/ControlledCheckbox"; +import { IMessage } from "@dashboard/components/messages"; +import SingleAutocompleteSelectField from "@dashboard/components/SingleAutocompleteSelectField"; +import { + useChannelsQuery, + useGiftCardResendMutation, +} from "@dashboard/graphql"; +import useForm from "@dashboard/hooks/useForm"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { getBySlug } from "@dashboard/misc"; +import { DialogProps } from "@dashboard/types"; +import commonErrorMessages from "@dashboard/utils/errors/common"; +import { mapSlugNodeToChoice } from "@dashboard/utils/maps"; import { CircularProgress, TextField, Typography } from "@material-ui/core"; -import VerticalSpacer from "@saleor/apps/components/VerticalSpacer"; -import ActionDialog from "@saleor/components/ActionDialog"; -import { useChannelsSearch } from "@saleor/components/ChannelsAvailabilityDialog/utils"; -import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; -import { IMessage } from "@saleor/components/messages"; -import SingleAutocompleteSelectField from "@saleor/components/SingleAutocompleteSelectField"; -import { useChannelsQuery, useGiftCardResendMutation } from "@saleor/graphql"; -import useForm from "@saleor/hooks/useForm"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { getBySlug } from "@saleor/misc"; -import { DialogProps } from "@saleor/types"; -import commonErrorMessages from "@saleor/utils/errors/common"; -import { mapSlugNodeToChoice } from "@saleor/utils/maps"; import React, { useEffect, useState } from "react"; import { useIntl } from "react-intl"; diff --git a/src/giftCards/GiftCardUpdate/GiftCardResendCodeDialog/utils.ts b/src/giftCards/GiftCardUpdate/GiftCardResendCodeDialog/utils.ts index 6816f5deb..ff81ab750 100644 --- a/src/giftCards/GiftCardUpdate/GiftCardResendCodeDialog/utils.ts +++ b/src/giftCards/GiftCardUpdate/GiftCardResendCodeDialog/utils.ts @@ -1,5 +1,5 @@ -import { UserError } from "@saleor/types"; -import { FormErrors, getFormErrors } from "@saleor/utils/errors"; +import { UserError } from "@dashboard/types"; +import { FormErrors, getFormErrors } from "@dashboard/utils/errors"; import { useEffect, useState } from "react"; export function useDialogFormReset< diff --git a/src/giftCards/GiftCardUpdate/GiftCardUpdateBalanceDialog/GiftCardUpdateBalanceDialog.tsx b/src/giftCards/GiftCardUpdate/GiftCardUpdateBalanceDialog/GiftCardUpdateBalanceDialog.tsx index 8bbb7ab6f..7e4991bc5 100644 --- a/src/giftCards/GiftCardUpdate/GiftCardUpdateBalanceDialog/GiftCardUpdateBalanceDialog.tsx +++ b/src/giftCards/GiftCardUpdate/GiftCardUpdateBalanceDialog/GiftCardUpdateBalanceDialog.tsx @@ -1,12 +1,12 @@ +import ActionDialog from "@dashboard/components/ActionDialog"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import { IMessage } from "@dashboard/components/messages"; +import { useGiftCardUpdateMutation } from "@dashboard/graphql"; +import useForm from "@dashboard/hooks/useForm"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { DialogProps } from "@dashboard/types"; +import commonErrorMessages from "@dashboard/utils/errors/common"; import { TextField, Typography } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; -import CardSpacer from "@saleor/components/CardSpacer"; -import { IMessage } from "@saleor/components/messages"; -import { useGiftCardUpdateMutation } from "@saleor/graphql"; -import useForm from "@saleor/hooks/useForm"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { DialogProps } from "@saleor/types"; -import commonErrorMessages from "@saleor/utils/errors/common"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/giftCards/GiftCardUpdate/GiftCardUpdateDetailsCard/GiftCardUpdateDetailsBalanceSection.tsx b/src/giftCards/GiftCardUpdate/GiftCardUpdateDetailsCard/GiftCardUpdateDetailsBalanceSection.tsx index dcd3422da..4f3ce2ad5 100644 --- a/src/giftCards/GiftCardUpdate/GiftCardUpdateDetailsCard/GiftCardUpdateDetailsBalanceSection.tsx +++ b/src/giftCards/GiftCardUpdate/GiftCardUpdateDetailsCard/GiftCardUpdateDetailsBalanceSection.tsx @@ -1,7 +1,7 @@ +import HorizontalSpacer from "@dashboard/apps/components/HorizontalSpacer"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import Money from "@dashboard/components/Money"; import { Typography } from "@material-ui/core"; -import HorizontalSpacer from "@saleor/apps/components/HorizontalSpacer"; -import CardSpacer from "@saleor/components/CardSpacer"; -import Money from "@saleor/components/Money"; import clsx from "clsx"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/giftCards/GiftCardUpdate/GiftCardUpdateDetailsCard/GiftCardUpdateDetailsCard.tsx b/src/giftCards/GiftCardUpdate/GiftCardUpdateDetailsCard/GiftCardUpdateDetailsCard.tsx index 1648e119d..75d365d64 100644 --- a/src/giftCards/GiftCardUpdate/GiftCardUpdateDetailsCard/GiftCardUpdateDetailsCard.tsx +++ b/src/giftCards/GiftCardUpdate/GiftCardUpdateDetailsCard/GiftCardUpdateDetailsCard.tsx @@ -1,11 +1,11 @@ +import VerticalSpacer from "@dashboard/apps/components/VerticalSpacer"; +import { Button } from "@dashboard/components/Button"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import CardTitle from "@dashboard/components/CardTitle"; +import Skeleton from "@dashboard/components/Skeleton"; +import GiftCardTagInput from "@dashboard/giftCards/components/GiftCardTagInput"; +import GiftCardUpdateExpirySelect from "@dashboard/giftCards/GiftCardUpdate/GiftCardUpdateExpirySelect"; import { Card, CardContent, Divider, Typography } from "@material-ui/core"; -import VerticalSpacer from "@saleor/apps/components/VerticalSpacer"; -import { Button } from "@saleor/components/Button"; -import CardSpacer from "@saleor/components/CardSpacer"; -import CardTitle from "@saleor/components/CardTitle"; -import Skeleton from "@saleor/components/Skeleton"; -import GiftCardTagInput from "@saleor/giftCards/components/GiftCardTagInput"; -import GiftCardUpdateExpirySelect from "@saleor/giftCards/GiftCardUpdate/GiftCardUpdateExpirySelect"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/giftCards/GiftCardUpdate/GiftCardUpdateExpirySelect/GiftCardUpdateExpirySelect.tsx b/src/giftCards/GiftCardUpdate/GiftCardUpdateExpirySelect/GiftCardUpdateExpirySelect.tsx index ab5ad639d..bed9da96e 100644 --- a/src/giftCards/GiftCardUpdate/GiftCardUpdateExpirySelect/GiftCardUpdateExpirySelect.tsx +++ b/src/giftCards/GiftCardUpdate/GiftCardUpdateExpirySelect/GiftCardUpdateExpirySelect.tsx @@ -1,9 +1,9 @@ +import VerticalSpacer from "@dashboard/apps/components/VerticalSpacer"; +import ControlledCheckbox from "@dashboard/components/ControlledCheckbox"; +import { getGiftCardErrorMessage } from "@dashboard/giftCards/GiftCardUpdate/messages"; +import useGiftCardUpdateForm from "@dashboard/giftCards/GiftCardUpdate/providers/GiftCardUpdateFormProvider/hooks/useGiftCardUpdateForm"; +import useStateFromProps from "@dashboard/hooks/useStateFromProps"; import { TextField, Typography } from "@material-ui/core"; -import VerticalSpacer from "@saleor/apps/components/VerticalSpacer"; -import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; -import { getGiftCardErrorMessage } from "@saleor/giftCards/GiftCardUpdate/messages"; -import useGiftCardUpdateForm from "@saleor/giftCards/GiftCardUpdate/providers/GiftCardUpdateFormProvider/hooks/useGiftCardUpdateForm"; -import useStateFromProps from "@saleor/hooks/useStateFromProps"; import React, { useEffect } from "react"; import { useIntl } from "react-intl"; diff --git a/src/giftCards/GiftCardUpdate/GiftCardUpdateInfoCard/GiftCardUpdateInfoCard.tsx b/src/giftCards/GiftCardUpdate/GiftCardUpdateInfoCard/GiftCardUpdateInfoCard.tsx index b36c73f04..e29d3ed1d 100644 --- a/src/giftCards/GiftCardUpdate/GiftCardUpdateInfoCard/GiftCardUpdateInfoCard.tsx +++ b/src/giftCards/GiftCardUpdate/GiftCardUpdateInfoCard/GiftCardUpdateInfoCard.tsx @@ -1,6 +1,6 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import Skeleton from "@dashboard/components/Skeleton"; import { Card, CardContent } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import Skeleton from "@saleor/components/Skeleton"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/giftCards/GiftCardUpdate/GiftCardUpdateInfoCard/GiftCardUpdateInfoCardContent.tsx b/src/giftCards/GiftCardUpdate/GiftCardUpdateInfoCard/GiftCardUpdateInfoCardContent.tsx index 1fbd37b05..38877c387 100644 --- a/src/giftCards/GiftCardUpdate/GiftCardUpdateInfoCard/GiftCardUpdateInfoCardContent.tsx +++ b/src/giftCards/GiftCardUpdate/GiftCardUpdateInfoCard/GiftCardUpdateInfoCardContent.tsx @@ -1,16 +1,16 @@ +import { appUrl } 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 Label from "@dashboard/orders/components/OrderHistory/Label"; +import { getOrderNumberLinkObject } from "@dashboard/orders/components/OrderHistory/utils"; +import { getByType } from "@dashboard/orders/components/OrderReturnPage/utils"; +import { productUrl } from "@dashboard/products/urls"; +import { staffMemberDetailsUrl } from "@dashboard/staff/urls"; import { Typography } from "@material-ui/core"; -import { appUrl } from "@saleor/apps/urls"; -import CardSpacer from "@saleor/components/CardSpacer"; -import Link from "@saleor/components/Link"; -import { customerUrl } from "@saleor/customers/urls"; -import { GiftCardEventsEnum } from "@saleor/graphql"; -import useDateLocalize from "@saleor/hooks/useDateLocalize"; -import { getFullName, getStringOrPlaceholder } from "@saleor/misc"; -import Label from "@saleor/orders/components/OrderHistory/Label"; -import { getOrderNumberLinkObject } from "@saleor/orders/components/OrderHistory/utils"; -import { getByType } from "@saleor/orders/components/OrderReturnPage/utils"; -import { productUrl } from "@saleor/products/urls"; -import { staffMemberDetailsUrl } from "@saleor/staff/urls"; import React from "react"; import { MessageDescriptor, useIntl } from "react-intl"; diff --git a/src/giftCards/GiftCardUpdate/GiftCardUpdatePage.tsx b/src/giftCards/GiftCardUpdate/GiftCardUpdatePage.tsx index 219462bd8..d66aa07ac 100644 --- a/src/giftCards/GiftCardUpdate/GiftCardUpdatePage.tsx +++ b/src/giftCards/GiftCardUpdate/GiftCardUpdatePage.tsx @@ -1,9 +1,9 @@ -import CardSpacer from "@saleor/components/CardSpacer"; -import Container from "@saleor/components/Container"; -import Grid from "@saleor/components/Grid"; -import Metadata from "@saleor/components/Metadata"; -import Savebar from "@saleor/components/Savebar"; -import useNavigator from "@saleor/hooks/useNavigator"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import Container from "@dashboard/components/Container"; +import Grid from "@dashboard/components/Grid"; +import Metadata from "@dashboard/components/Metadata"; +import Savebar from "@dashboard/components/Savebar"; +import useNavigator from "@dashboard/hooks/useNavigator"; import React from "react"; import { giftCardsListPath } from "../urls"; diff --git a/src/giftCards/GiftCardUpdate/GiftCardUpdatePageHeader/GiftCardEnableDisableSection.tsx b/src/giftCards/GiftCardUpdate/GiftCardUpdatePageHeader/GiftCardEnableDisableSection.tsx index a49254ce9..c4fb9f84b 100644 --- a/src/giftCards/GiftCardUpdate/GiftCardUpdatePageHeader/GiftCardEnableDisableSection.tsx +++ b/src/giftCards/GiftCardUpdate/GiftCardUpdatePageHeader/GiftCardEnableDisableSection.tsx @@ -1,4 +1,4 @@ -import { commonMessages } from "@saleor/intl"; +import { commonMessages } from "@dashboard/intl"; import { ConfirmButton } from "@saleor/macaw-ui"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/giftCards/GiftCardUpdate/GiftCardUpdatePageHeader/GiftCardUpdatePageHeader.tsx b/src/giftCards/GiftCardUpdate/GiftCardUpdatePageHeader/GiftCardUpdatePageHeader.tsx index e91c8b612..7356fb350 100644 --- a/src/giftCards/GiftCardUpdate/GiftCardUpdatePageHeader/GiftCardUpdatePageHeader.tsx +++ b/src/giftCards/GiftCardUpdate/GiftCardUpdatePageHeader/GiftCardUpdatePageHeader.tsx @@ -1,11 +1,11 @@ -import HorizontalSpacer from "@saleor/apps/components/HorizontalSpacer"; -import { Backlink } from "@saleor/components/Backlink"; -import { Button } from "@saleor/components/Button"; -import PageHeader from "@saleor/components/PageHeader"; -import GiftCardStatusChip from "@saleor/giftCards/components/GiftCardStatusChip/GiftCardStatusChip"; -import { giftCardsListPath } from "@saleor/giftCards/urls"; -import { sectionNames } from "@saleor/intl"; -import { getStringOrPlaceholder } from "@saleor/misc"; +import HorizontalSpacer from "@dashboard/apps/components/HorizontalSpacer"; +import { Backlink } from "@dashboard/components/Backlink"; +import { Button } from "@dashboard/components/Button"; +import PageHeader from "@dashboard/components/PageHeader"; +import GiftCardStatusChip from "@dashboard/giftCards/components/GiftCardStatusChip/GiftCardStatusChip"; +import { giftCardsListPath } from "@dashboard/giftCards/urls"; +import { sectionNames } from "@dashboard/intl"; +import { getStringOrPlaceholder } from "@dashboard/misc"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/giftCards/GiftCardUpdate/GiftCardUpdatePageHeader/hooks/useGiftCardActivateToggle.ts b/src/giftCards/GiftCardUpdate/GiftCardUpdatePageHeader/hooks/useGiftCardActivateToggle.ts index 644838fab..41fdda854 100644 --- a/src/giftCards/GiftCardUpdate/GiftCardUpdatePageHeader/hooks/useGiftCardActivateToggle.ts +++ b/src/giftCards/GiftCardUpdate/GiftCardUpdatePageHeader/hooks/useGiftCardActivateToggle.ts @@ -1,9 +1,9 @@ import { useGiftCardActivateMutation, useGiftCardDeactivateMutation, -} from "@saleor/graphql"; -import useNotifier from "@saleor/hooks/useNotifier"; -import commonErrorMessages from "@saleor/utils/errors/common"; +} from "@dashboard/graphql"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import commonErrorMessages from "@dashboard/utils/errors/common"; import { useIntl } from "react-intl"; import { GIFT_CARD_DETAILS_QUERY } from "../../queries"; diff --git a/src/giftCards/GiftCardUpdate/messages.ts b/src/giftCards/GiftCardUpdate/messages.ts index d9db2aa33..d918c91be 100644 --- a/src/giftCards/GiftCardUpdate/messages.ts +++ b/src/giftCards/GiftCardUpdate/messages.ts @@ -1,7 +1,7 @@ -import { GiftCardErrorCode, GiftCardErrorFragment } from "@saleor/graphql"; +import { GiftCardErrorCode, GiftCardErrorFragment } from "@dashboard/graphql"; import commonErrorMessages, { getCommonFormFieldErrorMessage, -} from "@saleor/utils/errors/common"; +} from "@dashboard/utils/errors/common"; import { defineMessages, IntlShape } from "react-intl"; export const giftCardUpdateDetailsCardMessages = defineMessages({ diff --git a/src/giftCards/GiftCardUpdate/providers/GiftCardDetailsProvider/GiftCardDetailsProvider.tsx b/src/giftCards/GiftCardUpdate/providers/GiftCardDetailsProvider/GiftCardDetailsProvider.tsx index 97e4b9879..db5d13f86 100644 --- a/src/giftCards/GiftCardUpdate/providers/GiftCardDetailsProvider/GiftCardDetailsProvider.tsx +++ b/src/giftCards/GiftCardUpdate/providers/GiftCardDetailsProvider/GiftCardDetailsProvider.tsx @@ -1,4 +1,7 @@ -import { GiftCardDetailsQuery, useGiftCardDetailsQuery } from "@saleor/graphql"; +import { + GiftCardDetailsQuery, + useGiftCardDetailsQuery, +} from "@dashboard/graphql"; import React, { createContext } from "react"; import { ExtendedGiftCard } from "./types"; diff --git a/src/giftCards/GiftCardUpdate/providers/GiftCardUpdateDialogsProvider/GiftCardUpdateDialogsProvider.tsx b/src/giftCards/GiftCardUpdate/providers/GiftCardUpdateDialogsProvider/GiftCardUpdateDialogsProvider.tsx index bc19241b8..1ccc6ced5 100644 --- a/src/giftCards/GiftCardUpdate/providers/GiftCardUpdateDialogsProvider/GiftCardUpdateDialogsProvider.tsx +++ b/src/giftCards/GiftCardUpdate/providers/GiftCardUpdateDialogsProvider/GiftCardUpdateDialogsProvider.tsx @@ -1,7 +1,7 @@ -import GiftCardUpdatePageDeleteDialog from "@saleor/giftCards/components/GiftCardDeleteDialog/GiftCardUpdatePageDeleteDialog"; -import { giftCardsListPath, giftCardUrl } from "@saleor/giftCards/urls"; -import useNavigator from "@saleor/hooks/useNavigator"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; +import GiftCardUpdatePageDeleteDialog from "@dashboard/giftCards/components/GiftCardDeleteDialog/GiftCardUpdatePageDeleteDialog"; +import { giftCardsListPath, giftCardUrl } from "@dashboard/giftCards/urls"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; import React, { createContext } from "react"; import GiftCardResendCodeDialog from "../../GiftCardResendCodeDialog"; diff --git a/src/giftCards/GiftCardUpdate/providers/GiftCardUpdateFormProvider/GiftCardUpdateFormProvider.tsx b/src/giftCards/GiftCardUpdate/providers/GiftCardUpdateFormProvider/GiftCardUpdateFormProvider.tsx index 908d91055..eefa91383 100644 --- a/src/giftCards/GiftCardUpdate/providers/GiftCardUpdateFormProvider/GiftCardUpdateFormProvider.tsx +++ b/src/giftCards/GiftCardUpdate/providers/GiftCardUpdateFormProvider/GiftCardUpdateFormProvider.tsx @@ -1,22 +1,22 @@ -import { MetadataFormData } from "@saleor/components/Metadata"; -import { giftCardUpdateFormMessages } from "@saleor/giftCards/GiftCardsList/messages"; +import { MetadataFormData } from "@dashboard/components/Metadata"; +import { giftCardUpdateFormMessages } from "@dashboard/giftCards/GiftCardsList/messages"; import { GiftCardErrorFragment, GiftCardUpdateMutation, useGiftCardUpdateMutation, useUpdateMetadataMutation, useUpdatePrivateMetadataMutation, -} from "@saleor/graphql"; -import { MutationResultWithOpts } from "@saleor/hooks/makeMutation"; -import useForm, { FormChange, UseFormResult } from "@saleor/hooks/useForm"; -import useHandleFormSubmit from "@saleor/hooks/useHandleFormSubmit"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { getDefaultNotifierSuccessErrorData } from "@saleor/hooks/useNotifier/utils"; -import { getFormErrors } from "@saleor/utils/errors"; -import createMetadataUpdateHandler from "@saleor/utils/handlers/metadataUpdateHandler"; -import { mapMetadataItemToInput } from "@saleor/utils/maps"; -import getMetadata from "@saleor/utils/metadata/getMetadata"; -import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger"; +} from "@dashboard/graphql"; +import { MutationResultWithOpts } from "@dashboard/hooks/makeMutation"; +import useForm, { FormChange, UseFormResult } from "@dashboard/hooks/useForm"; +import useHandleFormSubmit from "@dashboard/hooks/useHandleFormSubmit"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { getDefaultNotifierSuccessErrorData } from "@dashboard/hooks/useNotifier/utils"; +import { getFormErrors } from "@dashboard/utils/errors"; +import createMetadataUpdateHandler from "@dashboard/utils/handlers/metadataUpdateHandler"; +import { mapMetadataItemToInput } from "@dashboard/utils/maps"; +import getMetadata from "@dashboard/utils/metadata/getMetadata"; +import useMetadataChangeTrigger from "@dashboard/utils/metadata/useMetadataChangeTrigger"; import difference from "lodash/difference"; import React, { createContext } from "react"; import { useIntl } from "react-intl"; diff --git a/src/giftCards/GiftCardUpdate/providers/GiftCardUpdateFormProvider/hooks/useGiftCardUpdateForm.ts b/src/giftCards/GiftCardUpdate/providers/GiftCardUpdateFormProvider/hooks/useGiftCardUpdateForm.ts index f1cc22d4f..d15a2854a 100644 --- a/src/giftCards/GiftCardUpdate/providers/GiftCardUpdateFormProvider/hooks/useGiftCardUpdateForm.ts +++ b/src/giftCards/GiftCardUpdate/providers/GiftCardUpdateFormProvider/hooks/useGiftCardUpdateForm.ts @@ -1,4 +1,4 @@ -import { UseFormResult } from "@saleor/hooks/useForm"; +import { UseFormResult } from "@dashboard/hooks/useForm"; import omit from "lodash/omit"; import { useContext } from "react"; diff --git a/src/giftCards/GiftCardUpdate/types.ts b/src/giftCards/GiftCardUpdate/types.ts index cef6ef5fa..a2f72141b 100644 --- a/src/giftCards/GiftCardUpdate/types.ts +++ b/src/giftCards/GiftCardUpdate/types.ts @@ -1,4 +1,4 @@ -import { Dialog } from "@saleor/types"; +import { Dialog } from "@dashboard/types"; export enum GiftCardUpdatePageActionParamsEnum { SET_BALANCE = "set-balance", diff --git a/src/giftCards/GiftCardsList/GiftCardListPage.tsx b/src/giftCards/GiftCardsList/GiftCardListPage.tsx index bcc67c8a6..df7237c7d 100644 --- a/src/giftCards/GiftCardsList/GiftCardListPage.tsx +++ b/src/giftCards/GiftCardsList/GiftCardListPage.tsx @@ -1,5 +1,5 @@ -import VerticalSpacer from "@saleor/apps/components/VerticalSpacer"; -import Container from "@saleor/components/Container"; +import VerticalSpacer from "@dashboard/apps/components/VerticalSpacer"; +import Container from "@dashboard/components/Container"; import React from "react"; import GiftCardsListHeader from "./GiftCardsListHeader"; diff --git a/src/giftCards/GiftCardsList/GiftCardListSearchAndFilters/GiftCardListSearchAndFilters.tsx b/src/giftCards/GiftCardsList/GiftCardListSearchAndFilters/GiftCardListSearchAndFilters.tsx index 550f4d0ff..f3708ec13 100644 --- a/src/giftCards/GiftCardsList/GiftCardListSearchAndFilters/GiftCardListSearchAndFilters.tsx +++ b/src/giftCards/GiftCardsList/GiftCardListSearchAndFilters/GiftCardListSearchAndFilters.tsx @@ -1,19 +1,19 @@ -import DeleteFilterTabDialog from "@saleor/components/DeleteFilterTabDialog"; -import FilterBar from "@saleor/components/FilterBar"; +import DeleteFilterTabDialog from "@dashboard/components/DeleteFilterTabDialog"; +import FilterBar from "@dashboard/components/FilterBar"; import SaveFilterTabDialog, { SaveFilterTabDialogFormData, -} from "@saleor/components/SaveFilterTabDialog"; -import { DEFAULT_INITIAL_SEARCH_DATA } from "@saleor/config"; -import { giftCardListUrl } from "@saleor/giftCards/urls"; -import { useGiftCardCurrenciesQuery } from "@saleor/graphql"; -import { getSearchFetchMoreProps } from "@saleor/hooks/makeTopLevelSearch/utils"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { maybe } from "@saleor/misc"; -import useCustomerSearch from "@saleor/searches/useCustomerSearch"; -import useGiftCardTagsSearch from "@saleor/searches/useGiftCardTagsSearch"; -import useProductSearch from "@saleor/searches/useProductSearch"; -import createFilterHandlers from "@saleor/utils/handlers/filterHandlers"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/components/SaveFilterTabDialog"; +import { DEFAULT_INITIAL_SEARCH_DATA } from "@dashboard/config"; +import { giftCardListUrl } from "@dashboard/giftCards/urls"; +import { useGiftCardCurrenciesQuery } from "@dashboard/graphql"; +import { getSearchFetchMoreProps } from "@dashboard/hooks/makeTopLevelSearch/utils"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { maybe } from "@dashboard/misc"; +import useCustomerSearch from "@dashboard/searches/useCustomerSearch"; +import useGiftCardTagsSearch from "@dashboard/searches/useGiftCardTagsSearch"; +import useProductSearch from "@dashboard/searches/useProductSearch"; +import createFilterHandlers from "@dashboard/utils/handlers/filterHandlers"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import compact from "lodash/compact"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/giftCards/GiftCardsList/GiftCardListSearchAndFilters/filters.ts b/src/giftCards/GiftCardsList/GiftCardListSearchAndFilters/filters.ts index fe482dea9..c9f3bd07b 100644 --- a/src/giftCards/GiftCardsList/GiftCardListSearchAndFilters/filters.ts +++ b/src/giftCards/GiftCardsList/GiftCardListSearchAndFilters/filters.ts @@ -1,10 +1,10 @@ -import { FilterElement, IFilter } from "@saleor/components/Filter"; +import { FilterElement, IFilter } from "@dashboard/components/Filter"; import { GiftCardFilterInput, SearchCustomersQuery, SearchProductsQuery, -} from "@saleor/graphql"; -import { RelayToFlat } from "@saleor/types"; +} from "@dashboard/graphql"; +import { RelayToFlat } from "@dashboard/types"; import { createFilterTabUtils, createFilterUtils, @@ -12,17 +12,17 @@ import { getMinMaxQueryParam, getMultipleValueQueryParam, getSingleValueQueryParam, -} from "@saleor/utils/filters"; +} from "@dashboard/utils/filters"; import { createAutocompleteField, createNumberField, createOptionsField, -} from "@saleor/utils/filters/fields"; +} from "@dashboard/utils/filters/fields"; import { mapNodeToChoice, mapPersonNodeToChoice, mapSingleValueNodeToChoice, -} from "@saleor/utils/maps"; +} from "@dashboard/utils/maps"; import { defineMessages, IntlShape } from "react-intl"; import { GiftCardListUrlQueryParams } from "../types"; diff --git a/src/giftCards/GiftCardsList/GiftCardListSearchAndFilters/types.ts b/src/giftCards/GiftCardsList/GiftCardListSearchAndFilters/types.ts index fba72e673..4a2bf0d2b 100644 --- a/src/giftCards/GiftCardsList/GiftCardListSearchAndFilters/types.ts +++ b/src/giftCards/GiftCardsList/GiftCardListSearchAndFilters/types.ts @@ -7,7 +7,7 @@ import { MinMax, Search, SearchProps, -} from "@saleor/types"; +} from "@dashboard/types"; export enum GiftCardListUrlFiltersEnum { currency = "currency", diff --git a/src/giftCards/GiftCardsList/GiftCardsListHeader/GiftCardsListHeader.tsx b/src/giftCards/GiftCardsList/GiftCardsListHeader/GiftCardsListHeader.tsx index 7700801c9..017d35a70 100644 --- a/src/giftCards/GiftCardsList/GiftCardsListHeader/GiftCardsListHeader.tsx +++ b/src/giftCards/GiftCardsList/GiftCardsListHeader/GiftCardsListHeader.tsx @@ -1,9 +1,9 @@ -import HorizontalSpacer from "@saleor/apps/components/HorizontalSpacer"; -import { Button } from "@saleor/components/Button"; -import CardMenu, { CardMenuItem } from "@saleor/components/CardMenu"; -import PageHeader from "@saleor/components/PageHeader"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { sectionNames } from "@saleor/intl"; +import HorizontalSpacer from "@dashboard/apps/components/HorizontalSpacer"; +import { Button } from "@dashboard/components/Button"; +import CardMenu, { CardMenuItem } from "@dashboard/components/CardMenu"; +import PageHeader from "@dashboard/components/PageHeader"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { sectionNames } from "@dashboard/intl"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/giftCards/GiftCardsList/GiftCardsListHeader/GiftCardsListHeaderAlert.tsx b/src/giftCards/GiftCardsList/GiftCardsListHeader/GiftCardsListHeaderAlert.tsx index 95f6de140..63edd103a 100644 --- a/src/giftCards/GiftCardsList/GiftCardsListHeader/GiftCardsListHeaderAlert.tsx +++ b/src/giftCards/GiftCardsList/GiftCardsListHeader/GiftCardsListHeaderAlert.tsx @@ -1,4 +1,4 @@ -import { useGiftCardProductsCountQuery } from "@saleor/graphql"; +import { useGiftCardProductsCountQuery } from "@dashboard/graphql"; import { Alert } from "@saleor/macaw-ui"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/giftCards/GiftCardsList/GiftCardsListHeader/GiftCardsListHeaderAlertContent.tsx b/src/giftCards/GiftCardsList/GiftCardsListHeader/GiftCardsListHeaderAlertContent.tsx index 0ca2d4100..23163f32f 100644 --- a/src/giftCards/GiftCardsList/GiftCardsListHeader/GiftCardsListHeaderAlertContent.tsx +++ b/src/giftCards/GiftCardsList/GiftCardsListHeader/GiftCardsListHeaderAlertContent.tsx @@ -1,7 +1,7 @@ -import Link from "@saleor/components/Link"; -import { ProductTypeKindEnum } from "@saleor/graphql"; -import { productAddUrl } from "@saleor/products/urls"; -import { productTypeAddUrl } from "@saleor/productTypes/urls"; +import Link from "@dashboard/components/Link"; +import { ProductTypeKindEnum } from "@dashboard/graphql"; +import { productAddUrl } from "@dashboard/products/urls"; +import { productTypeAddUrl } from "@dashboard/productTypes/urls"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/giftCards/GiftCardsList/GiftCardsListOrderInfoCard/GiftCardsListOrderInfoCard.tsx b/src/giftCards/GiftCardsList/GiftCardsListOrderInfoCard/GiftCardsListOrderInfoCard.tsx index 7ae6ea915..b530dd59f 100644 --- a/src/giftCards/GiftCardsList/GiftCardsListOrderInfoCard/GiftCardsListOrderInfoCard.tsx +++ b/src/giftCards/GiftCardsList/GiftCardsListOrderInfoCard/GiftCardsListOrderInfoCard.tsx @@ -1,7 +1,7 @@ +import Link from "@dashboard/components/Link"; +import { orderGiftCardBoughtPath } from "@dashboard/orders/urls"; import { Typography } from "@material-ui/core"; -import Link from "@saleor/components/Link"; import { Alert } from "@saleor/macaw-ui"; -import { orderGiftCardBoughtPath } from "@saleor/orders/urls"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/giftCards/GiftCardsList/GiftCardsListTable/GiftCardsListTable.tsx b/src/giftCards/GiftCardsList/GiftCardsListTable/GiftCardsListTable.tsx index a70db746d..de297f56e 100644 --- a/src/giftCards/GiftCardsList/GiftCardsListTable/GiftCardsListTable.tsx +++ b/src/giftCards/GiftCardsList/GiftCardsListTable/GiftCardsListTable.tsx @@ -1,21 +1,21 @@ +import HorizontalSpacer from "@dashboard/apps/components/HorizontalSpacer"; +import Checkbox from "@dashboard/components/Checkbox"; +import DeleteIconButton from "@dashboard/components/DeleteIconButton"; +import Link from "@dashboard/components/Link"; +import Money from "@dashboard/components/Money"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import { TableButtonWrapper } from "@dashboard/components/TableButtonWrapper/TableButtonWrapper"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { customerUrl } from "@dashboard/customers/urls"; +import GiftCardStatusChip from "@dashboard/giftCards/components/GiftCardStatusChip/GiftCardStatusChip"; +import { PLACEHOLDER } from "@dashboard/giftCards/GiftCardUpdate/types"; +import { giftCardListUrl, giftCardUrl } from "@dashboard/giftCards/urls"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { renderCollection } from "@dashboard/misc"; +import { productUrl } from "@dashboard/products/urls"; import { Card, TableBody, TableCell, Typography } from "@material-ui/core"; -import HorizontalSpacer from "@saleor/apps/components/HorizontalSpacer"; -import Checkbox from "@saleor/components/Checkbox"; -import DeleteIconButton from "@saleor/components/DeleteIconButton"; -import Link from "@saleor/components/Link"; -import Money from "@saleor/components/Money"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import { TableButtonWrapper } from "@saleor/components/TableButtonWrapper/TableButtonWrapper"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { customerUrl } from "@saleor/customers/urls"; -import GiftCardStatusChip from "@saleor/giftCards/components/GiftCardStatusChip/GiftCardStatusChip"; -import { PLACEHOLDER } from "@saleor/giftCards/GiftCardUpdate/types"; -import { giftCardListUrl, giftCardUrl } from "@saleor/giftCards/urls"; -import useNavigator from "@saleor/hooks/useNavigator"; import { PillLink } from "@saleor/macaw-ui"; -import { renderCollection } from "@saleor/misc"; -import { productUrl } from "@saleor/products/urls"; import React, { useEffect } from "react"; import { FormattedMessage, useIntl } from "react-intl"; import { Link as RouterLink } from "react-router-dom"; diff --git a/src/giftCards/GiftCardsList/GiftCardsListTable/GiftCardsListTableFooter.tsx b/src/giftCards/GiftCardsList/GiftCardsListTable/GiftCardsListTableFooter.tsx index e7b0c3ddb..94fc39f8a 100644 --- a/src/giftCards/GiftCardsList/GiftCardsListTable/GiftCardsListTableFooter.tsx +++ b/src/giftCards/GiftCardsList/GiftCardsListTable/GiftCardsListTableFooter.tsx @@ -1,7 +1,7 @@ +import TablePagination from "@dashboard/components/TablePagination"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import usePaginator from "@dashboard/hooks/usePaginator"; import { TableFooter } from "@material-ui/core"; -import TablePagination from "@saleor/components/TablePagination"; -import TableRowLink from "@saleor/components/TableRowLink"; -import usePaginator from "@saleor/hooks/usePaginator"; import React from "react"; import { useGiftCardList } from "../providers/GiftCardListProvider"; diff --git a/src/giftCards/GiftCardsList/GiftCardsListTable/GiftCardsListTableHeader/BulkEnableDisableSection.tsx b/src/giftCards/GiftCardsList/GiftCardsListTable/GiftCardsListTableHeader/BulkEnableDisableSection.tsx index 4635493f9..4b211fd61 100644 --- a/src/giftCards/GiftCardsList/GiftCardsListTable/GiftCardsListTableHeader/BulkEnableDisableSection.tsx +++ b/src/giftCards/GiftCardsList/GiftCardsListTable/GiftCardsListTableHeader/BulkEnableDisableSection.tsx @@ -1,11 +1,11 @@ -import ConfirmButton from "@saleor/components/ConfirmButton"; -import { IMessage } from "@saleor/components/messages"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import { IMessage } from "@dashboard/components/messages"; import { useGiftCardBulkActivateMutation, useGiftCardBulkDeactivateMutation, -} from "@saleor/graphql"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { getByIds } from "@saleor/orders/components/OrderReturnPage/utils"; +} from "@dashboard/graphql"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { getByIds } from "@dashboard/orders/components/OrderReturnPage/utils"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/giftCards/GiftCardsList/GiftCardsListTable/GiftCardsListTableHeader/GiftCardsListTableHeader.tsx b/src/giftCards/GiftCardsList/GiftCardsListTable/GiftCardsListTableHeader/GiftCardsListTableHeader.tsx index ec9818cfc..b2a97f295 100644 --- a/src/giftCards/GiftCardsList/GiftCardsListTable/GiftCardsListTableHeader/GiftCardsListTableHeader.tsx +++ b/src/giftCards/GiftCardsList/GiftCardsListTable/GiftCardsListTableHeader/GiftCardsListTableHeader.tsx @@ -1,16 +1,16 @@ -import { TableCell } from "@material-ui/core"; -import DeleteIconButton from "@saleor/components/DeleteIconButton"; +import DeleteIconButton from "@dashboard/components/DeleteIconButton"; import TableCellHeader, { TableCellHeaderArrowDirection, TableCellHeaderProps, -} from "@saleor/components/TableCellHeader"; -import TableHead from "@saleor/components/TableHead"; -import TooltipTableCellHeader from "@saleor/components/TooltipTableCellHeader"; -import { commonTooltipMessages } from "@saleor/components/TooltipTableCellHeader/messages"; +} from "@dashboard/components/TableCellHeader"; +import TableHead from "@dashboard/components/TableHead"; +import TooltipTableCellHeader from "@dashboard/components/TooltipTableCellHeader"; +import { commonTooltipMessages } from "@dashboard/components/TooltipTableCellHeader/messages"; import Label, { LabelSizes, -} from "@saleor/orders/components/OrderHistory/Label"; -import { getArrowDirection } from "@saleor/utils/sort"; +} from "@dashboard/orders/components/OrderHistory/Label"; +import { getArrowDirection } from "@dashboard/utils/sort"; +import { TableCell } from "@material-ui/core"; import React from "react"; import { MessageDescriptor, useIntl } from "react-intl"; diff --git a/src/giftCards/GiftCardsList/GiftCardsListTable/utils.ts b/src/giftCards/GiftCardsList/GiftCardsListTable/utils.ts index 906754cd1..ede6a0072 100644 --- a/src/giftCards/GiftCardsList/GiftCardsListTable/utils.ts +++ b/src/giftCards/GiftCardsList/GiftCardsListTable/utils.ts @@ -1,5 +1,5 @@ -import { PLACEHOLDER } from "@saleor/giftCards/GiftCardUpdate/types"; -import { GiftCardDataFragment } from "@saleor/graphql"; +import { PLACEHOLDER } from "@dashboard/giftCards/GiftCardUpdate/types"; +import { GiftCardDataFragment } from "@dashboard/graphql"; export const getTagCellText = (tags: GiftCardDataFragment["tags"]) => { if (!!tags.length) { diff --git a/src/giftCards/GiftCardsList/providers/GiftCardListDialogsProvider/GiftCardListDialogsProvider.tsx b/src/giftCards/GiftCardsList/providers/GiftCardListDialogsProvider/GiftCardListDialogsProvider.tsx index 7a397128a..2ed8cd4ca 100644 --- a/src/giftCards/GiftCardsList/providers/GiftCardListDialogsProvider/GiftCardListDialogsProvider.tsx +++ b/src/giftCards/GiftCardsList/providers/GiftCardListDialogsProvider/GiftCardListDialogsProvider.tsx @@ -1,11 +1,11 @@ +import GiftCardListPageDeleteDialog from "@dashboard/giftCards/components/GiftCardDeleteDialog/GiftCardListPageDeleteDialog"; +import GiftCardBulkCreateDialog from "@dashboard/giftCards/GiftCardBulkCreateDialog"; +import GiftCardCreateDialogContent from "@dashboard/giftCards/GiftCardCreateDialog"; +import GiftCardExportDialogContent from "@dashboard/giftCards/GiftCardExportDialogContent"; +import { giftCardListUrl } from "@dashboard/giftCards/urls"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; import { Dialog } from "@material-ui/core"; -import GiftCardListPageDeleteDialog from "@saleor/giftCards/components/GiftCardDeleteDialog/GiftCardListPageDeleteDialog"; -import GiftCardBulkCreateDialog from "@saleor/giftCards/GiftCardBulkCreateDialog"; -import GiftCardCreateDialogContent from "@saleor/giftCards/GiftCardCreateDialog"; -import GiftCardExportDialogContent from "@saleor/giftCards/GiftCardExportDialogContent"; -import { giftCardListUrl } from "@saleor/giftCards/urls"; -import useNavigator from "@saleor/hooks/useNavigator"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; import React, { createContext, useContext } from "react"; import { GIFT_CARD_LIST_QUERY } from "../../queries"; diff --git a/src/giftCards/GiftCardsList/providers/GiftCardListProvider/GiftCardListProvider.tsx b/src/giftCards/GiftCardsList/providers/GiftCardListProvider/GiftCardListProvider.tsx index 2b4a9bcdd..36df322d4 100644 --- a/src/giftCards/GiftCardsList/providers/GiftCardListProvider/GiftCardListProvider.tsx +++ b/src/giftCards/GiftCardsList/providers/GiftCardListProvider/GiftCardListProvider.tsx @@ -1,30 +1,30 @@ import { ApolloError } from "@apollo/client"; -import { ExtendedGiftCard } from "@saleor/giftCards/GiftCardUpdate/providers/GiftCardDetailsProvider/types"; -import { getExtendedGiftCard } from "@saleor/giftCards/GiftCardUpdate/providers/GiftCardDetailsProvider/utils"; -import { giftCardListUrl } from "@saleor/giftCards/urls"; +import { ExtendedGiftCard } from "@dashboard/giftCards/GiftCardUpdate/providers/GiftCardDetailsProvider/types"; +import { getExtendedGiftCard } from "@dashboard/giftCards/GiftCardUpdate/providers/GiftCardDetailsProvider/utils"; +import { giftCardListUrl } from "@dashboard/giftCards/urls"; import { GiftCardListQuery, GiftCardListQueryVariables, useGiftCardListQuery, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import useBulkActions, { UseBulkActionsProps, -} from "@saleor/hooks/useBulkActions"; +} from "@dashboard/hooks/useBulkActions"; import useListSettings, { UseListSettings, -} from "@saleor/hooks/useListSettings"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; +} from "@dashboard/hooks/useListSettings"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { usePaginationReset } from "@dashboard/hooks/usePaginationReset"; import { createPaginationState, PageInfo, PaginationState, -} from "@saleor/hooks/usePaginator"; -import { ListViews, SortPage } from "@saleor/types"; -import createSortHandler from "@saleor/utils/handlers/sortHandler"; -import { mapEdgesToItems } from "@saleor/utils/maps"; -import { getSortParams } from "@saleor/utils/sort"; +} from "@dashboard/hooks/usePaginator"; +import { ListViews, SortPage } from "@dashboard/types"; +import createSortHandler from "@dashboard/utils/handlers/sortHandler"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; +import { getSortParams } from "@dashboard/utils/sort"; import React, { createContext, useContext } from "react"; import { getFilterVariables } from "../../GiftCardListSearchAndFilters/filters"; diff --git a/src/giftCards/GiftCardsList/providers/GiftCardListProvider/sort.ts b/src/giftCards/GiftCardsList/providers/GiftCardListProvider/sort.ts index efaf6c0de..82c0558ff 100644 --- a/src/giftCards/GiftCardsList/providers/GiftCardListProvider/sort.ts +++ b/src/giftCards/GiftCardsList/providers/GiftCardListProvider/sort.ts @@ -1,5 +1,5 @@ -import { GiftCardSortField } from "@saleor/graphql"; -import { createGetSortQueryVariables } from "@saleor/utils/sort"; +import { GiftCardSortField } from "@dashboard/graphql"; +import { createGetSortQueryVariables } from "@dashboard/utils/sort"; import { GiftCardUrlSortField } from "../../types"; diff --git a/src/giftCards/GiftCardsList/types.ts b/src/giftCards/GiftCardsList/types.ts index fff1db68b..5c4a055d9 100644 --- a/src/giftCards/GiftCardsList/types.ts +++ b/src/giftCards/GiftCardsList/types.ts @@ -5,7 +5,7 @@ import { Search, SingleAction, Sort, -} from "@saleor/types"; +} from "@dashboard/types"; import { GiftCardListUrlFilters } from "./GiftCardListSearchAndFilters/types"; diff --git a/src/giftCards/components/GiftCardCustomerCard/CustomerGiftCardsCard.tsx b/src/giftCards/components/GiftCardCustomerCard/CustomerGiftCardsCard.tsx index 7607afc50..546185d71 100644 --- a/src/giftCards/components/GiftCardCustomerCard/CustomerGiftCardsCard.tsx +++ b/src/giftCards/components/GiftCardCustomerCard/CustomerGiftCardsCard.tsx @@ -1,18 +1,18 @@ +import VerticalSpacer from "@dashboard/apps/components/VerticalSpacer"; +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import CollectionWithDividers from "@dashboard/components/CollectionWithDividers"; +import Link from "@dashboard/components/Link"; +import PreviewPill from "@dashboard/components/PreviewPill"; +import Skeleton from "@dashboard/components/Skeleton"; +import { useCustomerDetails } from "@dashboard/customers/hooks/useCustomerDetails"; +import GiftCardCreateDialogContent from "@dashboard/giftCards/GiftCardCreateDialog/GiftCardCreateDialogContent"; +import { getExtendedGiftCard } from "@dashboard/giftCards/GiftCardUpdate/providers/GiftCardDetailsProvider/utils"; +import { giftCardListUrl } from "@dashboard/giftCards/urls"; +import { useCustomerGiftCardListQuery } from "@dashboard/graphql"; +import { getFullName } from "@dashboard/misc"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import { Card, CardActions, Dialog } from "@material-ui/core"; -import VerticalSpacer from "@saleor/apps/components/VerticalSpacer"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import CollectionWithDividers from "@saleor/components/CollectionWithDividers"; -import Link from "@saleor/components/Link"; -import PreviewPill from "@saleor/components/PreviewPill"; -import Skeleton from "@saleor/components/Skeleton"; -import { useCustomerDetails } from "@saleor/customers/hooks/useCustomerDetails"; -import GiftCardCreateDialogContent from "@saleor/giftCards/GiftCardCreateDialog/GiftCardCreateDialogContent"; -import { getExtendedGiftCard } from "@saleor/giftCards/GiftCardUpdate/providers/GiftCardDetailsProvider/utils"; -import { giftCardListUrl } from "@saleor/giftCards/urls"; -import { useCustomerGiftCardListQuery } from "@saleor/graphql"; -import { getFullName } from "@saleor/misc"; -import { mapEdgesToItems } from "@saleor/utils/maps"; import * as React from "react"; import { useState } from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/giftCards/components/GiftCardCustomerCard/CustomerGiftCardsCardListItem.tsx b/src/giftCards/components/GiftCardCustomerCard/CustomerGiftCardsCardListItem.tsx index 9546fc5d5..8492881ff 100644 --- a/src/giftCards/components/GiftCardCustomerCard/CustomerGiftCardsCardListItem.tsx +++ b/src/giftCards/components/GiftCardCustomerCard/CustomerGiftCardsCardListItem.tsx @@ -1,9 +1,9 @@ -import CardMenu, { CardMenuItem } from "@saleor/components/CardMenu"; -import { bulkEnableDisableSectionMessages } from "@saleor/giftCards/GiftCardsList/GiftCardsListTable/GiftCardsListTableHeader/messages"; -import { giftCardsListTableMessages } from "@saleor/giftCards/GiftCardsList/messages"; -import useGiftCardActivateToggle from "@saleor/giftCards/GiftCardUpdate/GiftCardUpdatePageHeader/hooks/useGiftCardActivateToggle"; -import { ExtendedGiftCard } from "@saleor/giftCards/GiftCardUpdate/providers/GiftCardDetailsProvider/types"; -import { CustomerGiftCardFragment } from "@saleor/graphql"; +import CardMenu, { CardMenuItem } from "@dashboard/components/CardMenu"; +import { bulkEnableDisableSectionMessages } from "@dashboard/giftCards/GiftCardsList/GiftCardsListTable/GiftCardsListTableHeader/messages"; +import { giftCardsListTableMessages } from "@dashboard/giftCards/GiftCardsList/messages"; +import useGiftCardActivateToggle from "@dashboard/giftCards/GiftCardUpdate/GiftCardUpdatePageHeader/hooks/useGiftCardActivateToggle"; +import { ExtendedGiftCard } from "@dashboard/giftCards/GiftCardUpdate/providers/GiftCardDetailsProvider/types"; +import { CustomerGiftCardFragment } from "@dashboard/graphql"; import * as React from "react"; import { useState } from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/giftCards/components/GiftCardDeleteDialog/GiftCardDeleteDialogContent.tsx b/src/giftCards/components/GiftCardDeleteDialog/GiftCardDeleteDialogContent.tsx index 1e4b3cfa6..dfddd5f60 100644 --- a/src/giftCards/components/GiftCardDeleteDialog/GiftCardDeleteDialogContent.tsx +++ b/src/giftCards/components/GiftCardDeleteDialog/GiftCardDeleteDialogContent.tsx @@ -1,16 +1,16 @@ +import ActionDialog, { + ActionDialogProps, +} from "@dashboard/components/ActionDialog"; +import DeleteWarningDialogConsentContent from "@dashboard/components/TypeDeleteWarningDialog/DeleteWarningDialogConsentContent"; +import { GiftCardsListConsumerProps } from "@dashboard/giftCards/GiftCardsList/providers/GiftCardListProvider"; +import { ExtendedGiftCard } from "@dashboard/giftCards/GiftCardUpdate/providers/GiftCardDetailsProvider/types"; +import { GiftCardDataFragment } from "@dashboard/graphql"; +import { getById } from "@dashboard/misc"; import { CircularProgress, DialogContentText, Typography, } from "@material-ui/core"; -import ActionDialog, { - ActionDialogProps, -} from "@saleor/components/ActionDialog"; -import DeleteWarningDialogConsentContent from "@saleor/components/TypeDeleteWarningDialog/DeleteWarningDialogConsentContent"; -import { GiftCardsListConsumerProps } from "@saleor/giftCards/GiftCardsList/providers/GiftCardListProvider"; -import { ExtendedGiftCard } from "@saleor/giftCards/GiftCardUpdate/providers/GiftCardDetailsProvider/types"; -import { GiftCardDataFragment } from "@saleor/graphql"; -import { getById } from "@saleor/misc"; import React, { useEffect, useState } from "react"; import { useIntl } from "react-intl"; diff --git a/src/giftCards/components/GiftCardDeleteDialog/GiftCardListPageDeleteDialog.tsx b/src/giftCards/components/GiftCardDeleteDialog/GiftCardListPageDeleteDialog.tsx index ce236268a..e46f8023c 100644 --- a/src/giftCards/components/GiftCardDeleteDialog/GiftCardListPageDeleteDialog.tsx +++ b/src/giftCards/components/GiftCardDeleteDialog/GiftCardListPageDeleteDialog.tsx @@ -1,8 +1,8 @@ -import { ActionDialogProps } from "@saleor/components/ActionDialog"; -import { useGiftCardListDialogs } from "@saleor/giftCards/GiftCardsList/providers/GiftCardListDialogsProvider"; -import { useGiftCardList } from "@saleor/giftCards/GiftCardsList/providers/GiftCardListProvider"; -import { GIFT_CARD_LIST_QUERY } from "@saleor/giftCards/GiftCardsList/queries"; -import { DialogProps } from "@saleor/types"; +import { ActionDialogProps } from "@dashboard/components/ActionDialog"; +import { useGiftCardListDialogs } from "@dashboard/giftCards/GiftCardsList/providers/GiftCardListDialogsProvider"; +import { useGiftCardList } from "@dashboard/giftCards/GiftCardsList/providers/GiftCardListProvider"; +import { GIFT_CARD_LIST_QUERY } from "@dashboard/giftCards/GiftCardsList/queries"; +import { DialogProps } from "@dashboard/types"; import React from "react"; import GiftCardDeleteDialogContent, { diff --git a/src/giftCards/components/GiftCardDeleteDialog/GiftCardUpdatePageDeleteDialog.tsx b/src/giftCards/components/GiftCardDeleteDialog/GiftCardUpdatePageDeleteDialog.tsx index 38027f0a3..58891c0e4 100644 --- a/src/giftCards/components/GiftCardDeleteDialog/GiftCardUpdatePageDeleteDialog.tsx +++ b/src/giftCards/components/GiftCardDeleteDialog/GiftCardUpdatePageDeleteDialog.tsx @@ -1,6 +1,6 @@ -import { GIFT_CARD_LIST_QUERY } from "@saleor/giftCards/GiftCardsList/queries"; -import useGiftCardDetails from "@saleor/giftCards/GiftCardUpdate/providers/GiftCardDetailsProvider/hooks/useGiftCardDetails"; -import { DialogProps } from "@saleor/types"; +import { GIFT_CARD_LIST_QUERY } from "@dashboard/giftCards/GiftCardsList/queries"; +import useGiftCardDetails from "@dashboard/giftCards/GiftCardUpdate/providers/GiftCardDetailsProvider/hooks/useGiftCardDetails"; +import { DialogProps } from "@dashboard/types"; import React from "react"; import GiftCardDeleteDialogContent from "./GiftCardDeleteDialogContent"; diff --git a/src/giftCards/components/GiftCardDeleteDialog/useGiftCardBulkDelete.tsx b/src/giftCards/components/GiftCardDeleteDialog/useGiftCardBulkDelete.tsx index fc4b15c93..f3da2b491 100644 --- a/src/giftCards/components/GiftCardDeleteDialog/useGiftCardBulkDelete.tsx +++ b/src/giftCards/components/GiftCardDeleteDialog/useGiftCardBulkDelete.tsx @@ -1,11 +1,11 @@ -import { useGiftCardList } from "@saleor/giftCards/GiftCardsList/providers/GiftCardListProvider"; +import { useGiftCardList } from "@dashboard/giftCards/GiftCardsList/providers/GiftCardListProvider"; import { BulkDeleteGiftCardMutation, useBulkDeleteGiftCardMutation, -} from "@saleor/graphql"; -import { MutationResultWithOpts } from "@saleor/hooks/makeMutation"; -import useNotifier from "@saleor/hooks/useNotifier"; -import commonErrorMessages from "@saleor/utils/errors/common"; +} from "@dashboard/graphql"; +import { MutationResultWithOpts } from "@dashboard/hooks/makeMutation"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import commonErrorMessages from "@dashboard/utils/errors/common"; import { useIntl } from "react-intl"; import { giftCardDeleteDialogMessages as messages } from "./messages"; diff --git a/src/giftCards/components/GiftCardDeleteDialog/useGiftCardSingleDelete.tsx b/src/giftCards/components/GiftCardDeleteDialog/useGiftCardSingleDelete.tsx index 608ac5c31..63fe1a628 100644 --- a/src/giftCards/components/GiftCardDeleteDialog/useGiftCardSingleDelete.tsx +++ b/src/giftCards/components/GiftCardDeleteDialog/useGiftCardSingleDelete.tsx @@ -1,10 +1,10 @@ -import { getGiftCardErrorMessage } from "@saleor/giftCards/GiftCardUpdate/messages"; +import { getGiftCardErrorMessage } from "@dashboard/giftCards/GiftCardUpdate/messages"; import { DeleteGiftCardMutation, useDeleteGiftCardMutation, -} from "@saleor/graphql"; -import { MutationResultWithOpts } from "@saleor/hooks/makeMutation"; -import useNotifier from "@saleor/hooks/useNotifier"; +} from "@dashboard/graphql"; +import { MutationResultWithOpts } from "@dashboard/hooks/makeMutation"; +import useNotifier from "@dashboard/hooks/useNotifier"; import { useIntl } from "react-intl"; import { giftCardDeleteDialogMessages as messages } from "./messages"; diff --git a/src/giftCards/components/GiftCardSendToCustomer/GiftCardSendToCustomer.tsx b/src/giftCards/components/GiftCardSendToCustomer/GiftCardSendToCustomer.tsx index 75efaf466..6b0cc1b5c 100644 --- a/src/giftCards/components/GiftCardSendToCustomer/GiftCardSendToCustomer.tsx +++ b/src/giftCards/components/GiftCardSendToCustomer/GiftCardSendToCustomer.tsx @@ -1,12 +1,12 @@ -import VerticalSpacer from "@saleor/apps/components/VerticalSpacer"; -import useAppChannel from "@saleor/components/AppLayout/AppChannelContext"; -import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; -import SingleSelectField from "@saleor/components/SingleSelectField"; -import GiftCardCustomerSelectField from "@saleor/giftCards/GiftCardCreateDialog/GiftCardCustomerSelectField"; -import { GiftCardCreateFormCustomer } from "@saleor/giftCards/GiftCardCreateDialog/types"; -import { FormChange } from "@saleor/hooks/useForm"; -import Label from "@saleor/orders/components/OrderHistory/Label"; -import { mapSlugNodeToChoice } from "@saleor/utils/maps"; +import VerticalSpacer from "@dashboard/apps/components/VerticalSpacer"; +import useAppChannel from "@dashboard/components/AppLayout/AppChannelContext"; +import ControlledCheckbox from "@dashboard/components/ControlledCheckbox"; +import SingleSelectField from "@dashboard/components/SingleSelectField"; +import GiftCardCustomerSelectField from "@dashboard/giftCards/GiftCardCreateDialog/GiftCardCustomerSelectField"; +import { GiftCardCreateFormCustomer } from "@dashboard/giftCards/GiftCardCreateDialog/types"; +import { FormChange } from "@dashboard/hooks/useForm"; +import Label from "@dashboard/orders/components/OrderHistory/Label"; +import { mapSlugNodeToChoice } from "@dashboard/utils/maps"; import React, { useEffect } from "react"; import { useIntl } from "react-intl"; diff --git a/src/giftCards/components/GiftCardSettingsExpirySelect/GiftCardSettingsExpirySelect.tsx b/src/giftCards/components/GiftCardSettingsExpirySelect/GiftCardSettingsExpirySelect.tsx index 07a698e37..a43c7d4ae 100644 --- a/src/giftCards/components/GiftCardSettingsExpirySelect/GiftCardSettingsExpirySelect.tsx +++ b/src/giftCards/components/GiftCardSettingsExpirySelect/GiftCardSettingsExpirySelect.tsx @@ -1,12 +1,12 @@ -import { Typography } from "@material-ui/core"; -import VerticalSpacer from "@saleor/apps/components/VerticalSpacer"; -import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; -import { getGiftCardSettingsErrorMessage } from "@saleor/giftCards/GiftCardSettings/messages"; +import VerticalSpacer from "@dashboard/apps/components/VerticalSpacer"; +import ControlledCheckbox from "@dashboard/components/ControlledCheckbox"; +import { getGiftCardSettingsErrorMessage } from "@dashboard/giftCards/GiftCardSettings/messages"; import { GiftCardSettingsErrorFragment, TimePeriodTypeEnum, -} from "@saleor/graphql"; -import { FormChange } from "@saleor/hooks/useForm"; +} from "@dashboard/graphql"; +import { FormChange } from "@dashboard/hooks/useForm"; +import { Typography } from "@material-ui/core"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/giftCards/components/GiftCardStatusChip/GiftCardStatusChip.tsx b/src/giftCards/components/GiftCardStatusChip/GiftCardStatusChip.tsx index d9f09961b..8dd7e68d3 100644 --- a/src/giftCards/components/GiftCardStatusChip/GiftCardStatusChip.tsx +++ b/src/giftCards/components/GiftCardStatusChip/GiftCardStatusChip.tsx @@ -1,7 +1,7 @@ import { ExtendedGiftCard, GiftCardBase, -} from "@saleor/giftCards/GiftCardUpdate/providers/GiftCardDetailsProvider/types"; +} from "@dashboard/giftCards/GiftCardUpdate/providers/GiftCardDetailsProvider/types"; import { Pill } from "@saleor/macaw-ui"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/giftCards/components/GiftCardTagInput/GiftCardTagInput.tsx b/src/giftCards/components/GiftCardTagInput/GiftCardTagInput.tsx index 41da6bad4..b3ef84494 100644 --- a/src/giftCards/components/GiftCardTagInput/GiftCardTagInput.tsx +++ b/src/giftCards/components/GiftCardTagInput/GiftCardTagInput.tsx @@ -1,12 +1,15 @@ -import MultiAutocompleteSelectField from "@saleor/components/MultiAutocompleteSelectField"; -import { SingleAutocompleteSelectFieldProps } from "@saleor/components/SingleAutocompleteSelectField"; -import { DEFAULT_INITIAL_SEARCH_DATA } from "@saleor/config"; -import { GiftCardBulkCreateFormError } from "@saleor/giftCards/GiftCardBulkCreateDialog/types"; -import { getGiftCardErrorMessage } from "@saleor/giftCards/GiftCardUpdate/messages"; -import { FormChange } from "@saleor/hooks/useForm"; -import { commonMessages } from "@saleor/intl"; -import useGiftCardTagsSearch from "@saleor/searches/useGiftCardTagsSearch"; -import { mapEdgesToItems, mapMultiValueNodeToChoice } from "@saleor/utils/maps"; +import MultiAutocompleteSelectField from "@dashboard/components/MultiAutocompleteSelectField"; +import { SingleAutocompleteSelectFieldProps } from "@dashboard/components/SingleAutocompleteSelectField"; +import { DEFAULT_INITIAL_SEARCH_DATA } from "@dashboard/config"; +import { GiftCardBulkCreateFormError } from "@dashboard/giftCards/GiftCardBulkCreateDialog/types"; +import { getGiftCardErrorMessage } from "@dashboard/giftCards/GiftCardUpdate/messages"; +import { FormChange } from "@dashboard/hooks/useForm"; +import { commonMessages } from "@dashboard/intl"; +import useGiftCardTagsSearch from "@dashboard/searches/useGiftCardTagsSearch"; +import { + mapEdgesToItems, + mapMultiValueNodeToChoice, +} from "@dashboard/utils/maps"; import compact from "lodash/compact"; import uniq from "lodash/uniq"; import React from "react"; diff --git a/src/giftCards/components/GiftCardTagInput/utils.ts b/src/giftCards/components/GiftCardTagInput/utils.ts index c1b543749..27cd80b7b 100644 --- a/src/giftCards/components/GiftCardTagInput/utils.ts +++ b/src/giftCards/components/GiftCardTagInput/utils.ts @@ -1,4 +1,4 @@ -import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField"; +import { MultiAutocompleteChoiceType } from "@dashboard/components/MultiAutocompleteSelectField"; export const getMultiChoices = ( values: string[], diff --git a/src/giftCards/components/TimePeriodField/TimePeriodField.tsx b/src/giftCards/components/TimePeriodField/TimePeriodField.tsx index 3e4f9f689..5741d44f2 100644 --- a/src/giftCards/components/TimePeriodField/TimePeriodField.tsx +++ b/src/giftCards/components/TimePeriodField/TimePeriodField.tsx @@ -1,6 +1,6 @@ -import TextWithSelectField from "@saleor/components/TextWithSelectField"; -import { TimePeriodTypeEnum } from "@saleor/graphql"; -import { FormChange } from "@saleor/hooks/useForm"; +import TextWithSelectField from "@dashboard/components/TextWithSelectField"; +import { TimePeriodTypeEnum } from "@dashboard/graphql"; +import { FormChange } from "@dashboard/hooks/useForm"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/giftCards/index.tsx b/src/giftCards/index.tsx index e43f15bf8..7b366d2ba 100644 --- a/src/giftCards/index.tsx +++ b/src/giftCards/index.tsx @@ -1,6 +1,6 @@ -import { WindowTitle } from "@saleor/components/WindowTitle"; -import { sectionNames } from "@saleor/intl"; -import { asSortParams } from "@saleor/utils/sort"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; +import { sectionNames } from "@dashboard/intl"; +import { asSortParams } from "@dashboard/utils/sort"; import { parse as parseQs } from "qs"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/giftCards/urls.ts b/src/giftCards/urls.ts index 8c11f1913..d40124cda 100644 --- a/src/giftCards/urls.ts +++ b/src/giftCards/urls.ts @@ -1,4 +1,4 @@ -import { stringifyQs } from "@saleor/utils/urls"; +import { stringifyQs } from "@dashboard/utils/urls"; import urlJoin from "url-join"; import { GiftCardListUrlQueryParams } from "./GiftCardsList/types"; diff --git a/src/graphql/hooks.generated.ts b/src/graphql/hooks.generated.ts index c0a6420f0..6775278a9 100644 --- a/src/graphql/hooks.generated.ts +++ b/src/graphql/hooks.generated.ts @@ -3,7 +3,7 @@ import * as Types from './types.generated'; import { gql } from '@apollo/client'; import * as Apollo from '@apollo/client'; -import * as ApolloReactHooks from '@saleor/hooks/graphql'; +import * as ApolloReactHooks from '@dashboard/hooks/graphql'; const defaultOptions = {} as const; export const AppManifestFragmentDoc = gql` fragment AppManifest on Manifest { diff --git a/src/home/components/HomeActivityCard/HomeActivityCard.tsx b/src/home/components/HomeActivityCard/HomeActivityCard.tsx index 08d76c850..a063575f5 100644 --- a/src/home/components/HomeActivityCard/HomeActivityCard.tsx +++ b/src/home/components/HomeActivityCard/HomeActivityCard.tsx @@ -1,3 +1,8 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import { DateTime } from "@dashboard/components/Date"; +import Skeleton from "@dashboard/components/Skeleton"; +import { HomeQuery } from "@dashboard/graphql"; +import { RelayToFlat } from "@dashboard/types"; import { Card, List, @@ -5,12 +10,7 @@ import { ListItemText, Typography, } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import { DateTime } from "@saleor/components/Date"; -import Skeleton from "@saleor/components/Skeleton"; -import { HomeQuery } from "@saleor/graphql"; import { makeStyles } from "@saleor/macaw-ui"; -import { RelayToFlat } from "@saleor/types"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/home/components/HomeActivityCard/activityMessages.ts b/src/home/components/HomeActivityCard/activityMessages.ts index 368ab9dd0..695250eb3 100644 --- a/src/home/components/HomeActivityCard/activityMessages.ts +++ b/src/home/components/HomeActivityCard/activityMessages.ts @@ -1,4 +1,4 @@ -import { HomeQuery, OrderEventsEnum } from "@saleor/graphql"; +import { HomeQuery, OrderEventsEnum } from "@dashboard/graphql"; import { defineMessages, IntlShape } from "react-intl"; const messages = defineMessages({ diff --git a/src/home/components/HomeHeader/HomeHeader.tsx b/src/home/components/HomeHeader/HomeHeader.tsx index 798e05fb4..5b98c2f8d 100644 --- a/src/home/components/HomeHeader/HomeHeader.tsx +++ b/src/home/components/HomeHeader/HomeHeader.tsx @@ -1,5 +1,5 @@ +import Skeleton from "@dashboard/components/Skeleton"; import { Typography } from "@material-ui/core"; -import Skeleton from "@saleor/components/Skeleton"; import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/home/components/HomeNotificationTable/HomeNotificationTable.tsx b/src/home/components/HomeNotificationTable/HomeNotificationTable.tsx index 5f42d70a0..d272cea35 100644 --- a/src/home/components/HomeNotificationTable/HomeNotificationTable.tsx +++ b/src/home/components/HomeNotificationTable/HomeNotificationTable.tsx @@ -1,10 +1,10 @@ +import RequirePermissions from "@dashboard/components/RequirePermissions"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { PermissionEnum } from "@dashboard/graphql"; import { Card, TableBody, TableCell, Typography } from "@material-ui/core"; import KeyboardArrowRight from "@material-ui/icons/KeyboardArrowRight"; -import RequirePermissions from "@saleor/components/RequirePermissions"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { PermissionEnum } from "@saleor/graphql"; import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/home/components/HomePage/HomePage.stories.tsx b/src/home/components/HomePage/HomePage.stories.tsx index 1818bd5b1..3e72267b9 100644 --- a/src/home/components/HomePage/HomePage.stories.tsx +++ b/src/home/components/HomePage/HomePage.stories.tsx @@ -1,10 +1,10 @@ import placeholderImage from "@assets/images/placeholder60x60.png"; -import { adminUserPermissions } from "@saleor/fixtures"; -import { PermissionEnum } from "@saleor/graphql"; -import { shop as shopFixture } from "@saleor/home/fixtures"; -import Decorator from "@saleor/storybook/Decorator"; -import { MockedUserProvider } from "@saleor/storybook/MockedUserProvider"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +import { adminUserPermissions } from "@dashboard/fixtures"; +import { PermissionEnum } from "@dashboard/graphql"; +import { shop as shopFixture } from "@dashboard/home/fixtures"; +import Decorator from "@dashboard/storybook/Decorator"; +import { MockedUserProvider } from "@dashboard/storybook/MockedUserProvider"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/home/components/HomePage/HomePage.tsx b/src/home/components/HomePage/HomePage.tsx index 079533d15..09448656f 100644 --- a/src/home/components/HomePage/HomePage.tsx +++ b/src/home/components/HomePage/HomePage.tsx @@ -1,12 +1,12 @@ -import CardSpacer from "@saleor/components/CardSpacer"; -import Container from "@saleor/components/Container"; -import Grid from "@saleor/components/Grid"; -import Money from "@saleor/components/Money"; -import RequirePermissions from "@saleor/components/RequirePermissions"; -import Skeleton from "@saleor/components/Skeleton"; -import { HomeQuery, PermissionEnum } from "@saleor/graphql"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import Container from "@dashboard/components/Container"; +import Grid from "@dashboard/components/Grid"; +import Money from "@dashboard/components/Money"; +import RequirePermissions from "@dashboard/components/RequirePermissions"; +import Skeleton from "@dashboard/components/Skeleton"; +import { HomeQuery, PermissionEnum } from "@dashboard/graphql"; +import { RelayToFlat } from "@dashboard/types"; import { makeStyles } from "@saleor/macaw-ui"; -import { RelayToFlat } from "@saleor/types"; import React from "react"; import Orders from "../../../icons/Orders"; diff --git a/src/home/components/HomeProductListCard/HomeProductListCard.tsx b/src/home/components/HomeProductListCard/HomeProductListCard.tsx index 69cf75d08..23812af09 100644 --- a/src/home/components/HomeProductListCard/HomeProductListCard.tsx +++ b/src/home/components/HomeProductListCard/HomeProductListCard.tsx @@ -1,14 +1,14 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import Money from "@dashboard/components/Money"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableCellAvatar from "@dashboard/components/TableCellAvatar"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { HomeQuery } from "@dashboard/graphql"; +import { productVariantEditUrl } from "@dashboard/products/urls"; +import { RelayToFlat } from "@dashboard/types"; import { Card, TableBody, TableCell, Typography } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import Money from "@saleor/components/Money"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableCellAvatar from "@saleor/components/TableCellAvatar"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { HomeQuery } from "@saleor/graphql"; import { makeStyles } from "@saleor/macaw-ui"; -import { productVariantEditUrl } from "@saleor/products/urls"; -import { RelayToFlat } from "@saleor/types"; import clsx from "clsx"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/home/components/HomeScreen.tsx b/src/home/components/HomeScreen.tsx index dbb5b38f1..718ef9186 100644 --- a/src/home/components/HomeScreen.tsx +++ b/src/home/components/HomeScreen.tsx @@ -1,7 +1,7 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import Container from "@dashboard/components/Container"; +import PageHeader from "@dashboard/components/PageHeader"; import { Card, CardContent, Typography } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import Container from "@saleor/components/Container"; -import PageHeader from "@saleor/components/PageHeader"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/home/fixtures.ts b/src/home/fixtures.ts index 9512f4e28..e80f05b25 100644 --- a/src/home/fixtures.ts +++ b/src/home/fixtures.ts @@ -1,4 +1,4 @@ -import { HomeQuery, OrderEventsEnum } from "@saleor/graphql"; +import { HomeQuery, OrderEventsEnum } from "@dashboard/graphql"; export const shop: (placeholderImage: string) => HomeQuery = ( placeholderImage: string, diff --git a/src/home/views/index.tsx b/src/home/views/index.tsx index b29de931d..0d6da7c13 100644 --- a/src/home/views/index.tsx +++ b/src/home/views/index.tsx @@ -1,12 +1,12 @@ -import { useUser } from "@saleor/auth"; -import { channelsListUrl } from "@saleor/channels/urls"; -import useAppChannel from "@saleor/components/AppLayout/AppChannelContext"; +import { useUser } from "@dashboard/auth"; +import { channelsListUrl } from "@dashboard/channels/urls"; +import useAppChannel from "@dashboard/components/AppLayout/AppChannelContext"; import { OrderStatusFilter, StockAvailability, useHomeQuery, -} from "@saleor/graphql"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/graphql"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import React from "react"; import { getDatePeriod, getUserName } from "../../misc"; diff --git a/src/hooks/makeMutation.ts b/src/hooks/makeMutation.ts index 1b704099a..11be2927c 100644 --- a/src/hooks/makeMutation.ts +++ b/src/hooks/makeMutation.ts @@ -9,12 +9,12 @@ import { handleNestedMutationErrors, showAllErrors, useUser, -} from "@saleor/auth"; -import { isJwtError } from "@saleor/auth/errors"; -import { commonMessages } from "@saleor/intl"; -import { getMutationStatus } from "@saleor/misc"; -import { MutationResultAdditionalProps } from "@saleor/types"; -import { GqlErrors, hasError } from "@saleor/utils/api"; +} from "@dashboard/auth"; +import { isJwtError } from "@dashboard/auth/errors"; +import { commonMessages } from "@dashboard/intl"; +import { getMutationStatus } from "@dashboard/misc"; +import { MutationResultAdditionalProps } from "@dashboard/types"; +import { GqlErrors, hasError } from "@dashboard/utils/api"; import { DocumentNode } from "graphql"; import { useIntl } from "react-intl"; diff --git a/src/hooks/makeQuery.ts b/src/hooks/makeQuery.ts index 4fc8e6172..d1167443d 100644 --- a/src/hooks/makeQuery.ts +++ b/src/hooks/makeQuery.ts @@ -7,13 +7,13 @@ import { QueryResult, useQuery as useBaseQuery, } from "@apollo/client"; -import { handleQueryAuthError, useUser } from "@saleor/auth"; -import { PrefixedPermissions } from "@saleor/graphql/extendedTypes"; +import { handleQueryAuthError, useUser } from "@dashboard/auth"; +import { PrefixedPermissions } from "@dashboard/graphql/extendedTypes"; import { PermissionEnum, UserPermissionFragment, -} from "@saleor/graphql/types.generated"; -import { RequireAtLeastOne } from "@saleor/misc"; +} from "@dashboard/graphql/types.generated"; +import { RequireAtLeastOne } from "@dashboard/misc"; import { DocumentNode } from "graphql"; import { useEffect } from "react"; import { useIntl } from "react-intl"; diff --git a/src/hooks/makeTopLevelSearch/makeTopLevelSearch.ts b/src/hooks/makeTopLevelSearch/makeTopLevelSearch.ts index 4f2765515..b79216ad7 100644 --- a/src/hooks/makeTopLevelSearch/makeTopLevelSearch.ts +++ b/src/hooks/makeTopLevelSearch/makeTopLevelSearch.ts @@ -1,4 +1,4 @@ -import { PageInfoFragment } from "@saleor/graphql"; +import { PageInfoFragment } from "@dashboard/graphql"; import { DocumentNode } from "graphql"; import makeSearch, { SearchVariables, UseSearchHook } from "../makeSearch"; diff --git a/src/hooks/makeTopLevelSearch/utils.ts b/src/hooks/makeTopLevelSearch/utils.ts index fff7413f7..37e02e2e2 100644 --- a/src/hooks/makeTopLevelSearch/utils.ts +++ b/src/hooks/makeTopLevelSearch/utils.ts @@ -1,5 +1,5 @@ -import { FetchMoreProps } from "@saleor/types"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +import { FetchMoreProps } from "@dashboard/types"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import { ResultSearchData } from "./makeTopLevelSearch"; import { CommonSearchOpts } from "./types"; diff --git a/src/hooks/useAddressValidation.ts b/src/hooks/useAddressValidation.ts index 58e0b7a7e..28abf74ec 100644 --- a/src/hooks/useAddressValidation.ts +++ b/src/hooks/useAddressValidation.ts @@ -1,12 +1,12 @@ -import { AddressTypeInput } from "@saleor/customers/types"; +import { AddressTypeInput } from "@dashboard/customers/types"; import { AccountErrorCode, AccountErrorFragment, AddressInput, AddressTypeEnum, -} from "@saleor/graphql"; -import { transformFormToAddressInput } from "@saleor/misc"; -import { add, remove } from "@saleor/utils/lists"; +} from "@dashboard/graphql"; +import { transformFormToAddressInput } from "@dashboard/misc"; +import { add, remove } from "@dashboard/utils/lists"; import { useState } from "react"; interface UseAddressValidation { diff --git a/src/hooks/useBackgroundTask.ts b/src/hooks/useBackgroundTask.ts index 9ec45f163..83aacfc1a 100644 --- a/src/hooks/useBackgroundTask.ts +++ b/src/hooks/useBackgroundTask.ts @@ -1,4 +1,4 @@ -import BackgroundTasksContext from "@saleor/containers/BackgroundTasks/context"; +import BackgroundTasksContext from "@dashboard/containers/BackgroundTasks/context"; import { useContext } from "react"; function useBackgroundTask() { diff --git a/src/hooks/useChannels.test.ts b/src/hooks/useChannels.test.ts index aedcc51d4..f69b95f4a 100644 --- a/src/hooks/useChannels.test.ts +++ b/src/hooks/useChannels.test.ts @@ -1,4 +1,4 @@ -import { ChannelData } from "@saleor/channels/utils"; +import { ChannelData } from "@dashboard/channels/utils"; import { act, renderHook } from "@testing-library/react-hooks"; import useChannels from "./useChannels"; diff --git a/src/hooks/useChannels.ts b/src/hooks/useChannels.ts index 7366e8b08..dd2546b72 100644 --- a/src/hooks/useChannels.ts +++ b/src/hooks/useChannels.ts @@ -1,8 +1,8 @@ -import { ChannelsAction } from "@saleor/channels/urls"; -import { Channel } from "@saleor/channels/utils"; -import { useExitFormDialog, WithFormId } from "@saleor/components/Form"; -import useListActions from "@saleor/hooks/useListActions"; -import useStateFromProps from "@saleor/hooks/useStateFromProps"; +import { ChannelsAction } from "@dashboard/channels/urls"; +import { Channel } from "@dashboard/channels/utils"; +import { useExitFormDialog, WithFormId } from "@dashboard/components/Form"; +import useListActions from "@dashboard/hooks/useListActions"; +import useStateFromProps from "@dashboard/hooks/useStateFromProps"; interface Modal { openModal: (action: ChannelsAction) => void; diff --git a/src/hooks/useChannelsSearch.ts b/src/hooks/useChannelsSearch.ts index bda4b83aa..8534ba0a3 100644 --- a/src/hooks/useChannelsSearch.ts +++ b/src/hooks/useChannelsSearch.ts @@ -1,5 +1,5 @@ -import { ChannelDetailsFragment } from "@saleor/graphql"; -import { FetchMoreProps, Search, SearchProps } from "@saleor/types"; +import { ChannelDetailsFragment } from "@dashboard/graphql"; +import { FetchMoreProps, Search, SearchProps } from "@dashboard/types"; import { filter } from "fuzzaldrin"; import React from "react"; diff --git a/src/hooks/useChannelsSearchWithLoadMore.ts b/src/hooks/useChannelsSearchWithLoadMore.ts index b28ef81dd..a73b20d92 100644 --- a/src/hooks/useChannelsSearchWithLoadMore.ts +++ b/src/hooks/useChannelsSearchWithLoadMore.ts @@ -1,4 +1,4 @@ -import { useBaseChannelsQuery } from "@saleor/graphql"; +import { useBaseChannelsQuery } from "@dashboard/graphql"; import chunk from "lodash/chunk"; import compact from "lodash/compact"; import concat from "lodash/concat"; diff --git a/src/hooks/useChoiceSearch.ts b/src/hooks/useChoiceSearch.ts index 72f8856da..91602ac4f 100644 --- a/src/hooks/useChoiceSearch.ts +++ b/src/hooks/useChoiceSearch.ts @@ -1,4 +1,4 @@ -import { Choice } from "@saleor/components/SingleSelectField"; +import { Choice } from "@dashboard/components/SingleSelectField"; import { filter } from "fuzzaldrin"; import { useMemo, useState } from "react"; diff --git a/src/hooks/useCurrentDate.ts b/src/hooks/useCurrentDate.ts index a01a99d3a..d591f3f6c 100644 --- a/src/hooks/useCurrentDate.ts +++ b/src/hooks/useCurrentDate.ts @@ -1,4 +1,4 @@ -import { DateContext } from "@saleor/components/Date/DateContext"; +import { DateContext } from "@dashboard/components/Date/DateContext"; import { useContext } from "react"; function useCurrentDate(): number { diff --git a/src/hooks/useDateLocalize.ts b/src/hooks/useDateLocalize.ts index 6820f15ea..d04c8893a 100644 --- a/src/hooks/useDateLocalize.ts +++ b/src/hooks/useDateLocalize.ts @@ -1,4 +1,4 @@ -import { LocaleContext } from "@saleor/components/Locale"; +import { LocaleContext } from "@dashboard/components/Locale"; import moment from "moment-timezone"; import { useContext } from "react"; diff --git a/src/hooks/useForm.ts b/src/hooks/useForm.ts index e37b0de49..3eba96d85 100644 --- a/src/hooks/useForm.ts +++ b/src/hooks/useForm.ts @@ -3,9 +3,9 @@ import { FormId, useExitFormDialog, UseExitFormDialogResult, -} from "@saleor/components/Form"; -import useHandleFormSubmit from "@saleor/hooks/useHandleFormSubmit"; -import { toggle } from "@saleor/utils/lists"; +} from "@dashboard/components/Form"; +import useHandleFormSubmit from "@dashboard/hooks/useHandleFormSubmit"; +import { toggle } from "@dashboard/utils/lists"; import isEqual from "lodash/isEqual"; import omit from "lodash/omit"; import React, { useEffect, useState } from "react"; diff --git a/src/hooks/useFormset.ts b/src/hooks/useFormset.ts index 604ef509d..459c3703d 100644 --- a/src/hooks/useFormset.ts +++ b/src/hooks/useFormset.ts @@ -1,4 +1,4 @@ -import { removeAtIndex } from "@saleor/utils/lists"; +import { removeAtIndex } from "@dashboard/utils/lists"; import useStateFromProps from "./useStateFromProps"; diff --git a/src/hooks/useHandleFormSubmit.ts b/src/hooks/useHandleFormSubmit.ts index c75349b0b..962d0018f 100644 --- a/src/hooks/useHandleFormSubmit.ts +++ b/src/hooks/useHandleFormSubmit.ts @@ -1,6 +1,6 @@ -import { FormId, useExitFormDialog } from "@saleor/components/Form"; -import { MessageContext } from "@saleor/components/messages"; -import { SubmitPromise } from "@saleor/hooks/useForm"; +import { FormId, useExitFormDialog } from "@dashboard/components/Form"; +import { MessageContext } from "@dashboard/components/messages"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; import { useContext } from "react"; interface UseHandleFormSubmitProps { diff --git a/src/hooks/useListSettings.test.ts b/src/hooks/useListSettings.test.ts index 03aa16322..493f062b5 100644 --- a/src/hooks/useListSettings.test.ts +++ b/src/hooks/useListSettings.test.ts @@ -1,5 +1,5 @@ -import { defaultListSettings } from "@saleor/config"; -import { ListViews } from "@saleor/types"; +import { defaultListSettings } from "@dashboard/config"; +import { ListViews } from "@dashboard/types"; import { renderHook } from "@testing-library/react-hooks"; import useListSettings, { listSettingsStorageKey } from "./useListSettings"; diff --git a/src/hooks/useListSettings.ts b/src/hooks/useListSettings.ts index 304ffc350..737df9f38 100644 --- a/src/hooks/useListSettings.ts +++ b/src/hooks/useListSettings.ts @@ -1,4 +1,4 @@ -import useLocalStorage from "@saleor/hooks/useLocalStorage"; +import useLocalStorage from "@dashboard/hooks/useLocalStorage"; import merge from "lodash/merge"; import { AppListViewSettings, defaultListSettings } from "./../config"; diff --git a/src/hooks/useLocale.ts b/src/hooks/useLocale.ts index f35188b0c..3f2ba72a3 100644 --- a/src/hooks/useLocale.ts +++ b/src/hooks/useLocale.ts @@ -1,4 +1,4 @@ -import { LocaleContext } from "@saleor/components/Locale"; +import { LocaleContext } from "@dashboard/components/Locale"; import { useContext } from "react"; function useLocale() { diff --git a/src/hooks/useMultiAutocomplete.ts b/src/hooks/useMultiAutocomplete.ts index 4c9e3b1ef..f6333cc51 100644 --- a/src/hooks/useMultiAutocomplete.ts +++ b/src/hooks/useMultiAutocomplete.ts @@ -1,5 +1,5 @@ -import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField"; -import { maybe } from "@saleor/misc"; +import { MultiAutocompleteChoiceType } from "@dashboard/components/MultiAutocompleteSelectField"; +import { maybe } from "@dashboard/misc"; import useListActions from "./useListActions"; diff --git a/src/hooks/useNavigator.ts b/src/hooks/useNavigator.ts index 57ceb681c..8cc7648a4 100644 --- a/src/hooks/useNavigator.ts +++ b/src/hooks/useNavigator.ts @@ -1,4 +1,4 @@ -import { ExitFormDialogContext } from "@saleor/components/Form/ExitFormDialogProvider"; +import { ExitFormDialogContext } from "@dashboard/components/Form/ExitFormDialogProvider"; import { useContext } from "react"; import useRouter from "use-react-router"; diff --git a/src/hooks/useNotifier/useNotifier.ts b/src/hooks/useNotifier/useNotifier.ts index 86cb9fd9b..72b880eb2 100644 --- a/src/hooks/useNotifier/useNotifier.ts +++ b/src/hooks/useNotifier/useNotifier.ts @@ -2,7 +2,7 @@ import { IMessage, IMessageContext, MessageContext, -} from "@saleor/components/messages"; +} from "@dashboard/components/messages"; import { useContext } from "react"; export type UseNotifierResult = IMessageContext; diff --git a/src/hooks/useNotifier/utils.ts b/src/hooks/useNotifier/utils.ts index b2b8f648c..c666f7cde 100644 --- a/src/hooks/useNotifier/utils.ts +++ b/src/hooks/useNotifier/utils.ts @@ -1,6 +1,6 @@ -import { IMessage } from "@saleor/components/messages"; -import { commonMessages } from "@saleor/intl"; -import commonErrorMessages from "@saleor/utils/errors/common"; +import { IMessage } from "@dashboard/components/messages"; +import { commonMessages } from "@dashboard/intl"; +import commonErrorMessages from "@dashboard/utils/errors/common"; import { IntlShape } from "react-intl"; export const getDefaultNotifierSuccessErrorData = ( diff --git a/src/hooks/useOnSetDefaultVariant.ts b/src/hooks/useOnSetDefaultVariant.ts index 1bc14e209..80dc8d939 100644 --- a/src/hooks/useOnSetDefaultVariant.ts +++ b/src/hooks/useOnSetDefaultVariant.ts @@ -1,6 +1,6 @@ -import { Node, useProductVariantSetDefaultMutation } from "@saleor/graphql"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { getProductErrorMessage } from "@saleor/utils/errors"; +import { Node, useProductVariantSetDefaultMutation } from "@dashboard/graphql"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { getProductErrorMessage } from "@dashboard/utils/errors"; import { useIntl } from "react-intl"; function useOnSetDefaultVariant(productId: string, variant: Node) { diff --git a/src/hooks/usePaginationReset.ts b/src/hooks/usePaginationReset.ts index 03a1f6e20..b244a3aa3 100644 --- a/src/hooks/usePaginationReset.ts +++ b/src/hooks/usePaginationReset.ts @@ -1,5 +1,5 @@ -import { DEFAULT_INITIAL_PAGINATION_DATA } from "@saleor/config"; -import { Pagination } from "@saleor/types"; +import { DEFAULT_INITIAL_PAGINATION_DATA } from "@dashboard/config"; +import { Pagination } from "@dashboard/types"; import { useEffect } from "react"; import useNavigator from "./useNavigator"; diff --git a/src/hooks/usePaginator.ts b/src/hooks/usePaginator.ts index 79f24284a..9e89b76f2 100644 --- a/src/hooks/usePaginator.ts +++ b/src/hooks/usePaginator.ts @@ -1,4 +1,4 @@ -import { stringifyQs } from "@saleor/utils/urls"; +import { stringifyQs } from "@dashboard/utils/urls"; import { createContext, useContext, useMemo } from "react"; import { Pagination } from "../types"; diff --git a/src/hooks/useSearchQuery.ts b/src/hooks/useSearchQuery.ts index 8543ad5ae..4f7cf23ec 100644 --- a/src/hooks/useSearchQuery.ts +++ b/src/hooks/useSearchQuery.ts @@ -1,4 +1,4 @@ -import { ChangeEvent } from "@saleor/hooks/useForm"; +import { ChangeEvent } from "@dashboard/hooks/useForm"; import React from "react"; export type UseSearchQuery = [string, (event: ChangeEvent) => void, () => void]; diff --git a/src/hooks/useShop.ts b/src/hooks/useShop.ts index c15c7bf0c..ee3f0fad2 100644 --- a/src/hooks/useShop.ts +++ b/src/hooks/useShop.ts @@ -1,4 +1,4 @@ -import { ShopContext } from "@saleor/components/Shop"; +import { ShopContext } from "@dashboard/components/Shop"; import { useContext } from "react"; function useShop() { diff --git a/src/hooks/useSortRedirects.ts b/src/hooks/useSortRedirects.ts index e0593f2c8..c643b108f 100644 --- a/src/hooks/useSortRedirects.ts +++ b/src/hooks/useSortRedirects.ts @@ -1,5 +1,5 @@ -import useNavigator from "@saleor/hooks/useNavigator"; -import { Sort } from "@saleor/types"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { Sort } from "@dashboard/types"; import { useEffect } from "react"; export type SortByRankUrlQueryParams = Sort & { diff --git a/src/index.tsx b/src/index.tsx index 52d75916d..158fae5a8 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,7 +1,7 @@ import { ApolloProvider } from "@apollo/client"; -import DemoBanner from "@saleor/components/DemoBanner"; -import { PermissionEnum } from "@saleor/graphql"; -import useAppState from "@saleor/hooks/useAppState"; +import DemoBanner from "@dashboard/components/DemoBanner"; +import { PermissionEnum } from "@dashboard/graphql"; +import useAppState from "@dashboard/hooks/useAppState"; import { ThemeProvider } from "@saleor/macaw-ui"; import { SaleorProvider } from "@saleor/sdk"; import React from "react"; diff --git a/src/marketplace/index.tsx b/src/marketplace/index.tsx index 8cc2494e8..0da3150cc 100644 --- a/src/marketplace/index.tsx +++ b/src/marketplace/index.tsx @@ -1,13 +1,13 @@ +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"; +import { MARKETPLACE_URL } from "@dashboard/config"; +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 { Container } from "@material-ui/core"; -import { AppFrame } from "@saleor/apps/components/AppFrame"; -import NotFoundPage from "@saleor/components/NotFoundPage"; -import PreviewPill from "@saleor/components/PreviewPill"; -import { WindowTitle } from "@saleor/components/WindowTitle"; -import { MARKETPLACE_URL } from "@saleor/config"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { sectionNames } from "@saleor/intl"; -import { marketplaceUrlResolver } from "@saleor/marketplace/marketplace-url-resolver"; -import { marketplaceUrl } from "@saleor/marketplace/urls"; import React, { useMemo } from "react"; import { useIntl } from "react-intl"; import useRouter from "use-react-router"; diff --git a/src/marketplace/marketplace-url-resolver.test.ts b/src/marketplace/marketplace-url-resolver.test.ts index 8675bd8ad..f65125698 100644 --- a/src/marketplace/marketplace-url-resolver.test.ts +++ b/src/marketplace/marketplace-url-resolver.test.ts @@ -1,4 +1,4 @@ -import { MarketplaceUrlResolver } from "@saleor/marketplace/marketplace-url-resolver"; +import { MarketplaceUrlResolver } from "@dashboard/marketplace/marketplace-url-resolver"; describe("MarketplaceUrlResolver", function() { it("Resolves deep marketplace url from full path", () => { diff --git a/src/marketplace/marketplace-url-resolver.ts b/src/marketplace/marketplace-url-resolver.ts index 2fe71653c..f8e6457fe 100644 --- a/src/marketplace/marketplace-url-resolver.ts +++ b/src/marketplace/marketplace-url-resolver.ts @@ -3,7 +3,7 @@ import { MARKETPLACE_SALEOR_APPS_JSON_PATH, MARKETPLACE_SALEOR_APPS_PAGE_PATH, MARKETPLACE_URL, -} from "@saleor/config"; +} from "@dashboard/config"; import urlJoin from "url-join"; export class MarketplaceUrlResolver { diff --git a/src/misc.ts b/src/misc.ts index 5903d5315..f50f78c5a 100644 --- a/src/misc.ts +++ b/src/misc.ts @@ -5,9 +5,9 @@ import { DateRangeInput, OrderStatus, PaymentChargeStatusEnum, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; +import { Node, SlugNode } from "@dashboard/types"; import { ConfirmButtonTransitionState, ThemeType } from "@saleor/macaw-ui"; -import { Node, SlugNode } from "@saleor/types"; import uniqBy from "lodash/uniqBy"; import moment from "moment-timezone"; import { IntlShape } from "react-intl"; diff --git a/src/navigation/components/MenuCreateDialog/MenuCreateDialog.tsx b/src/navigation/components/MenuCreateDialog/MenuCreateDialog.tsx index 52a13f0cc..3f67481da 100644 --- a/src/navigation/components/MenuCreateDialog/MenuCreateDialog.tsx +++ b/src/navigation/components/MenuCreateDialog/MenuCreateDialog.tsx @@ -1,3 +1,10 @@ +import BackButton from "@dashboard/components/BackButton"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import Form from "@dashboard/components/Form"; +import { MenuErrorFragment } from "@dashboard/graphql"; +import { buttonMessages } from "@dashboard/intl"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getMenuErrorMessage from "@dashboard/utils/errors/menu"; import { Dialog, DialogActions, @@ -5,14 +12,7 @@ import { DialogTitle, TextField, } from "@material-ui/core"; -import BackButton from "@saleor/components/BackButton"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import Form from "@saleor/components/Form"; -import { MenuErrorFragment } from "@saleor/graphql"; -import { buttonMessages } from "@saleor/intl"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { getFormErrors } from "@saleor/utils/errors"; -import getMenuErrorMessage from "@saleor/utils/errors/menu"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/navigation/components/MenuDetailsPage/MenuDetailsPage.stories.tsx b/src/navigation/components/MenuDetailsPage/MenuDetailsPage.stories.tsx index 0a3ef108d..7154b42ba 100644 --- a/src/navigation/components/MenuDetailsPage/MenuDetailsPage.stories.tsx +++ b/src/navigation/components/MenuDetailsPage/MenuDetailsPage.stories.tsx @@ -1,6 +1,6 @@ -import { MenuErrorCode } from "@saleor/graphql"; -import { menu } from "@saleor/navigation/fixtures"; -import Decorator from "@saleor/storybook/Decorator"; +import { MenuErrorCode } from "@dashboard/graphql"; +import { menu } from "@dashboard/navigation/fixtures"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/navigation/components/MenuDetailsPage/MenuDetailsPage.tsx b/src/navigation/components/MenuDetailsPage/MenuDetailsPage.tsx index 539593c9b..4422c58d0 100644 --- a/src/navigation/components/MenuDetailsPage/MenuDetailsPage.tsx +++ b/src/navigation/components/MenuDetailsPage/MenuDetailsPage.tsx @@ -1,16 +1,16 @@ +import { Backlink } from "@dashboard/components/Backlink"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import Container from "@dashboard/components/Container"; +import Form from "@dashboard/components/Form"; +import Grid from "@dashboard/components/Grid"; +import Savebar from "@dashboard/components/Savebar"; +import { MenuDetailsFragment, MenuErrorFragment } from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { sectionNames } from "@dashboard/intl"; +import { menuListUrl } from "@dashboard/navigation/urls"; import { Typography } from "@material-ui/core"; -import { Backlink } from "@saleor/components/Backlink"; -import CardSpacer from "@saleor/components/CardSpacer"; -import Container from "@saleor/components/Container"; -import Form from "@saleor/components/Form"; -import Grid from "@saleor/components/Grid"; -import Savebar from "@saleor/components/Savebar"; -import { MenuDetailsFragment, MenuErrorFragment } from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { sectionNames } from "@saleor/intl"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { menuListUrl } from "@saleor/navigation/urls"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/navigation/components/MenuDetailsPage/tree.test.ts b/src/navigation/components/MenuDetailsPage/tree.test.ts index cf5bb096e..1cd9ffec1 100644 --- a/src/navigation/components/MenuDetailsPage/tree.test.ts +++ b/src/navigation/components/MenuDetailsPage/tree.test.ts @@ -1,4 +1,4 @@ -import { RecursiveMenuItem } from "@saleor/navigation/types"; +import { RecursiveMenuItem } from "@dashboard/navigation/types"; import { menu } from "../../fixtures"; import { TreeOperation } from "../MenuItems"; diff --git a/src/navigation/components/MenuDetailsPage/tree.ts b/src/navigation/components/MenuDetailsPage/tree.ts index 6f704545a..6c616452d 100644 --- a/src/navigation/components/MenuDetailsPage/tree.ts +++ b/src/navigation/components/MenuDetailsPage/tree.ts @@ -1,4 +1,4 @@ -import { RecursiveMenuItem } from "@saleor/navigation/types"; +import { RecursiveMenuItem } from "@dashboard/navigation/types"; import { TreeOperation } from "../MenuItems"; diff --git a/src/navigation/components/MenuItemDialog/MenuItemDialog.tsx b/src/navigation/components/MenuItemDialog/MenuItemDialog.tsx index 6b0d86be9..78e313fea 100644 --- a/src/navigation/components/MenuItemDialog/MenuItemDialog.tsx +++ b/src/navigation/components/MenuItemDialog/MenuItemDialog.tsx @@ -1,3 +1,21 @@ +import AutocompleteSelectMenu from "@dashboard/components/AutocompleteSelectMenu"; +import BackButton from "@dashboard/components/BackButton"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import { + MenuErrorFragment, + SearchCategoriesQuery, + SearchCollectionsQuery, + SearchPagesQuery, +} from "@dashboard/graphql"; +import useModalDialogErrors from "@dashboard/hooks/useModalDialogErrors"; +import useModalDialogOpen from "@dashboard/hooks/useModalDialogOpen"; +import useStateFromProps from "@dashboard/hooks/useStateFromProps"; +import { buttonMessages, sectionNames } from "@dashboard/intl"; +import { RelayToFlat } from "@dashboard/types"; +import { getFieldError, getFormErrors } from "@dashboard/utils/errors"; +import getMenuErrorMessage from "@dashboard/utils/errors/menu"; +import { getMenuItemByValue, IMenu } from "@dashboard/utils/menu"; import { Dialog, DialogActions, @@ -6,25 +24,7 @@ import { TextField, Typography, } from "@material-ui/core"; -import AutocompleteSelectMenu from "@saleor/components/AutocompleteSelectMenu"; -import BackButton from "@saleor/components/BackButton"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import FormSpacer from "@saleor/components/FormSpacer"; -import { - MenuErrorFragment, - SearchCategoriesQuery, - SearchCollectionsQuery, - SearchPagesQuery, -} from "@saleor/graphql"; -import useModalDialogErrors from "@saleor/hooks/useModalDialogErrors"; -import useModalDialogOpen from "@saleor/hooks/useModalDialogOpen"; -import useStateFromProps from "@saleor/hooks/useStateFromProps"; -import { buttonMessages, sectionNames } from "@saleor/intl"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { RelayToFlat } from "@saleor/types"; -import { getFieldError, getFormErrors } from "@saleor/utils/errors"; -import getMenuErrorMessage from "@saleor/utils/errors/menu"; -import { getMenuItemByValue, IMenu } from "@saleor/utils/menu"; import isUrl from "is-url"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/navigation/components/MenuItems/MenuItems.tsx b/src/navigation/components/MenuItems/MenuItems.tsx index 1aba80d6f..aed78276d 100644 --- a/src/navigation/components/MenuItems/MenuItems.tsx +++ b/src/navigation/components/MenuItems/MenuItems.tsx @@ -1,8 +1,9 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import Skeleton from "@dashboard/components/Skeleton"; +import { buttonMessages } from "@dashboard/intl"; +import { RecursiveMenuItem } from "@dashboard/navigation/types"; import { Card, CardActions, Paper, Typography } from "@material-ui/core"; import EditIcon from "@material-ui/icons/Edit"; -import CardTitle from "@saleor/components/CardTitle"; -import Skeleton from "@saleor/components/Skeleton"; -import { buttonMessages } from "@saleor/intl"; import { Button, DeleteIcon, @@ -10,7 +11,6 @@ import { makeStyles, useTheme, } from "@saleor/macaw-ui"; -import { RecursiveMenuItem } from "@saleor/navigation/types"; import clsx from "clsx"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/navigation/components/MenuItems/tree.ts b/src/navigation/components/MenuItems/tree.ts index adfc113e4..c8a74c0cf 100644 --- a/src/navigation/components/MenuItems/tree.ts +++ b/src/navigation/components/MenuItems/tree.ts @@ -1,4 +1,4 @@ -import { RecursiveMenuItem } from "@saleor/navigation/types"; +import { RecursiveMenuItem } from "@dashboard/navigation/types"; import { getPatch } from "fast-array-diff"; import { TreeItem } from "react-sortable-tree"; diff --git a/src/navigation/components/MenuList/MenuList.tsx b/src/navigation/components/MenuList/MenuList.tsx index 2efacd55c..1a14e4fae 100644 --- a/src/navigation/components/MenuList/MenuList.tsx +++ b/src/navigation/components/MenuList/MenuList.tsx @@ -1,19 +1,19 @@ +import Checkbox from "@dashboard/components/Checkbox"; +import IconButtonTableCell from "@dashboard/components/IconButtonTableCell"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import { TableButtonWrapper } from "@dashboard/components/TableButtonWrapper/TableButtonWrapper"; +import TableCellHeader from "@dashboard/components/TableCellHeader"; +import TableHead from "@dashboard/components/TableHead"; +import { TablePaginationWithContext } from "@dashboard/components/TablePagination"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { MenuFragment } from "@dashboard/graphql"; +import { maybe, renderCollection } from "@dashboard/misc"; +import { MenuListUrlSortField, menuUrl } from "@dashboard/navigation/urls"; +import { ListActions, ListProps, SortPage } from "@dashboard/types"; +import { getArrowDirection } from "@dashboard/utils/sort"; import { Card, TableBody, TableCell, TableFooter } from "@material-ui/core"; -import Checkbox from "@saleor/components/Checkbox"; -import IconButtonTableCell from "@saleor/components/IconButtonTableCell"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import { TableButtonWrapper } from "@saleor/components/TableButtonWrapper/TableButtonWrapper"; -import TableCellHeader from "@saleor/components/TableCellHeader"; -import TableHead from "@saleor/components/TableHead"; -import { TablePaginationWithContext } from "@saleor/components/TablePagination"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { MenuFragment } from "@saleor/graphql"; import { DeleteIcon, makeStyles } from "@saleor/macaw-ui"; -import { maybe, renderCollection } from "@saleor/misc"; -import { MenuListUrlSortField, menuUrl } from "@saleor/navigation/urls"; -import { ListActions, ListProps, SortPage } from "@saleor/types"; -import { getArrowDirection } from "@saleor/utils/sort"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/navigation/components/MenuListPage/MenuListPage.stories.tsx b/src/navigation/components/MenuListPage/MenuListPage.stories.tsx index ec38abd67..c32eb92c8 100644 --- a/src/navigation/components/MenuListPage/MenuListPage.stories.tsx +++ b/src/navigation/components/MenuListPage/MenuListPage.stories.tsx @@ -2,11 +2,11 @@ import { listActionsProps, pageListProps, sortPageProps, -} from "@saleor/fixtures"; -import { menuList } from "@saleor/navigation/fixtures"; -import { MenuListUrlSortField } from "@saleor/navigation/urls"; -import Decorator from "@saleor/storybook/Decorator"; -import { PaginatorContextDecorator } from "@saleor/storybook/PaginatorContextDecorator"; +} from "@dashboard/fixtures"; +import { menuList } from "@dashboard/navigation/fixtures"; +import { MenuListUrlSortField } from "@dashboard/navigation/urls"; +import Decorator from "@dashboard/storybook/Decorator"; +import { PaginatorContextDecorator } from "@dashboard/storybook/PaginatorContextDecorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/navigation/components/MenuListPage/MenuListPage.tsx b/src/navigation/components/MenuListPage/MenuListPage.tsx index 64a6ca3ca..15d0209fb 100644 --- a/src/navigation/components/MenuListPage/MenuListPage.tsx +++ b/src/navigation/components/MenuListPage/MenuListPage.tsx @@ -1,12 +1,12 @@ -import { Backlink } from "@saleor/components/Backlink"; -import { Button } from "@saleor/components/Button"; -import Container from "@saleor/components/Container"; -import PageHeader from "@saleor/components/PageHeader"; -import { configurationMenuUrl } from "@saleor/configuration"; -import { MenuFragment } from "@saleor/graphql"; -import { sectionNames } from "@saleor/intl"; -import { menuListUrl, MenuListUrlSortField } from "@saleor/navigation/urls"; -import { ListActions, PageListProps, SortPage } from "@saleor/types"; +import { Backlink } from "@dashboard/components/Backlink"; +import { Button } from "@dashboard/components/Button"; +import Container from "@dashboard/components/Container"; +import PageHeader from "@dashboard/components/PageHeader"; +import { configurationMenuUrl } from "@dashboard/configuration"; +import { MenuFragment } from "@dashboard/graphql"; +import { sectionNames } from "@dashboard/intl"; +import { menuListUrl, MenuListUrlSortField } from "@dashboard/navigation/urls"; +import { ListActions, PageListProps, SortPage } from "@dashboard/types"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/navigation/components/MenuProperties/MenuProperties.tsx b/src/navigation/components/MenuProperties/MenuProperties.tsx index 055aff781..6156973b7 100644 --- a/src/navigation/components/MenuProperties/MenuProperties.tsx +++ b/src/navigation/components/MenuProperties/MenuProperties.tsx @@ -1,9 +1,9 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import { MenuErrorFragment } from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getMenuErrorMessage from "@dashboard/utils/errors/menu"; import { Card, CardContent, TextField } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import { MenuErrorFragment } from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; -import { getFormErrors } from "@saleor/utils/errors"; -import getMenuErrorMessage from "@saleor/utils/errors/menu"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/navigation/fixtures.ts b/src/navigation/fixtures.ts index dc6a0bbd7..9446915e1 100644 --- a/src/navigation/fixtures.ts +++ b/src/navigation/fixtures.ts @@ -1,4 +1,4 @@ -import { MenuDetailsFragment, MenuFragment } from "@saleor/graphql"; +import { MenuDetailsFragment, MenuFragment } from "@dashboard/graphql"; export const menuList: MenuFragment[] = [ { diff --git a/src/navigation/index.tsx b/src/navigation/index.tsx index e7880fdc6..a24ab968c 100644 --- a/src/navigation/index.tsx +++ b/src/navigation/index.tsx @@ -1,4 +1,4 @@ -import { asSortParams } from "@saleor/utils/sort"; +import { asSortParams } from "@dashboard/utils/sort"; import { parse as parseQs } from "qs"; import React from "react"; import { Route, RouteComponentProps, Switch } from "react-router-dom"; diff --git a/src/navigation/types.ts b/src/navigation/types.ts index 303170a07..affa150c2 100644 --- a/src/navigation/types.ts +++ b/src/navigation/types.ts @@ -1,4 +1,4 @@ -import { MenuItemFragment } from "@saleor/graphql"; +import { MenuItemFragment } from "@dashboard/graphql"; export type RecursiveMenuItem = MenuItemFragment & { children?: RecursiveMenuItem[]; diff --git a/src/navigation/urls.ts b/src/navigation/urls.ts index 4db402677..d061a2497 100644 --- a/src/navigation/urls.ts +++ b/src/navigation/urls.ts @@ -1,4 +1,4 @@ -import { stringifyQs } from "@saleor/utils/urls"; +import { stringifyQs } from "@dashboard/utils/urls"; import urlJoin from "url-join"; import { BulkAction, Dialog, Pagination, SingleAction, Sort } from "../types"; diff --git a/src/navigation/views/MenuDetails/index.tsx b/src/navigation/views/MenuDetails/index.tsx index 0bd3be417..40f15a0d7 100644 --- a/src/navigation/views/MenuDetails/index.tsx +++ b/src/navigation/views/MenuDetails/index.tsx @@ -1,19 +1,19 @@ -import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; -import { DEFAULT_INITIAL_SEARCH_DATA } from "@saleor/config"; +import ActionDialog from "@dashboard/components/ActionDialog"; +import { DEFAULT_INITIAL_SEARCH_DATA } from "@dashboard/config"; import { useMenuDeleteMutation, useMenuDetailsQuery, useMenuItemCreateMutation, useMenuItemUpdateMutation, useMenuUpdateMutation, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import useCategorySearch from "@saleor/searches/useCategorySearch"; -import useCollectionSearch from "@saleor/searches/useCollectionSearch"; -import usePageSearch from "@saleor/searches/usePageSearch"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import useCategorySearch from "@dashboard/searches/useCategorySearch"; +import useCollectionSearch from "@dashboard/searches/useCollectionSearch"; +import usePageSearch from "@dashboard/searches/usePageSearch"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; +import { DialogContentText } from "@material-ui/core"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/navigation/views/MenuDetails/successHandlers.ts b/src/navigation/views/MenuDetails/successHandlers.ts index 12f15c97f..5e36aa21e 100644 --- a/src/navigation/views/MenuDetails/successHandlers.ts +++ b/src/navigation/views/MenuDetails/successHandlers.ts @@ -3,8 +3,8 @@ import { MenuItemCreateMutation, MenuItemUpdateMutation, MenuUpdateMutation, -} from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; +} from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; import { IntlShape } from "react-intl"; import { UseNavigatorResult } from "../../../hooks/useNavigator"; diff --git a/src/navigation/views/MenuDetails/utils.ts b/src/navigation/views/MenuDetails/utils.ts index 90aff3c25..a1ca74dca 100644 --- a/src/navigation/views/MenuDetails/utils.ts +++ b/src/navigation/views/MenuDetails/utils.ts @@ -3,7 +3,7 @@ import { MenuItemFragment, MenuItemInput, MenuItemMoveInput, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import { MenuDetailsSubmitData } from "../../components/MenuDetailsPage"; import { MenuItemDialogFormData } from "../../components/MenuItemDialog"; diff --git a/src/navigation/views/MenuList/MenuList.tsx b/src/navigation/views/MenuList/MenuList.tsx index c73a0b036..002c4c1e2 100644 --- a/src/navigation/views/MenuList/MenuList.tsx +++ b/src/navigation/views/MenuList/MenuList.tsx @@ -1,27 +1,27 @@ -import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; -import { Button } from "@saleor/components/Button"; +import ActionDialog from "@dashboard/components/ActionDialog"; +import { Button } from "@dashboard/components/Button"; import { useMenuBulkDeleteMutation, useMenuCreateMutation, useMenuDeleteMutation, useMenuListQuery, -} from "@saleor/graphql"; -import useBulkActions from "@saleor/hooks/useBulkActions"; -import useListSettings from "@saleor/hooks/useListSettings"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; +} from "@dashboard/graphql"; +import useBulkActions from "@dashboard/hooks/useBulkActions"; +import useListSettings from "@dashboard/hooks/useListSettings"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { usePaginationReset } from "@dashboard/hooks/usePaginationReset"; import usePaginator, { createPaginationState, PaginatorContext, -} from "@saleor/hooks/usePaginator"; -import { buttonMessages, commonMessages } from "@saleor/intl"; -import { getById, getStringOrPlaceholder, maybe } from "@saleor/misc"; -import { ListViews } from "@saleor/types"; -import createSortHandler from "@saleor/utils/handlers/sortHandler"; -import { mapEdgesToItems } from "@saleor/utils/maps"; -import { getSortParams } from "@saleor/utils/sort"; +} from "@dashboard/hooks/usePaginator"; +import { buttonMessages, commonMessages } from "@dashboard/intl"; +import { getById, getStringOrPlaceholder, maybe } from "@dashboard/misc"; +import { ListViews } from "@dashboard/types"; +import createSortHandler from "@dashboard/utils/handlers/sortHandler"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; +import { getSortParams } from "@dashboard/utils/sort"; +import { DialogContentText } from "@material-ui/core"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/navigation/views/MenuList/sort.ts b/src/navigation/views/MenuList/sort.ts index c6cdee8e8..58c782982 100644 --- a/src/navigation/views/MenuList/sort.ts +++ b/src/navigation/views/MenuList/sort.ts @@ -1,6 +1,6 @@ -import { MenuSortField } from "@saleor/graphql"; -import { MenuListUrlSortField } from "@saleor/navigation/urls"; -import { createGetSortQueryVariables } from "@saleor/utils/sort"; +import { MenuSortField } from "@dashboard/graphql"; +import { MenuListUrlSortField } from "@dashboard/navigation/urls"; +import { createGetSortQueryVariables } from "@dashboard/utils/sort"; export function getSortQueryField(sort: MenuListUrlSortField): MenuSortField { switch (sort) { diff --git a/src/new-apps/components/AllAppList/AllAppList.tsx b/src/new-apps/components/AllAppList/AllAppList.tsx index 400dfd9cd..6f312cfef 100644 --- a/src/new-apps/components/AllAppList/AllAppList.tsx +++ b/src/new-apps/components/AllAppList/AllAppList.tsx @@ -1,5 +1,5 @@ +import { GetV2SaleorAppsResponse } from "@dashboard/new-apps/marketplace.types"; import { Skeleton } from "@material-ui/lab"; -import { GetV2SaleorAppsResponse } from "@saleor/new-apps/marketplace.types"; import React from "react"; import AppListCard from "../AppListCard"; diff --git a/src/new-apps/components/AppActivateDialog/AppActivateDialog.stories.tsx b/src/new-apps/components/AppActivateDialog/AppActivateDialog.stories.tsx index 27816d680..80514a507 100644 --- a/src/new-apps/components/AppActivateDialog/AppActivateDialog.stories.tsx +++ b/src/new-apps/components/AppActivateDialog/AppActivateDialog.stories.tsx @@ -1,4 +1,4 @@ -import Decorator from "@saleor/storybook/Decorator"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/new-apps/components/AppActivateDialog/AppActivateDialog.tsx b/src/new-apps/components/AppActivateDialog/AppActivateDialog.tsx index b5ffa9365..59448a71d 100644 --- a/src/new-apps/components/AppActivateDialog/AppActivateDialog.tsx +++ b/src/new-apps/components/AppActivateDialog/AppActivateDialog.tsx @@ -1,8 +1,8 @@ +import ActionDialog from "@dashboard/components/ActionDialog"; +import { buttonMessages } from "@dashboard/intl"; +import { getStringOrPlaceholder } from "@dashboard/misc"; import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; -import { buttonMessages } from "@saleor/intl"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { getStringOrPlaceholder } from "@saleor/misc"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/new-apps/components/AppDeactivateDialog/AppDeactivateDialog.stories.tsx b/src/new-apps/components/AppDeactivateDialog/AppDeactivateDialog.stories.tsx index 456e1db3c..5c5f04bdc 100644 --- a/src/new-apps/components/AppDeactivateDialog/AppDeactivateDialog.stories.tsx +++ b/src/new-apps/components/AppDeactivateDialog/AppDeactivateDialog.stories.tsx @@ -1,4 +1,4 @@ -import Decorator from "@saleor/storybook/Decorator"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/new-apps/components/AppDeactivateDialog/AppDeactivateDialog.tsx b/src/new-apps/components/AppDeactivateDialog/AppDeactivateDialog.tsx index 7d36a6dde..06692f996 100644 --- a/src/new-apps/components/AppDeactivateDialog/AppDeactivateDialog.tsx +++ b/src/new-apps/components/AppDeactivateDialog/AppDeactivateDialog.tsx @@ -1,8 +1,8 @@ +import ActionDialog from "@dashboard/components/ActionDialog"; +import { buttonMessages } from "@dashboard/intl"; +import { getStringOrPlaceholder } from "@dashboard/misc"; import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; -import { buttonMessages } from "@saleor/intl"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { getStringOrPlaceholder } from "@saleor/misc"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/new-apps/components/AppDeleteDialog/AppDeleteDialog.stories.tsx b/src/new-apps/components/AppDeleteDialog/AppDeleteDialog.stories.tsx index cf9e00eba..31030a841 100644 --- a/src/new-apps/components/AppDeleteDialog/AppDeleteDialog.stories.tsx +++ b/src/new-apps/components/AppDeleteDialog/AppDeleteDialog.stories.tsx @@ -1,4 +1,4 @@ -import Decorator from "@saleor/storybook/Decorator"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/new-apps/components/AppDeleteDialog/AppDeleteDialog.tsx b/src/new-apps/components/AppDeleteDialog/AppDeleteDialog.tsx index e2c657d33..84c82febb 100644 --- a/src/new-apps/components/AppDeleteDialog/AppDeleteDialog.tsx +++ b/src/new-apps/components/AppDeleteDialog/AppDeleteDialog.tsx @@ -1,7 +1,7 @@ +import ActionDialog from "@dashboard/components/ActionDialog"; +import { getStringOrPlaceholder } from "@dashboard/misc"; import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { getStringOrPlaceholder } from "@saleor/misc"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/new-apps/components/AppListCard/AppListCard.test.tsx b/src/new-apps/components/AppListCard/AppListCard.test.tsx index fa24d7946..cdae29ff3 100644 --- a/src/new-apps/components/AppListCard/AppListCard.test.tsx +++ b/src/new-apps/components/AppListCard/AppListCard.test.tsx @@ -1,5 +1,5 @@ -import { comingSoonApp, releasedApp } from "@saleor/new-apps/fixtures"; -import { GetV2SaleorAppsResponse } from "@saleor/new-apps/marketplace.types"; +import { comingSoonApp, releasedApp } from "@dashboard/new-apps/fixtures"; +import { GetV2SaleorAppsResponse } from "@dashboard/new-apps/marketplace.types"; import Wrapper from "@test/wrapper"; import { render, screen, within } from "@testing-library/react"; import userEvent from "@testing-library/user-event"; diff --git a/src/new-apps/components/AppListCard/AppListCard.tsx b/src/new-apps/components/AppListCard/AppListCard.tsx index 088ddaf0d..644a08963 100644 --- a/src/new-apps/components/AppListCard/AppListCard.tsx +++ b/src/new-apps/components/AppListCard/AppListCard.tsx @@ -1,6 +1,6 @@ +import { GetV2SaleorAppsResponse } from "@dashboard/new-apps/marketplace.types"; +import { getAppDetails } from "@dashboard/new-apps/utils"; import { Card, CardContent } from "@material-ui/core"; -import { GetV2SaleorAppsResponse } from "@saleor/new-apps/marketplace.types"; -import { getAppDetails } from "@saleor/new-apps/utils"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/new-apps/components/AppListCard/AppListCardActions.tsx b/src/new-apps/components/AppListCard/AppListCardActions.tsx index c078edf0d..1add67768 100644 --- a/src/new-apps/components/AppListCard/AppListCardActions.tsx +++ b/src/new-apps/components/AppListCard/AppListCardActions.tsx @@ -1,7 +1,7 @@ +import { Button } from "@dashboard/components/Button"; +import Hr from "@dashboard/components/Hr"; +import { buttonMessages } from "@dashboard/intl"; import { CardActions, Typography } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import Hr from "@saleor/components/Hr"; -import { buttonMessages } from "@saleor/intl"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/new-apps/components/AppListCard/AppListCardDescription.tsx b/src/new-apps/components/AppListCard/AppListCardDescription.tsx index 34ea5c8b7..4b80366eb 100644 --- a/src/new-apps/components/AppListCard/AppListCardDescription.tsx +++ b/src/new-apps/components/AppListCard/AppListCardDescription.tsx @@ -1,5 +1,5 @@ +import { GetV2SaleorAppsResponse } from "@dashboard/new-apps/marketplace.types"; import { Typography } from "@material-ui/core"; -import { GetV2SaleorAppsResponse } from "@saleor/new-apps/marketplace.types"; import React from "react"; import { useDescriptionStyles } from "./styles"; diff --git a/src/new-apps/components/AppListCard/AppListCardIntegrations.tsx b/src/new-apps/components/AppListCard/AppListCardIntegrations.tsx index 554207645..c73d9f7c2 100644 --- a/src/new-apps/components/AppListCard/AppListCardIntegrations.tsx +++ b/src/new-apps/components/AppListCard/AppListCardIntegrations.tsx @@ -1,6 +1,6 @@ +import { GetV2SaleorAppsResponse } from "@dashboard/new-apps/marketplace.types"; import { Typography } from "@material-ui/core"; import { useTheme } from "@saleor/macaw-ui"; -import { GetV2SaleorAppsResponse } from "@saleor/new-apps/marketplace.types"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/new-apps/components/AppListCard/AppListCardLinks.tsx b/src/new-apps/components/AppListCard/AppListCardLinks.tsx index 438013484..0200a223f 100644 --- a/src/new-apps/components/AppListCard/AppListCardLinks.tsx +++ b/src/new-apps/components/AppListCard/AppListCardLinks.tsx @@ -1,6 +1,6 @@ +import Link from "@dashboard/components/Link"; +import { AppLink } from "@dashboard/new-apps/types"; import { Typography } from "@material-ui/core"; -import Link from "@saleor/components/Link"; -import { AppLink } from "@saleor/new-apps/types"; import React from "react"; import { useLinksStyles } from "./styles"; diff --git a/src/new-apps/components/AppListPage/AppListPage.stories.tsx b/src/new-apps/components/AppListPage/AppListPage.stories.tsx index d2ce42e5a..8d671d685 100644 --- a/src/new-apps/components/AppListPage/AppListPage.stories.tsx +++ b/src/new-apps/components/AppListPage/AppListPage.stories.tsx @@ -1,5 +1,5 @@ -import { installedAppsList } from "@saleor/new-apps/fixtures"; -import Decorator from "@saleor/storybook/Decorator"; +import { installedAppsList } from "@dashboard/new-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/new-apps/components/AppListPage/AppListPage.tsx index a39f7a534..85fd32f2e 100644 --- a/src/new-apps/components/AppListPage/AppListPage.tsx +++ b/src/new-apps/components/AppListPage/AppListPage.tsx @@ -1,10 +1,10 @@ +import Container from "@dashboard/components/Container"; +import PageHeader from "@dashboard/components/PageHeader"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { sectionNames } from "@dashboard/intl"; +import { AppUrls } from "@dashboard/new-apps/urls"; +import { ListProps } from "@dashboard/types"; import { Typography } from "@material-ui/core"; -import Container from "@saleor/components/Container"; -import PageHeader from "@saleor/components/PageHeader"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { sectionNames } from "@saleor/intl"; -import { AppUrls } from "@saleor/new-apps/urls"; -import { ListProps } from "@saleor/types"; import React, { useCallback } from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/new-apps/components/AppListPage/types.ts b/src/new-apps/components/AppListPage/types.ts index 5ad39e6d0..32a2525ba 100644 --- a/src/new-apps/components/AppListPage/types.ts +++ b/src/new-apps/components/AppListPage/types.ts @@ -1,5 +1,5 @@ -import { AppListItemFragment } from "@saleor/graphql"; -import { GetV2SaleorAppsResponse } from "@saleor/new-apps/marketplace.types"; +import { AppListItemFragment } from "@dashboard/graphql"; +import { GetV2SaleorAppsResponse } from "@dashboard/new-apps/marketplace.types"; export interface AppListPageSections { installedApps?: AppListItemFragment[]; diff --git a/src/new-apps/components/AppListPage/utils.test.ts b/src/new-apps/components/AppListPage/utils.test.ts index 7d6dc2ffa..d509ac0e4 100644 --- a/src/new-apps/components/AppListPage/utils.test.ts +++ b/src/new-apps/components/AppListPage/utils.test.ts @@ -2,12 +2,12 @@ import { AppListItemFragment, AppTypeEnum, PermissionEnum, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import { comingSoonApp, installedAppsList, releasedApp, -} from "@saleor/new-apps/fixtures"; +} from "@dashboard/new-apps/fixtures"; import { AppListPageSections } from "./types"; import { diff --git a/src/new-apps/components/AppListPage/utils.ts b/src/new-apps/components/AppListPage/utils.ts index 3ae9ac1e6..3f3e8892c 100644 --- a/src/new-apps/components/AppListPage/utils.ts +++ b/src/new-apps/components/AppListPage/utils.ts @@ -1,6 +1,6 @@ -import { AppListItemFragment } from "@saleor/graphql"; -import { GetV2SaleorAppsResponse } from "@saleor/new-apps/marketplace.types"; -import { InstalledApp } from "@saleor/new-apps/types"; +import { AppListItemFragment } from "@dashboard/graphql"; +import { GetV2SaleorAppsResponse } from "@dashboard/new-apps/marketplace.types"; +import { InstalledApp } from "@dashboard/new-apps/types"; import { AppListPageSections } from "./types"; diff --git a/src/new-apps/components/AppManifestTableDisplay/AppManifestTableDisplay.tsx b/src/new-apps/components/AppManifestTableDisplay/AppManifestTableDisplay.tsx index 988752a1e..fb693c1c7 100644 --- a/src/new-apps/components/AppManifestTableDisplay/AppManifestTableDisplay.tsx +++ b/src/new-apps/components/AppManifestTableDisplay/AppManifestTableDisplay.tsx @@ -1,6 +1,6 @@ +import { appsMessages } from "@dashboard/new-apps/messages"; import { Typography } from "@material-ui/core"; import { CopyIcon, Tooltip } from "@saleor/macaw-ui"; -import { appsMessages } from "@saleor/new-apps/messages"; import clsx from "clsx"; import React, { useState } from "react"; import { useIntl } from "react-intl"; diff --git a/src/new-apps/components/AppPermissions/AppPermissions.tsx b/src/new-apps/components/AppPermissions/AppPermissions.tsx index b571c3a43..10544b1ad 100644 --- a/src/new-apps/components/AppPermissions/AppPermissions.tsx +++ b/src/new-apps/components/AppPermissions/AppPermissions.tsx @@ -1,4 +1,4 @@ -import { AppPermissionFragment } from "@saleor/graphql"; +import { AppPermissionFragment } from "@dashboard/graphql"; import { IconButton, PermissionsIcon, Tooltip } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/new-apps/components/InstallWithManifestFormButton/InstallWithManifestFormButton.tsx b/src/new-apps/components/InstallWithManifestFormButton/InstallWithManifestFormButton.tsx index b95013100..94ebaffdb 100644 --- a/src/new-apps/components/InstallWithManifestFormButton/InstallWithManifestFormButton.tsx +++ b/src/new-apps/components/InstallWithManifestFormButton/InstallWithManifestFormButton.tsx @@ -1,7 +1,7 @@ +import { Button } from "@dashboard/components/Button"; +import { buttonMessages } from "@dashboard/intl"; +import { appsMessages } from "@dashboard/new-apps/messages"; import { TextField } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import { buttonMessages } from "@saleor/intl"; -import { appsMessages } from "@saleor/new-apps/messages"; import React, { useState } from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/new-apps/components/InstalledAppList/InstalledAppList.tsx b/src/new-apps/components/InstalledAppList/InstalledAppList.tsx index 6c9092558..463489786 100644 --- a/src/new-apps/components/InstalledAppList/InstalledAppList.tsx +++ b/src/new-apps/components/InstalledAppList/InstalledAppList.tsx @@ -1,8 +1,8 @@ +import { TablePaginationWithContext } from "@dashboard/components/TablePagination"; +import { InstalledApp } from "@dashboard/new-apps/types"; +import { ListProps } from "@dashboard/types"; import { Table, TableBody, TableFooter, TableRow } from "@material-ui/core"; import { Skeleton } from "@material-ui/lab"; -import { TablePaginationWithContext } from "@saleor/components/TablePagination"; -import { InstalledApp } from "@saleor/new-apps/types"; -import { ListProps } from "@saleor/types"; import React from "react"; import InstalledAppListRow from "../InstalledAppListRow"; diff --git a/src/new-apps/components/InstalledAppListRow/InstalledAppListRow.test.tsx b/src/new-apps/components/InstalledAppListRow/InstalledAppListRow.test.tsx index 789163825..b2fc2ab75 100644 --- a/src/new-apps/components/InstalledAppListRow/InstalledAppListRow.test.tsx +++ b/src/new-apps/components/InstalledAppListRow/InstalledAppListRow.test.tsx @@ -1,7 +1,10 @@ -import { getAppsConfig } from "@saleor/config"; -import { AppListContext, AppListContextValues } from "@saleor/new-apps/context"; -import { activeApp, inactiveApp } from "@saleor/new-apps/fixtures"; -import { InstalledApp } from "@saleor/new-apps/types"; +import { getAppsConfig } from "@dashboard/config"; +import { + AppListContext, + AppListContextValues, +} from "@dashboard/new-apps/context"; +import { activeApp, inactiveApp } from "@dashboard/new-apps/fixtures"; +import { InstalledApp } from "@dashboard/new-apps/types"; import Wrapper from "@test/wrapper"; import { render, screen, within } from "@testing-library/react"; import userEvent from "@testing-library/user-event"; diff --git a/src/new-apps/components/InstalledAppListRow/InstalledAppListRow.tsx b/src/new-apps/components/InstalledAppListRow/InstalledAppListRow.tsx index a189c4956..1c992f95a 100644 --- a/src/new-apps/components/InstalledAppListRow/InstalledAppListRow.tsx +++ b/src/new-apps/components/InstalledAppListRow/InstalledAppListRow.tsx @@ -1,12 +1,12 @@ +import { TableButtonWrapper } from "@dashboard/components/TableButtonWrapper/TableButtonWrapper"; +import TableCellAvatar from "@dashboard/components/TableCellAvatar"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { useAppListContext } from "@dashboard/new-apps/context"; +import { InstalledApp } from "@dashboard/new-apps/types"; +import { AppUrls } from "@dashboard/new-apps/urls"; +import { isAppInTunnel } from "@dashboard/new-apps/utils"; import { Switch, TableCell, Typography } from "@material-ui/core"; -import { TableButtonWrapper } from "@saleor/components/TableButtonWrapper/TableButtonWrapper"; -import TableCellAvatar from "@saleor/components/TableCellAvatar"; -import TableRowLink from "@saleor/components/TableRowLink"; import { DeleteIcon, IconButton, Pill } from "@saleor/macaw-ui"; -import { useAppListContext } from "@saleor/new-apps/context"; -import { InstalledApp } from "@saleor/new-apps/types"; -import { AppUrls } from "@saleor/new-apps/urls"; -import { isAppInTunnel } from "@saleor/new-apps/utils"; import clsx from "clsx"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/new-apps/fixtures.ts b/src/new-apps/fixtures.ts index a38fa872b..5d389826a 100644 --- a/src/new-apps/fixtures.ts +++ b/src/new-apps/fixtures.ts @@ -5,7 +5,7 @@ import { AppTypeEnum, JobStatusEnum, PermissionEnum, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import { GetV2SaleorAppsResponse } from "./marketplace.types"; diff --git a/src/new-apps/hooks/useMarketplaceApps.ts b/src/new-apps/hooks/useMarketplaceApps.ts index 16e63e151..3b8f2241d 100644 --- a/src/new-apps/hooks/useMarketplaceApps.ts +++ b/src/new-apps/hooks/useMarketplaceApps.ts @@ -1,4 +1,4 @@ -import { GetV2SaleorAppsResponse } from "@saleor/new-apps/marketplace.types"; +import { GetV2SaleorAppsResponse } from "@dashboard/new-apps/marketplace.types"; import { useEffect, useReducer, useRef } from "react"; interface State { diff --git a/src/new-apps/index.tsx b/src/new-apps/index.tsx index f24d4c3a1..9fc0ab42b 100644 --- a/src/new-apps/index.tsx +++ b/src/new-apps/index.tsx @@ -1,4 +1,4 @@ -import { sectionNames } from "@saleor/intl"; +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/types.ts b/src/new-apps/types.ts index 8fa9fb91a..506e470e8 100644 --- a/src/new-apps/types.ts +++ b/src/new-apps/types.ts @@ -1,4 +1,4 @@ -import { AppListItemFragment } from "@saleor/graphql"; +import { AppListItemFragment } from "@dashboard/graphql"; export interface InstalledApp { app: AppListItemFragment; diff --git a/src/new-apps/urls.ts b/src/new-apps/urls.ts index d16f21e3d..820b36f43 100644 --- a/src/new-apps/urls.ts +++ b/src/new-apps/urls.ts @@ -1,5 +1,5 @@ -import { AppDetailsUrlQueryParams } from "@saleor/apps/urls"; -import { stringifyQs } from "@saleor/utils/urls"; +import { AppDetailsUrlQueryParams } from "@dashboard/apps/urls"; +import { stringifyQs } from "@dashboard/utils/urls"; import urlJoin from "url-join"; import { Dialog, SingleAction } from "../types"; diff --git a/src/new-apps/utils.ts b/src/new-apps/utils.ts index 28b4c10d3..aaf081450 100644 --- a/src/new-apps/utils.ts +++ b/src/new-apps/utils.ts @@ -1,4 +1,4 @@ -import { getAppsConfig } from "@saleor/config"; +import { getAppsConfig } from "@dashboard/config"; import { IntlShape } from "react-intl"; import { GetV2SaleorAppsResponse } from "./marketplace.types"; diff --git a/src/new-apps/views/AppList/AppList.tsx b/src/new-apps/views/AppList/AppList.tsx index 2bb47b268..18a7a8a53 100644 --- a/src/new-apps/views/AppList/AppList.tsx +++ b/src/new-apps/views/AppList/AppList.tsx @@ -1,6 +1,6 @@ import { useApolloClient } from "@apollo/client"; -import { EXTENSION_LIST_QUERY } from "@saleor/apps/queries"; -import { getAppsConfig } from "@saleor/config"; +import { EXTENSION_LIST_QUERY } from "@dashboard/apps/queries"; +import { getAppsConfig } from "@dashboard/config"; import { AppSortField, AppTypeEnum, @@ -9,30 +9,33 @@ import { useAppDeactivateMutation, useAppDeleteMutation, useAppsListQuery, -} from "@saleor/graphql"; -import useListSettings from "@saleor/hooks/useListSettings"; +} from "@dashboard/graphql"; +import useListSettings from "@dashboard/hooks/useListSettings"; import useLocalPaginator, { useLocalPaginationState, -} from "@saleor/hooks/useLocalPaginator"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { PaginatorContext } from "@saleor/hooks/usePaginator"; -import { findById } from "@saleor/misc"; -import AppActivateDialog from "@saleor/new-apps/components/AppActivateDialog"; -import AppDeactivateDialog from "@saleor/new-apps/components/AppDeactivateDialog"; -import AppDeleteDialog from "@saleor/new-apps/components/AppDeleteDialog"; -import AppListPage from "@saleor/new-apps/components/AppListPage/AppListPage"; -import { AppListContext, AppListContextValues } from "@saleor/new-apps/context"; -import useMarketplaceApps from "@saleor/new-apps/hooks/useMarketplaceApps"; +} from "@dashboard/hooks/useLocalPaginator"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { PaginatorContext } from "@dashboard/hooks/usePaginator"; +import { findById } from "@dashboard/misc"; +import AppActivateDialog from "@dashboard/new-apps/components/AppActivateDialog"; +import AppDeactivateDialog from "@dashboard/new-apps/components/AppDeactivateDialog"; +import AppDeleteDialog from "@dashboard/new-apps/components/AppDeleteDialog"; +import AppListPage from "@dashboard/new-apps/components/AppListPage/AppListPage"; +import { + AppListContext, + AppListContextValues, +} from "@dashboard/new-apps/context"; +import useMarketplaceApps from "@dashboard/new-apps/hooks/useMarketplaceApps"; import { AppListUrlDialog, AppListUrlQueryParams, AppUrls, -} from "@saleor/new-apps/urls"; -import { getMarketplaceAppsLists } from "@saleor/new-apps/utils"; -import { ListViews } from "@saleor/types"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/new-apps/urls"; +import { getMarketplaceAppsLists } from "@dashboard/new-apps/utils"; +import { ListViews } from "@dashboard/types"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/orders/components/OrderAddressFields/OrderAddressFields.tsx b/src/orders/components/OrderAddressFields/OrderAddressFields.tsx index 4a467f108..f713a9d7f 100644 --- a/src/orders/components/OrderAddressFields/OrderAddressFields.tsx +++ b/src/orders/components/OrderAddressFields/OrderAddressFields.tsx @@ -3,10 +3,10 @@ import { CustomerAddressesQuery, OrderDetailsQuery, OrderErrorFragment, -} from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; +} from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import { transformAddressToForm } from "@dashboard/misc"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { transformAddressToForm } from "@saleor/misc"; import React from "react"; import OrderCustomerAddressesEditDialog, { diff --git a/src/orders/components/OrderBulkCancelDialog/OrderBulkCancelDialog.tsx b/src/orders/components/OrderBulkCancelDialog/OrderBulkCancelDialog.tsx index f9d0f946e..c92346977 100644 --- a/src/orders/components/OrderBulkCancelDialog/OrderBulkCancelDialog.tsx +++ b/src/orders/components/OrderBulkCancelDialog/OrderBulkCancelDialog.tsx @@ -1,5 +1,5 @@ +import ActionDialog from "@dashboard/components/ActionDialog"; import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderCancelDialog/OrderCancelDialog.tsx b/src/orders/components/OrderCancelDialog/OrderCancelDialog.tsx index 1a6030cc2..5cf5dae9a 100644 --- a/src/orders/components/OrderCancelDialog/OrderCancelDialog.tsx +++ b/src/orders/components/OrderCancelDialog/OrderCancelDialog.tsx @@ -1,3 +1,10 @@ +import BackButton from "@dashboard/components/BackButton"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import { OrderErrorFragment } from "@dashboard/graphql"; +import useModalDialogErrors from "@dashboard/hooks/useModalDialogErrors"; +import { buttonMessages } from "@dashboard/intl"; +import getOrderErrorMessage from "@dashboard/utils/errors/order"; import { Dialog, DialogActions, @@ -5,14 +12,7 @@ import { DialogContentText, DialogTitle, } from "@material-ui/core"; -import BackButton from "@saleor/components/BackButton"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import FormSpacer from "@saleor/components/FormSpacer"; -import { OrderErrorFragment } from "@saleor/graphql"; -import useModalDialogErrors from "@saleor/hooks/useModalDialogErrors"; -import { buttonMessages } from "@saleor/intl"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import getOrderErrorMessage from "@saleor/utils/errors/order"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderCannotCancelOrderDialog/OrderCannotCancelOrderDialog.tsx b/src/orders/components/OrderCannotCancelOrderDialog/OrderCannotCancelOrderDialog.tsx index 83a3e1bbc..0d86d0b05 100644 --- a/src/orders/components/OrderCannotCancelOrderDialog/OrderCannotCancelOrderDialog.tsx +++ b/src/orders/components/OrderCannotCancelOrderDialog/OrderCannotCancelOrderDialog.tsx @@ -1,3 +1,6 @@ +import { Button } from "@dashboard/components/Button"; +import { buttonMessages } from "@dashboard/intl"; +import { DialogProps } from "@dashboard/types"; import { Dialog, DialogActions, @@ -5,10 +8,7 @@ import { DialogContentText, DialogTitle, } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import { buttonMessages } from "@saleor/intl"; import { makeStyles } from "@saleor/macaw-ui"; -import { DialogProps } from "@saleor/types"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/orders/components/OrderCardTitle/OrderCardTitle.tsx b/src/orders/components/OrderCardTitle/OrderCardTitle.tsx index cfcf98086..1b8493daa 100644 --- a/src/orders/components/OrderCardTitle/OrderCardTitle.tsx +++ b/src/orders/components/OrderCardTitle/OrderCardTitle.tsx @@ -1,9 +1,9 @@ +import HorizontalSpacer from "@dashboard/apps/components/HorizontalSpacer"; +import DefaultCardTitle from "@dashboard/components/CardTitle"; +import { FulfillmentStatus } from "@dashboard/graphql"; +import { StatusType } from "@dashboard/types"; import { Typography } from "@material-ui/core"; -import HorizontalSpacer from "@saleor/apps/components/HorizontalSpacer"; -import DefaultCardTitle from "@saleor/components/CardTitle"; -import { FulfillmentStatus } from "@saleor/graphql"; import { CircleIndicator, makeStyles } from "@saleor/macaw-ui"; -import { StatusType } from "@saleor/types"; import camelCase from "lodash/camelCase"; import React from "react"; import { defineMessages, FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderChangeWarehouseDialog/OrderChangeWarehouseDialog.tsx b/src/orders/components/OrderChangeWarehouseDialog/OrderChangeWarehouseDialog.tsx index 628be5f71..3ace027f3 100644 --- a/src/orders/components/OrderChangeWarehouseDialog/OrderChangeWarehouseDialog.tsx +++ b/src/orders/components/OrderChangeWarehouseDialog/OrderChangeWarehouseDialog.tsx @@ -1,3 +1,15 @@ +import Debounce from "@dashboard/components/Debounce"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { + OrderFulfillLineFragment, + WarehouseFragment, +} from "@dashboard/graphql"; +import { buttonMessages } from "@dashboard/intl"; +import { getById } from "@dashboard/misc"; +import { getLineAvailableQuantityInWarehouse } from "@dashboard/orders/utils/data"; +import useWarehouseSearch from "@dashboard/searches/useWarehouseSearch"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import { Dialog, DialogActions, @@ -10,11 +22,6 @@ import { TextField, Typography, } from "@material-ui/core"; -import Debounce from "@saleor/components/Debounce"; -import Skeleton from "@saleor/components/Skeleton"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { OrderFulfillLineFragment, WarehouseFragment } from "@saleor/graphql"; -import { buttonMessages } from "@saleor/intl"; import { Button, DialogHeader, @@ -25,10 +32,6 @@ import { SearchIcon, useElementScroll, } from "@saleor/macaw-ui"; -import { getById } from "@saleor/misc"; -import { getLineAvailableQuantityInWarehouse } from "@saleor/orders/utils/data"; -import useWarehouseSearch from "@saleor/searches/useWarehouseSearch"; -import { mapEdgesToItems } from "@saleor/utils/maps"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderChannelSectionCard/OrderChannelSectionCard.tsx b/src/orders/components/OrderChannelSectionCard/OrderChannelSectionCard.tsx index 074b38b4c..2b736b27a 100644 --- a/src/orders/components/OrderChannelSectionCard/OrderChannelSectionCard.tsx +++ b/src/orders/components/OrderChannelSectionCard/OrderChannelSectionCard.tsx @@ -1,9 +1,9 @@ +import { channelUrl } from "@dashboard/channels/urls"; +import CardTitle from "@dashboard/components/CardTitle"; +import Link from "@dashboard/components/Link"; +import Skeleton from "@dashboard/components/Skeleton"; +import { ChannelFragment } from "@dashboard/graphql"; import { Card, CardContent, Typography } from "@material-ui/core"; -import { channelUrl } from "@saleor/channels/urls"; -import CardTitle from "@saleor/components/CardTitle"; -import Link from "@saleor/components/Link"; -import Skeleton from "@saleor/components/Skeleton"; -import { ChannelFragment } from "@saleor/graphql"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/orders/components/OrderCustomer/AddrssTextError.tsx b/src/orders/components/OrderCustomer/AddrssTextError.tsx index f2a31ab8f..fa4cfde98 100644 --- a/src/orders/components/OrderCustomer/AddrssTextError.tsx +++ b/src/orders/components/OrderCustomer/AddrssTextError.tsx @@ -1,7 +1,7 @@ +import FormSpacer from "@dashboard/components/FormSpacer"; +import { OrderErrorFragment } from "@dashboard/graphql"; +import getOrderErrorMessage from "@dashboard/utils/errors/order"; import { Typography } from "@material-ui/core"; -import FormSpacer from "@saleor/components/FormSpacer"; -import { OrderErrorFragment } from "@saleor/graphql"; -import getOrderErrorMessage from "@saleor/utils/errors/order"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/orders/components/OrderCustomer/OrderCustomer.tsx b/src/orders/components/OrderCustomer/OrderCustomer.tsx index 3c09d7e78..72b7bb72a 100644 --- a/src/orders/components/OrderCustomer/OrderCustomer.tsx +++ b/src/orders/components/OrderCustomer/OrderCustomer.tsx @@ -1,25 +1,25 @@ -import { Card, CardContent, Typography } from "@material-ui/core"; -import AddressFormatter from "@saleor/components/AddressFormatter"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import ExternalLink from "@saleor/components/ExternalLink"; -import Form from "@saleor/components/Form"; -import Hr from "@saleor/components/Hr"; -import Link from "@saleor/components/Link"; -import RequirePermissions from "@saleor/components/RequirePermissions"; -import SingleAutocompleteSelectField from "@saleor/components/SingleAutocompleteSelectField"; -import Skeleton from "@saleor/components/Skeleton"; +import AddressFormatter from "@dashboard/components/AddressFormatter"; +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import ExternalLink from "@dashboard/components/ExternalLink"; +import Form from "@dashboard/components/Form"; +import Hr from "@dashboard/components/Hr"; +import Link from "@dashboard/components/Link"; +import RequirePermissions from "@dashboard/components/RequirePermissions"; +import SingleAutocompleteSelectField from "@dashboard/components/SingleAutocompleteSelectField"; +import Skeleton from "@dashboard/components/Skeleton"; import { OrderDetailsFragment, OrderErrorCode, OrderErrorFragment, PermissionEnum, SearchCustomersQuery, -} from "@saleor/graphql"; -import useStateFromProps from "@saleor/hooks/useStateFromProps"; -import { buttonMessages } from "@saleor/intl"; -import { FetchMoreProps, RelayToFlat } from "@saleor/types"; -import createSingleAutocompleteSelectHandler from "@saleor/utils/handlers/singleAutocompleteSelectChangeHandler"; +} from "@dashboard/graphql"; +import useStateFromProps from "@dashboard/hooks/useStateFromProps"; +import { buttonMessages } from "@dashboard/intl"; +import { FetchMoreProps, RelayToFlat } from "@dashboard/types"; +import createSingleAutocompleteSelectHandler from "@dashboard/utils/handlers/singleAutocompleteSelectChangeHandler"; +import { Card, CardContent, Typography } from "@material-ui/core"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderCustomer/PickupAnnotation.tsx b/src/orders/components/OrderCustomer/PickupAnnotation.tsx index b1582f8b8..eb33aea07 100644 --- a/src/orders/components/OrderCustomer/PickupAnnotation.tsx +++ b/src/orders/components/OrderCustomer/PickupAnnotation.tsx @@ -1,9 +1,9 @@ -import { Typography } from "@material-ui/core"; -import FormSpacer from "@saleor/components/FormSpacer"; +import FormSpacer from "@dashboard/components/FormSpacer"; import { OrderDetailsFragment, WarehouseClickAndCollectOptionEnum, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; +import { Typography } from "@material-ui/core"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/orders/components/OrderCustomerAddressesEditDialog/OrderCustomerAddressEdit.tsx b/src/orders/components/OrderCustomerAddressesEditDialog/OrderCustomerAddressEdit.tsx index baa31a0e4..12bdd6be5 100644 --- a/src/orders/components/OrderCustomerAddressesEditDialog/OrderCustomerAddressEdit.tsx +++ b/src/orders/components/OrderCustomerAddressesEditDialog/OrderCustomerAddressEdit.tsx @@ -1,18 +1,18 @@ -import { FormControlLabel, Radio, RadioGroup } from "@material-ui/core"; -import AddressEdit from "@saleor/components/AddressEdit"; -import CardSpacer from "@saleor/components/CardSpacer"; -import FormSpacer from "@saleor/components/FormSpacer"; -import { SingleAutocompleteChoiceType } from "@saleor/components/SingleAutocompleteSelectField"; -import Skeleton from "@saleor/components/Skeleton"; -import CustomerAddressChoiceCard from "@saleor/customers/components/CustomerAddressChoiceCard"; -import { AddressTypeInput } from "@saleor/customers/types"; +import AddressEdit from "@dashboard/components/AddressEdit"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import { SingleAutocompleteChoiceType } from "@dashboard/components/SingleAutocompleteSelectField"; +import Skeleton from "@dashboard/components/Skeleton"; +import CustomerAddressChoiceCard from "@dashboard/customers/components/CustomerAddressChoiceCard"; +import { AddressTypeInput } from "@dashboard/customers/types"; import { AccountErrorFragment, AddressFragment, OrderErrorFragment, -} from "@saleor/graphql"; -import { FormChange } from "@saleor/hooks/useForm"; -import { getById } from "@saleor/misc"; +} from "@dashboard/graphql"; +import { FormChange } from "@dashboard/hooks/useForm"; +import { getById } from "@dashboard/misc"; +import { FormControlLabel, Radio, RadioGroup } from "@material-ui/core"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/orders/components/OrderCustomerAddressesEditDialog/OrderCustomerAddressesEditDialog.tsx b/src/orders/components/OrderCustomerAddressesEditDialog/OrderCustomerAddressesEditDialog.tsx index 0705b93a0..ac20a135c 100644 --- a/src/orders/components/OrderCustomerAddressesEditDialog/OrderCustomerAddressesEditDialog.tsx +++ b/src/orders/components/OrderCustomerAddressesEditDialog/OrderCustomerAddressesEditDialog.tsx @@ -1,3 +1,22 @@ +import VerticalSpacer from "@dashboard/apps/components/VerticalSpacer"; +import Checkbox from "@dashboard/components/Checkbox"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import { AddressTypeInput } from "@dashboard/customers/types"; +import { + AddressFragment, + AddressInput, + AddressTypeEnum, + CountryWithCodeFragment, + Node, + OrderErrorFragment, +} from "@dashboard/graphql"; +import useAddressValidation from "@dashboard/hooks/useAddressValidation"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useModalDialogErrors from "@dashboard/hooks/useModalDialogErrors"; +import { buttonMessages } from "@dashboard/intl"; +import { getById, transformAddressToAddressInput } from "@dashboard/misc"; +import { mapCountriesToChoices } from "@dashboard/utils/maps"; import { Dialog, DialogActions, @@ -6,26 +25,7 @@ import { FormControlLabel, Typography, } from "@material-ui/core"; -import VerticalSpacer from "@saleor/apps/components/VerticalSpacer"; -import Checkbox from "@saleor/components/Checkbox"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import FormSpacer from "@saleor/components/FormSpacer"; -import { AddressTypeInput } from "@saleor/customers/types"; -import { - AddressFragment, - AddressInput, - AddressTypeEnum, - CountryWithCodeFragment, - Node, - OrderErrorFragment, -} from "@saleor/graphql"; -import useAddressValidation from "@saleor/hooks/useAddressValidation"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useModalDialogErrors from "@saleor/hooks/useModalDialogErrors"; -import { buttonMessages } from "@saleor/intl"; import { ConfirmButtonTransitionState, DialogHeader } from "@saleor/macaw-ui"; -import { getById, transformAddressToAddressInput } from "@saleor/misc"; -import { mapCountriesToChoices } from "@saleor/utils/maps"; import React from "react"; import { FormattedMessage, MessageDescriptor, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderCustomerAddressesEditDialog/OrderCustomerAddressesSearch.tsx b/src/orders/components/OrderCustomerAddressesEditDialog/OrderCustomerAddressesSearch.tsx index e6d8e0fe4..c59b89198 100644 --- a/src/orders/components/OrderCustomerAddressesEditDialog/OrderCustomerAddressesSearch.tsx +++ b/src/orders/components/OrderCustomerAddressesEditDialog/OrderCustomerAddressesSearch.tsx @@ -1,3 +1,10 @@ +import VerticalSpacer from "@dashboard/apps/components/VerticalSpacer"; +import { ConfirmButton } from "@dashboard/components/ConfirmButton"; +import CustomerAddressChoiceCard from "@dashboard/customers/components/CustomerAddressChoiceCard"; +import { AddressFragment, AddressTypeEnum } from "@dashboard/graphql"; +import { FormChange } from "@dashboard/hooks/useForm"; +import { buttonMessages } from "@dashboard/intl"; +import { getById } from "@dashboard/misc"; import { Checkbox, DialogActions, @@ -6,18 +13,11 @@ import { InputAdornment, TextField, } from "@material-ui/core"; -import VerticalSpacer from "@saleor/apps/components/VerticalSpacer"; -import { ConfirmButton } from "@saleor/components/ConfirmButton"; -import CustomerAddressChoiceCard from "@saleor/customers/components/CustomerAddressChoiceCard"; -import { AddressFragment, AddressTypeEnum } from "@saleor/graphql"; -import { FormChange } from "@saleor/hooks/useForm"; -import { buttonMessages } from "@saleor/intl"; import { Button, ConfirmButtonTransitionState, SearchIcon, } from "@saleor/macaw-ui"; -import { getById } from "@saleor/misc"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderCustomerAddressesEditDialog/form.tsx b/src/orders/components/OrderCustomerAddressesEditDialog/form.tsx index 0df8edbd2..02aa4e2c5 100644 --- a/src/orders/components/OrderCustomerAddressesEditDialog/form.tsx +++ b/src/orders/components/OrderCustomerAddressesEditDialog/form.tsx @@ -1,18 +1,18 @@ -import { useExitFormDialog } from "@saleor/components/Form/useExitFormDialog"; -import { SingleAutocompleteChoiceType } from "@saleor/components/SingleAutocompleteSelectField"; -import { AddressTypeInput } from "@saleor/customers/types"; +import { useExitFormDialog } from "@dashboard/components/Form/useExitFormDialog"; +import { SingleAutocompleteChoiceType } from "@dashboard/components/SingleAutocompleteSelectField"; +import { AddressTypeInput } from "@dashboard/customers/types"; import { AddressFragment, CountryWithCodeFragment, Node, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import useForm, { CommonUseFormResultWithHandlers, FormChange, SubmitPromise, -} from "@saleor/hooks/useForm"; -import useHandleFormSubmit from "@saleor/hooks/useHandleFormSubmit"; -import createSingleAutocompleteSelectHandler from "@saleor/utils/handlers/singleAutocompleteSelectChangeHandler"; +} from "@dashboard/hooks/useForm"; +import useHandleFormSubmit from "@dashboard/hooks/useHandleFormSubmit"; +import createSingleAutocompleteSelectHandler from "@dashboard/utils/handlers/singleAutocompleteSelectChangeHandler"; import React, { useEffect, useState } from "react"; export enum AddressInputOptionEnum { diff --git a/src/orders/components/OrderCustomerAddressesEditDialog/types.ts b/src/orders/components/OrderCustomerAddressesEditDialog/types.ts index f00b326df..a86129a1f 100644 --- a/src/orders/components/OrderCustomerAddressesEditDialog/types.ts +++ b/src/orders/components/OrderCustomerAddressesEditDialog/types.ts @@ -1,4 +1,4 @@ -import { AddressInput, AddressTypeEnum } from "@saleor/graphql"; +import { AddressInput, AddressTypeEnum } from "@dashboard/graphql"; export interface OrderCustomerSearchAddressState { open: boolean; diff --git a/src/orders/components/OrderCustomerAddressesEditDialog/utils.ts b/src/orders/components/OrderCustomerAddressesEditDialog/utils.ts index b092a4183..ef91d1833 100644 --- a/src/orders/components/OrderCustomerAddressesEditDialog/utils.ts +++ b/src/orders/components/OrderCustomerAddressesEditDialog/utils.ts @@ -1,4 +1,4 @@ -import { SingleAutocompleteChoiceType } from "@saleor/components/SingleAutocompleteSelectField"; +import { SingleAutocompleteChoiceType } from "@dashboard/components/SingleAutocompleteSelectField"; import { AccountErrorFragment, AddressFragment, @@ -6,9 +6,9 @@ import { AddressTypeEnum, Node, OrderErrorFragment, -} from "@saleor/graphql"; -import { FormChange } from "@saleor/hooks/useForm"; -import { flatten, getById } from "@saleor/misc"; +} from "@dashboard/graphql"; +import { FormChange } from "@dashboard/hooks/useForm"; +import { flatten, getById } from "@dashboard/misc"; import { OrderCustomerAddressesEditData, diff --git a/src/orders/components/OrderCustomerChangeDialog/OrderCustomerChangeDialog.tsx b/src/orders/components/OrderCustomerChangeDialog/OrderCustomerChangeDialog.tsx index 96062f6e6..ac16d3fb2 100644 --- a/src/orders/components/OrderCustomerChangeDialog/OrderCustomerChangeDialog.tsx +++ b/src/orders/components/OrderCustomerChangeDialog/OrderCustomerChangeDialog.tsx @@ -1,3 +1,6 @@ +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import { buttonMessages } from "@dashboard/intl"; import { Dialog, DialogActions, @@ -8,9 +11,6 @@ import { RadioGroup, Typography, } from "@material-ui/core"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import FormSpacer from "@saleor/components/FormSpacer"; -import { buttonMessages } from "@saleor/intl"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderCustomerChangeDialog/form.tsx b/src/orders/components/OrderCustomerChangeDialog/form.tsx index d8382ed1e..9f56b2821 100644 --- a/src/orders/components/OrderCustomerChangeDialog/form.tsx +++ b/src/orders/components/OrderCustomerChangeDialog/form.tsx @@ -1,5 +1,5 @@ -import useForm, { CommonUseFormResult } from "@saleor/hooks/useForm"; -import useHandleFormSubmit from "@saleor/hooks/useHandleFormSubmit"; +import useForm, { CommonUseFormResult } from "@dashboard/hooks/useForm"; +import useHandleFormSubmit from "@dashboard/hooks/useHandleFormSubmit"; import React from "react"; export enum CustomerChangeActionEnum { diff --git a/src/orders/components/OrderCustomerNote/OrderCustomerNote.tsx b/src/orders/components/OrderCustomerNote/OrderCustomerNote.tsx index 7a292b29e..f5b7c4cf3 100644 --- a/src/orders/components/OrderCustomerNote/OrderCustomerNote.tsx +++ b/src/orders/components/OrderCustomerNote/OrderCustomerNote.tsx @@ -1,6 +1,6 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import Skeleton from "@dashboard/components/Skeleton"; import { Card, CardContent, Typography } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import Skeleton from "@saleor/components/Skeleton"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderDetailsPage/OrderDetailsPage.stories.tsx b/src/orders/components/OrderDetailsPage/OrderDetailsPage.stories.tsx index 50092bb2c..9dec20306 100644 --- a/src/orders/components/OrderDetailsPage/OrderDetailsPage.stories.tsx +++ b/src/orders/components/OrderDetailsPage/OrderDetailsPage.stories.tsx @@ -3,12 +3,12 @@ import { FulfillmentStatus, OrderStatus, PaymentChargeStatusEnum, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import { order as orderFixture, shop as shopFixture, -} from "@saleor/orders/fixtures"; -import Decorator from "@saleor/storybook/Decorator"; +} from "@dashboard/orders/fixtures"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx b/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx index f0a4d75ba..15296d363 100644 --- a/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx +++ b/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx @@ -1,34 +1,34 @@ -import { Typography } from "@material-ui/core"; import { extensionMountPoints, mapToMenuItemsForOrderDetails, useExtensions, -} from "@saleor/apps/useExtensions"; -import { Backlink } from "@saleor/components/Backlink"; -import CardMenu from "@saleor/components/CardMenu"; -import { CardSpacer } from "@saleor/components/CardSpacer"; -import { Container } from "@saleor/components/Container"; -import { DateTime } from "@saleor/components/Date"; -import Form from "@saleor/components/Form"; -import Grid from "@saleor/components/Grid"; -import Metadata, { MetadataFormData } from "@saleor/components/Metadata"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; -import Skeleton from "@saleor/components/Skeleton"; +} from "@dashboard/apps/useExtensions"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardMenu from "@dashboard/components/CardMenu"; +import { CardSpacer } from "@dashboard/components/CardSpacer"; +import { Container } from "@dashboard/components/Container"; +import { DateTime } from "@dashboard/components/Date"; +import Form from "@dashboard/components/Form"; +import Grid from "@dashboard/components/Grid"; +import Metadata, { MetadataFormData } from "@dashboard/components/Metadata"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; +import Skeleton from "@dashboard/components/Skeleton"; import { OrderDetailsFragment, OrderDetailsQuery, OrderErrorFragment, OrderStatus, -} from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { sectionNames } from "@saleor/intl"; +} from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { sectionNames } from "@dashboard/intl"; +import OrderChannelSectionCard from "@dashboard/orders/components/OrderChannelSectionCard"; +import { orderListUrl } from "@dashboard/orders/urls"; +import { mapMetadataItemToInput } from "@dashboard/utils/maps"; +import useMetadataChangeTrigger from "@dashboard/utils/metadata/useMetadataChangeTrigger"; +import { Typography } from "@material-ui/core"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import OrderChannelSectionCard from "@saleor/orders/components/OrderChannelSectionCard"; -import { orderListUrl } from "@saleor/orders/urls"; -import { mapMetadataItemToInput } from "@saleor/utils/maps"; -import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/orders/components/OrderDetailsPage/Title.tsx b/src/orders/components/OrderDetailsPage/Title.tsx index e06dcde43..8c3a5a688 100644 --- a/src/orders/components/OrderDetailsPage/Title.tsx +++ b/src/orders/components/OrderDetailsPage/Title.tsx @@ -1,6 +1,6 @@ -import { OrderDetailsFragment } from "@saleor/graphql"; +import { OrderDetailsFragment } from "@dashboard/graphql"; +import { transformOrderStatus } from "@dashboard/misc"; import { makeStyles, Pill } from "@saleor/macaw-ui"; -import { transformOrderStatus } from "@saleor/misc"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/orders/components/OrderDetailsPage/utils.ts b/src/orders/components/OrderDetailsPage/utils.ts index b8f856a38..b4149d265 100644 --- a/src/orders/components/OrderDetailsPage/utils.ts +++ b/src/orders/components/OrderDetailsPage/utils.ts @@ -1,4 +1,4 @@ -import { OrderDetailsFragment } from "@saleor/graphql"; +import { OrderDetailsFragment } from "@dashboard/graphql"; import { getFulfilledFulfillemnts, diff --git a/src/orders/components/OrderDiscountCommonModal/ModalTitle.tsx b/src/orders/components/OrderDiscountCommonModal/ModalTitle.tsx index 5ed148ac1..efc4fd629 100644 --- a/src/orders/components/OrderDiscountCommonModal/ModalTitle.tsx +++ b/src/orders/components/OrderDiscountCommonModal/ModalTitle.tsx @@ -1,6 +1,6 @@ +import CardSpacer from "@dashboard/components/CardSpacer"; import { Divider, Typography } from "@material-ui/core"; import CloseIcon from "@material-ui/icons/Close"; -import CardSpacer from "@saleor/components/CardSpacer"; import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; diff --git a/src/orders/components/OrderDiscountCommonModal/OrderDiscountCommonModal.tsx b/src/orders/components/OrderDiscountCommonModal/OrderDiscountCommonModal.tsx index cf9553a33..e63541f04 100644 --- a/src/orders/components/OrderDiscountCommonModal/OrderDiscountCommonModal.tsx +++ b/src/orders/components/OrderDiscountCommonModal/OrderDiscountCommonModal.tsx @@ -1,3 +1,11 @@ +import DialogButtons from "@dashboard/components/ActionDialog/DialogButtons"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import PriceField from "@dashboard/components/PriceField"; +import RadioGroupField from "@dashboard/components/RadioGroupField"; +import { DiscountValueTypeEnum, MoneyFragment } from "@dashboard/graphql"; +import { useUpdateEffect } from "@dashboard/hooks/useUpdateEffect"; +import { buttonMessages } from "@dashboard/intl"; import { Card, CardContent, @@ -6,14 +14,6 @@ import { Typography, } from "@material-ui/core"; import { PopperPlacementType } from "@material-ui/core/Popper"; -import DialogButtons from "@saleor/components/ActionDialog/DialogButtons"; -import CardSpacer from "@saleor/components/CardSpacer"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import PriceField from "@saleor/components/PriceField"; -import RadioGroupField from "@saleor/components/RadioGroupField"; -import { DiscountValueTypeEnum, MoneyFragment } from "@saleor/graphql"; -import { useUpdateEffect } from "@saleor/hooks/useUpdateEffect"; -import { buttonMessages } from "@saleor/intl"; import { ConfirmButtonTransitionState, makeStyles } from "@saleor/macaw-ui"; import React, { ChangeEvent, diff --git a/src/orders/components/OrderDiscountCommonModal/types.ts b/src/orders/components/OrderDiscountCommonModal/types.ts index f1da98b57..daecd3de9 100644 --- a/src/orders/components/OrderDiscountCommonModal/types.ts +++ b/src/orders/components/OrderDiscountCommonModal/types.ts @@ -1,4 +1,4 @@ -import { DiscountValueTypeEnum } from "@saleor/graphql"; +import { DiscountValueTypeEnum } from "@dashboard/graphql"; export const ORDER_DISCOUNT = "add-order-discount"; export const ORDER_LINE_DISCOUNT = "add-order-line-discount"; diff --git a/src/orders/components/OrderDraftCancelDialog/OrderDraftCancelDialog.tsx b/src/orders/components/OrderDraftCancelDialog/OrderDraftCancelDialog.tsx index 4270946c4..a6a060755 100644 --- a/src/orders/components/OrderDraftCancelDialog/OrderDraftCancelDialog.tsx +++ b/src/orders/components/OrderDraftCancelDialog/OrderDraftCancelDialog.tsx @@ -1,10 +1,10 @@ +import ActionDialog from "@dashboard/components/ActionDialog"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import { OrderErrorFragment } from "@dashboard/graphql"; +import useModalDialogErrors from "@dashboard/hooks/useModalDialogErrors"; +import getOrderErrorMessage from "@dashboard/utils/errors/order"; import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; -import FormSpacer from "@saleor/components/FormSpacer"; -import { OrderErrorFragment } from "@saleor/graphql"; -import useModalDialogErrors from "@saleor/hooks/useModalDialogErrors"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import getOrderErrorMessage from "@saleor/utils/errors/order"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderDraftDetails/OrderDraftDetails.tsx b/src/orders/components/OrderDraftDetails/OrderDraftDetails.tsx index bb15c5ba8..352a438bc 100644 --- a/src/orders/components/OrderDraftDetails/OrderDraftDetails.tsx +++ b/src/orders/components/OrderDraftDetails/OrderDraftDetails.tsx @@ -1,16 +1,16 @@ -import { Card, CardContent } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; import { ChannelUsabilityDataQuery, OrderDetailsFragment, OrderErrorFragment, OrderLineInput, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import { OrderDiscountContext, OrderDiscountContextConsumerProps, -} from "@saleor/products/components/OrderDiscountProviders/OrderDiscountProvider"; +} from "@dashboard/products/components/OrderDiscountProviders/OrderDiscountProvider"; +import { Card, CardContent } from "@material-ui/core"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderDraftDetailsProducts/OrderDraftDetailsProducts.tsx b/src/orders/components/OrderDraftDetailsProducts/OrderDraftDetailsProducts.tsx index 5c63db3f6..f50cd08de 100644 --- a/src/orders/components/OrderDraftDetailsProducts/OrderDraftDetailsProducts.tsx +++ b/src/orders/components/OrderDraftDetailsProducts/OrderDraftDetailsProducts.tsx @@ -1,14 +1,14 @@ -import { TableBody, TableCell, TableHead, Typography } from "@material-ui/core"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { OrderDetailsFragment, OrderErrorFragment } from "@saleor/graphql"; -import { makeStyles } from "@saleor/macaw-ui"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { OrderDetailsFragment, OrderErrorFragment } from "@dashboard/graphql"; import { OrderLineDiscountConsumer, OrderLineDiscountContextConsumerProps, -} from "@saleor/products/components/OrderDiscountProviders/OrderLineDiscountProvider"; -import getOrderErrorMessage from "@saleor/utils/errors/order"; +} from "@dashboard/products/components/OrderDiscountProviders/OrderLineDiscountProvider"; +import getOrderErrorMessage from "@dashboard/utils/errors/order"; +import { TableBody, TableCell, TableHead, Typography } from "@material-ui/core"; +import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderDraftDetailsProducts/TableLine.test.tsx b/src/orders/components/OrderDraftDetailsProducts/TableLine.test.tsx index bdae3b908..c9f970ad9 100644 --- a/src/orders/components/OrderDraftDetailsProducts/TableLine.test.tsx +++ b/src/orders/components/OrderDraftDetailsProducts/TableLine.test.tsx @@ -1,4 +1,4 @@ -import { order } from "@saleor/orders/fixtures"; +import { order } from "@dashboard/orders/fixtures"; import { render, screen } from "@testing-library/react"; import React from "react"; diff --git a/src/orders/components/OrderDraftDetailsProducts/TableLine.tsx b/src/orders/components/OrderDraftDetailsProducts/TableLine.tsx index 39a69b4ca..aa5e57a65 100644 --- a/src/orders/components/OrderDraftDetailsProducts/TableLine.tsx +++ b/src/orders/components/OrderDraftDetailsProducts/TableLine.tsx @@ -1,16 +1,16 @@ -import { TableCell, Typography } from "@material-ui/core"; -import Link from "@saleor/components/Link"; -import Money from "@saleor/components/Money"; -import TableCellAvatar from "@saleor/components/TableCellAvatar"; -import { AVATAR_MARGIN } from "@saleor/components/TableCellAvatar/Avatar"; -import TableRowLink from "@saleor/components/TableRowLink"; +import Link from "@dashboard/components/Link"; +import Money from "@dashboard/components/Money"; +import TableCellAvatar from "@dashboard/components/TableCellAvatar"; +import { AVATAR_MARGIN } from "@dashboard/components/TableCellAvatar/Avatar"; +import TableRowLink from "@dashboard/components/TableRowLink"; import { OrderErrorFragment, OrderLineFragment, OrderLineInput, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; +import { OrderLineDiscountContextConsumerProps } from "@dashboard/products/components/OrderDiscountProviders/OrderLineDiscountProvider"; +import { TableCell, Typography } from "@material-ui/core"; import { DeleteIcon, IconButton, makeStyles } from "@saleor/macaw-ui"; -import { OrderLineDiscountContextConsumerProps } from "@saleor/products/components/OrderDiscountProviders/OrderLineDiscountProvider"; import clsx from "clsx"; import React, { useRef } from "react"; diff --git a/src/orders/components/OrderDraftDetailsProducts/TableLineForm.tsx b/src/orders/components/OrderDraftDetailsProducts/TableLineForm.tsx index 9e7bc1760..436175ad6 100644 --- a/src/orders/components/OrderDraftDetailsProducts/TableLineForm.tsx +++ b/src/orders/components/OrderDraftDetailsProducts/TableLineForm.tsx @@ -1,9 +1,9 @@ +import DebounceForm from "@dashboard/components/DebounceForm"; +import Form from "@dashboard/components/Form"; +import { OrderLineFragment, OrderLineInput } from "@dashboard/graphql"; +import createNonNegativeValueChangeHandler from "@dashboard/utils/handlers/nonNegativeValueChangeHandler"; import { TextField } from "@material-ui/core"; -import DebounceForm from "@saleor/components/DebounceForm"; -import Form from "@saleor/components/Form"; -import { OrderLineFragment, OrderLineInput } from "@saleor/graphql"; import { makeStyles } from "@saleor/macaw-ui"; -import createNonNegativeValueChangeHandler from "@saleor/utils/handlers/nonNegativeValueChangeHandler"; import React from "react"; const useStyles = makeStyles( diff --git a/src/orders/components/OrderDraftDetailsProducts/useLineAlerts.ts b/src/orders/components/OrderDraftDetailsProducts/useLineAlerts.ts index db78948c2..c330ebffb 100644 --- a/src/orders/components/OrderDraftDetailsProducts/useLineAlerts.ts +++ b/src/orders/components/OrderDraftDetailsProducts/useLineAlerts.ts @@ -1,5 +1,5 @@ -import { OrderErrorFragment, OrderLineFragment } from "@saleor/graphql"; -import getOrderErrorMessage from "@saleor/utils/errors/order"; +import { OrderErrorFragment, OrderLineFragment } from "@dashboard/graphql"; +import getOrderErrorMessage from "@dashboard/utils/errors/order"; import { useMemo } from "react"; import { useIntl } from "react-intl"; diff --git a/src/orders/components/OrderDraftDetailsSummary/OrderDraftDetailsSummary.tsx b/src/orders/components/OrderDraftDetailsSummary/OrderDraftDetailsSummary.tsx index 157670015..0b5dd8749 100644 --- a/src/orders/components/OrderDraftDetailsSummary/OrderDraftDetailsSummary.tsx +++ b/src/orders/components/OrderDraftDetailsSummary/OrderDraftDetailsSummary.tsx @@ -1,17 +1,17 @@ -import { Typography } from "@material-ui/core"; -import HorizontalSpacer from "@saleor/apps/components/HorizontalSpacer"; -import Link from "@saleor/components/Link"; -import Money from "@saleor/components/Money"; +import HorizontalSpacer from "@dashboard/apps/components/HorizontalSpacer"; +import Link from "@dashboard/components/Link"; +import Money from "@dashboard/components/Money"; import { DiscountValueTypeEnum, OrderDetailsFragment, OrderErrorFragment, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; +import { OrderDiscountContextConsumerProps } from "@dashboard/products/components/OrderDiscountProviders/OrderDiscountProvider"; +import { OrderDiscountData } from "@dashboard/products/components/OrderDiscountProviders/types"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getOrderErrorMessage from "@dashboard/utils/errors/order"; +import { Typography } from "@material-ui/core"; import { makeStyles } from "@saleor/macaw-ui"; -import { OrderDiscountContextConsumerProps } from "@saleor/products/components/OrderDiscountProviders/OrderDiscountProvider"; -import { OrderDiscountData } from "@saleor/products/components/OrderDiscountProviders/types"; -import { getFormErrors } from "@saleor/utils/errors"; -import getOrderErrorMessage from "@saleor/utils/errors/order"; import React, { useRef } from "react"; import { useIntl } from "react-intl"; diff --git a/src/orders/components/OrderDraftList/OrderDraftList.tsx b/src/orders/components/OrderDraftList/OrderDraftList.tsx index 68bcea625..abcc6e42a 100644 --- a/src/orders/components/OrderDraftList/OrderDraftList.tsx +++ b/src/orders/components/OrderDraftList/OrderDraftList.tsx @@ -1,24 +1,29 @@ -import { TableBody, TableCell, TableFooter } from "@material-ui/core"; -import Checkbox from "@saleor/components/Checkbox"; -import { DateTime } from "@saleor/components/Date"; -import Money from "@saleor/components/Money"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableCellHeader from "@saleor/components/TableCellHeader"; -import TableHead from "@saleor/components/TableHead"; -import { TablePaginationWithContext } from "@saleor/components/TablePagination"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { OrderDraftListQuery } from "@saleor/graphql"; -import { makeStyles } from "@saleor/macaw-ui"; +import Checkbox from "@dashboard/components/Checkbox"; +import { DateTime } from "@dashboard/components/Date"; +import Money from "@dashboard/components/Money"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableCellHeader from "@dashboard/components/TableCellHeader"; +import TableHead from "@dashboard/components/TableHead"; +import { TablePaginationWithContext } from "@dashboard/components/TablePagination"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { OrderDraftListQuery } from "@dashboard/graphql"; import { maybe, renderCollection, transformOrderStatus, transformPaymentStatus, -} from "@saleor/misc"; -import { OrderDraftListUrlSortField, orderUrl } from "@saleor/orders/urls"; -import { ListActions, ListProps, RelayToFlat, SortPage } from "@saleor/types"; -import { getArrowDirection } from "@saleor/utils/sort"; +} from "@dashboard/misc"; +import { OrderDraftListUrlSortField, orderUrl } from "@dashboard/orders/urls"; +import { + ListActions, + ListProps, + RelayToFlat, + SortPage, +} from "@dashboard/types"; +import { getArrowDirection } from "@dashboard/utils/sort"; +import { TableBody, TableCell, TableFooter } from "@material-ui/core"; +import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderDraftListPage/OrderDraftListPage.stories.tsx b/src/orders/components/OrderDraftListPage/OrderDraftListPage.stories.tsx index f39268158..ce41c2bc1 100644 --- a/src/orders/components/OrderDraftListPage/OrderDraftListPage.stories.tsx +++ b/src/orders/components/OrderDraftListPage/OrderDraftListPage.stories.tsx @@ -7,10 +7,10 @@ import { searchPageProps, sortPageProps, tabPageProps, -} from "@saleor/fixtures"; -import { OrderDraftListUrlSortField } from "@saleor/orders/urls"; -import Decorator from "@saleor/storybook/Decorator"; -import { PaginatorContextDecorator } from "@saleor/storybook/PaginatorContextDecorator"; +} from "@dashboard/fixtures"; +import { OrderDraftListUrlSortField } from "@dashboard/orders/urls"; +import Decorator from "@dashboard/storybook/Decorator"; +import { PaginatorContextDecorator } from "@dashboard/storybook/PaginatorContextDecorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/orders/components/OrderDraftListPage/OrderDraftListPage.tsx b/src/orders/components/OrderDraftListPage/OrderDraftListPage.tsx index f7b91caa5..2d6da9b43 100644 --- a/src/orders/components/OrderDraftListPage/OrderDraftListPage.tsx +++ b/src/orders/components/OrderDraftListPage/OrderDraftListPage.tsx @@ -1,11 +1,10 @@ -import { Card } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import Container from "@saleor/components/Container"; -import FilterBar from "@saleor/components/FilterBar"; -import PageHeader from "@saleor/components/PageHeader"; -import { OrderDraftListQuery, RefreshLimitsQuery } from "@saleor/graphql"; -import { sectionNames } from "@saleor/intl"; -import { OrderDraftListUrlSortField } from "@saleor/orders/urls"; +import { Button } from "@dashboard/components/Button"; +import Container from "@dashboard/components/Container"; +import FilterBar from "@dashboard/components/FilterBar"; +import PageHeader from "@dashboard/components/PageHeader"; +import { OrderDraftListQuery, RefreshLimitsQuery } from "@dashboard/graphql"; +import { sectionNames } from "@dashboard/intl"; +import { OrderDraftListUrlSortField } from "@dashboard/orders/urls"; import { FilterPageProps, ListActions, @@ -13,8 +12,9 @@ import { RelayToFlat, SortPage, TabPageProps, -} from "@saleor/types"; -import { hasLimits, isLimitReached } from "@saleor/utils/limits"; +} from "@dashboard/types"; +import { hasLimits, isLimitReached } from "@dashboard/utils/limits"; +import { Card } from "@material-ui/core"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderDraftListPage/filters.ts b/src/orders/components/OrderDraftListPage/filters.ts index 24b3109e5..8f016d64d 100644 --- a/src/orders/components/OrderDraftListPage/filters.ts +++ b/src/orders/components/OrderDraftListPage/filters.ts @@ -1,6 +1,9 @@ -import { IFilter } from "@saleor/components/Filter"; -import { FilterOpts, MinMax } from "@saleor/types"; -import { createDateField, createTextField } from "@saleor/utils/filters/fields"; +import { IFilter } from "@dashboard/components/Filter"; +import { FilterOpts, MinMax } from "@dashboard/types"; +import { + createDateField, + createTextField, +} from "@dashboard/utils/filters/fields"; import { defineMessages, IntlShape } from "react-intl"; export enum OrderDraftFilterKeys { diff --git a/src/orders/components/OrderDraftPage/OrderDraftAlert.tsx b/src/orders/components/OrderDraftPage/OrderDraftAlert.tsx index 72bd25547..2ef20f7a0 100644 --- a/src/orders/components/OrderDraftPage/OrderDraftAlert.tsx +++ b/src/orders/components/OrderDraftPage/OrderDraftAlert.tsx @@ -1,7 +1,7 @@ import { ChannelUsabilityDataQuery, OrderDetailsFragment, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import { Alert, AlertProps } from "@saleor/macaw-ui"; import React from "react"; import { MessageDescriptor, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderDraftPage/OrderDraftPage.stories.tsx b/src/orders/components/OrderDraftPage/OrderDraftPage.stories.tsx index 590425556..83a42c1f5 100644 --- a/src/orders/components/OrderDraftPage/OrderDraftPage.stories.tsx +++ b/src/orders/components/OrderDraftPage/OrderDraftPage.stories.tsx @@ -1,13 +1,13 @@ import placeholderImage from "@assets/images/placeholder60x60.png"; -import { fetchMoreProps } from "@saleor/fixtures"; -import { OrderErrorCode, OrderErrorFragment } from "@saleor/graphql"; +import { fetchMoreProps } from "@dashboard/fixtures"; +import { OrderErrorCode, OrderErrorFragment } from "@dashboard/graphql"; import { channelUsabilityData, clients, draftOrder, -} from "@saleor/orders/fixtures"; -import Decorator from "@saleor/storybook/Decorator"; -import { MockedUserProvider } from "@saleor/storybook/MockedUserProvider"; +} from "@dashboard/orders/fixtures"; +import Decorator from "@dashboard/storybook/Decorator"; +import { MockedUserProvider } from "@dashboard/storybook/MockedUserProvider"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/orders/components/OrderDraftPage/OrderDraftPage.tsx b/src/orders/components/OrderDraftPage/OrderDraftPage.tsx index 9cabc8b5d..ed45d3749 100644 --- a/src/orders/components/OrderDraftPage/OrderDraftPage.tsx +++ b/src/orders/components/OrderDraftPage/OrderDraftPage.tsx @@ -1,27 +1,27 @@ -import { Typography } from "@material-ui/core"; -import { Backlink } from "@saleor/components/Backlink"; -import CardMenu from "@saleor/components/CardMenu"; -import CardSpacer from "@saleor/components/CardSpacer"; -import { Container } from "@saleor/components/Container"; -import { DateTime } from "@saleor/components/Date"; -import Grid from "@saleor/components/Grid"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; -import Skeleton from "@saleor/components/Skeleton"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardMenu from "@dashboard/components/CardMenu"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import { Container } from "@dashboard/components/Container"; +import { DateTime } from "@dashboard/components/Date"; +import Grid from "@dashboard/components/Grid"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; +import Skeleton from "@dashboard/components/Skeleton"; import { ChannelUsabilityDataQuery, OrderDetailsFragment, OrderErrorFragment, OrderLineInput, SearchCustomersQuery, -} from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { sectionNames } from "@saleor/intl"; +} from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { sectionNames } from "@dashboard/intl"; +import OrderChannelSectionCard from "@dashboard/orders/components/OrderChannelSectionCard"; +import { orderDraftListUrl } from "@dashboard/orders/urls"; +import { FetchMoreProps, RelayToFlat } from "@dashboard/types"; +import { Typography } from "@material-ui/core"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import OrderChannelSectionCard from "@saleor/orders/components/OrderChannelSectionCard"; -import { orderDraftListUrl } from "@saleor/orders/urls"; -import { FetchMoreProps, RelayToFlat } from "@saleor/types"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/orders/components/OrderDraftPage/storybook.utils.tsx b/src/orders/components/OrderDraftPage/storybook.utils.tsx index bbfa7c3f6..7da9fd4ac 100644 --- a/src/orders/components/OrderDraftPage/storybook.utils.tsx +++ b/src/orders/components/OrderDraftPage/storybook.utils.tsx @@ -1,13 +1,13 @@ /* eslint-disable @typescript-eslint/no-empty-function */ -import { OrderDetailsQuery } from "@saleor/graphql"; +import { OrderDetailsQuery } from "@dashboard/graphql"; import { OrderDiscountContext, OrderDiscountContextConsumerProps, -} from "@saleor/products/components/OrderDiscountProviders/OrderDiscountProvider"; +} from "@dashboard/products/components/OrderDiscountProviders/OrderDiscountProvider"; import { OrderLineDiscountContext, OrderLineDiscountContextConsumerProps, -} from "@saleor/products/components/OrderDiscountProviders/OrderLineDiscountProvider"; +} from "@dashboard/products/components/OrderDiscountProviders/OrderLineDiscountProvider"; import React from "react"; export const getDiscountsProvidersWrapper = ( diff --git a/src/orders/components/OrderFulfillLine/OrderFulfillLine.tsx b/src/orders/components/OrderFulfillLine/OrderFulfillLine.tsx index d70988c5d..821ab45ae 100644 --- a/src/orders/components/OrderFulfillLine/OrderFulfillLine.tsx +++ b/src/orders/components/OrderFulfillLine/OrderFulfillLine.tsx @@ -1,21 +1,21 @@ +import Skeleton from "@dashboard/components/Skeleton"; +import TableCellAvatar from "@dashboard/components/TableCellAvatar"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { OrderFulfillLineFragment } from "@dashboard/graphql"; +import { FormsetChange, FormsetData } from "@dashboard/hooks/useFormset"; +import { + getAttributesCaption, + getOrderLineAvailableQuantity, + getWarehouseStock, + OrderFulfillLineFormData, +} from "@dashboard/orders/utils/data"; import { TableCell, TextField, Typography } from "@material-ui/core"; -import Skeleton from "@saleor/components/Skeleton"; -import TableCellAvatar from "@saleor/components/TableCellAvatar"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { OrderFulfillLineFragment } from "@saleor/graphql"; -import { FormsetChange, FormsetData } from "@saleor/hooks/useFormset"; import { ChevronIcon, IconButton, Tooltip, WarningIcon, } from "@saleor/macaw-ui"; -import { - getAttributesCaption, - getOrderLineAvailableQuantity, - getWarehouseStock, - OrderFulfillLineFormData, -} from "@saleor/orders/utils/data"; import clsx from "clsx"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/orders/components/OrderFulfillPage/OrderFulfillPage.stories.tsx b/src/orders/components/OrderFulfillPage/OrderFulfillPage.stories.tsx index 2b62507ad..9c0cd1f85 100644 --- a/src/orders/components/OrderFulfillPage/OrderFulfillPage.stories.tsx +++ b/src/orders/components/OrderFulfillPage/OrderFulfillPage.stories.tsx @@ -1,6 +1,6 @@ -import { OrderErrorCode } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; -import { warehouseList } from "@saleor/warehouses/fixtures"; +import { OrderErrorCode } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; +import { warehouseList } from "@dashboard/warehouses/fixtures"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/orders/components/OrderFulfillPage/OrderFulfillPage.tsx b/src/orders/components/OrderFulfillPage/OrderFulfillPage.tsx index 30f58b2a0..09c7a4bbf 100644 --- a/src/orders/components/OrderFulfillPage/OrderFulfillPage.tsx +++ b/src/orders/components/OrderFulfillPage/OrderFulfillPage.tsx @@ -1,21 +1,14 @@ -import { - Card, - CardContent, - TableBody, - TableCell, - TableHead, -} from "@material-ui/core"; -import { Backlink } from "@saleor/components/Backlink"; -import CardSpacer from "@saleor/components/CardSpacer"; -import CardTitle from "@saleor/components/CardTitle"; -import Container from "@saleor/components/Container"; -import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; -import Form from "@saleor/components/Form"; -import PageHeader from "@saleor/components/PageHeader"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Savebar from "@saleor/components/Savebar"; -import Skeleton from "@saleor/components/Skeleton"; -import TableRowLink from "@saleor/components/TableRowLink"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import CardTitle from "@dashboard/components/CardTitle"; +import Container from "@dashboard/components/Container"; +import ControlledCheckbox from "@dashboard/components/ControlledCheckbox"; +import Form from "@dashboard/components/Form"; +import PageHeader from "@dashboard/components/PageHeader"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Savebar from "@dashboard/components/Savebar"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableRowLink from "@dashboard/components/TableRowLink"; import { FulfillOrderMutation, OrderErrorCode, @@ -23,25 +16,32 @@ import { OrderFulfillLineFragment, OrderFulfillStockInput, ShopOrderSettingsFragment, -} from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useFormset, { FormsetData } from "@saleor/hooks/useFormset"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { commonMessages } from "@saleor/intl"; -import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { renderCollection } from "@saleor/misc"; -import OrderChangeWarehouseDialog from "@saleor/orders/components/OrderChangeWarehouseDialog"; +} from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useFormset, { FormsetData } from "@dashboard/hooks/useFormset"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { commonMessages } from "@dashboard/intl"; +import { renderCollection } from "@dashboard/misc"; +import OrderChangeWarehouseDialog from "@dashboard/orders/components/OrderChangeWarehouseDialog"; import { OrderFulfillUrlDialog, OrderFulfillUrlQueryParams, orderUrl, -} from "@saleor/orders/urls"; +} from "@dashboard/orders/urls"; import { getAttributesCaption, getLineAllocationWithHighestQuantity, getToFulfillOrderLines, OrderFulfillLineFormData, -} from "@saleor/orders/utils/data"; +} from "@dashboard/orders/utils/data"; +import { + Card, + CardContent, + TableBody, + TableCell, + TableHead, +} from "@material-ui/core"; +import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import clsx from "clsx"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderFulfillPage/fixtures.ts b/src/orders/components/OrderFulfillPage/fixtures.ts index f4ffc1f20..70ffc3007 100644 --- a/src/orders/components/OrderFulfillPage/fixtures.ts +++ b/src/orders/components/OrderFulfillPage/fixtures.ts @@ -1,6 +1,6 @@ import * as placeholderImage from "@assets/images/sample-product.jpg"; -import { OrderFulfillDataQuery } from "@saleor/graphql"; -import { warehouseList } from "@saleor/warehouses/fixtures"; +import { OrderFulfillDataQuery } from "@dashboard/graphql"; +import { warehouseList } from "@dashboard/warehouses/fixtures"; export const orderToFulfill: OrderFulfillDataQuery["order"] = { __typename: "Order", diff --git a/src/orders/components/OrderFulfillStockExceededDialog/OrderFulfillStockExceededDialog.tsx b/src/orders/components/OrderFulfillStockExceededDialog/OrderFulfillStockExceededDialog.tsx index c8305580a..bf73f9edc 100644 --- a/src/orders/components/OrderFulfillStockExceededDialog/OrderFulfillStockExceededDialog.tsx +++ b/src/orders/components/OrderFulfillStockExceededDialog/OrderFulfillStockExceededDialog.tsx @@ -1,16 +1,19 @@ -import { TableBody, TableCell, TableHead, Typography } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; -import { CardSpacer } from "@saleor/components/CardSpacer"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { FulfillmentFragment, OrderFulfillLineFragment } from "@saleor/graphql"; -import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { renderCollection } from "@saleor/misc"; +import ActionDialog from "@dashboard/components/ActionDialog"; +import { CardSpacer } from "@dashboard/components/CardSpacer"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { + FulfillmentFragment, + OrderFulfillLineFragment, +} from "@dashboard/graphql"; +import { renderCollection } from "@dashboard/misc"; import { getFulfillmentFormsetQuantity, getOrderLineAvailableQuantity, OrderFulfillStockFormsetData, -} from "@saleor/orders/utils/data"; +} from "@dashboard/orders/utils/data"; +import { TableBody, TableCell, TableHead, Typography } from "@material-ui/core"; +import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/orders/components/OrderFulfillStockExceededDialogLine/OrderFulfillStockExceededDialogLine.tsx b/src/orders/components/OrderFulfillStockExceededDialogLine/OrderFulfillStockExceededDialogLine.tsx index 921071b9a..7fe610706 100644 --- a/src/orders/components/OrderFulfillStockExceededDialogLine/OrderFulfillStockExceededDialogLine.tsx +++ b/src/orders/components/OrderFulfillStockExceededDialogLine/OrderFulfillStockExceededDialogLine.tsx @@ -1,13 +1,16 @@ -import { TableCell, Typography } from "@material-ui/core"; -import TableCellAvatar from "@saleor/components/TableCellAvatar"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { FulfillmentFragment, OrderFulfillLineFragment } from "@saleor/graphql"; +import TableCellAvatar from "@dashboard/components/TableCellAvatar"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { + FulfillmentFragment, + OrderFulfillLineFragment, +} from "@dashboard/graphql"; import { getAttributesCaption, getFulfillmentFormsetQuantity, getOrderLineAvailableQuantity, OrderFulfillStockFormsetData, -} from "@saleor/orders/utils/data"; +} from "@dashboard/orders/utils/data"; +import { TableCell, Typography } from "@material-ui/core"; import React from "react"; import { useStyles } from "../OrderFulfillStockExceededDialog/styles"; diff --git a/src/orders/components/OrderFulfilledProductsCard/ActionButtons.tsx b/src/orders/components/OrderFulfilledProductsCard/ActionButtons.tsx index 5d9827275..58eba60f1 100644 --- a/src/orders/components/OrderFulfilledProductsCard/ActionButtons.tsx +++ b/src/orders/components/OrderFulfilledProductsCard/ActionButtons.tsx @@ -1,7 +1,7 @@ +import { Button } from "@dashboard/components/Button"; +import { FulfillmentStatus } from "@dashboard/graphql"; +import { buttonMessages, commonMessages } from "@dashboard/intl"; import { CardActions, Typography } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import { FulfillmentStatus } from "@saleor/graphql"; -import { buttonMessages, commonMessages } from "@saleor/intl"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/orders/components/OrderFulfilledProductsCard/ExtraInfoLines.tsx b/src/orders/components/OrderFulfilledProductsCard/ExtraInfoLines.tsx index 223498321..87c6bd3f4 100644 --- a/src/orders/components/OrderFulfilledProductsCard/ExtraInfoLines.tsx +++ b/src/orders/components/OrderFulfilledProductsCard/ExtraInfoLines.tsx @@ -1,7 +1,7 @@ +import TableRowLink from "@dashboard/components/TableRowLink"; +import { FulfillmentStatus, OrderDetailsFragment } from "@dashboard/graphql"; +import { getStringOrPlaceholder } from "@dashboard/misc"; import { TableCell, Typography } from "@material-ui/core"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { FulfillmentStatus, OrderDetailsFragment } from "@saleor/graphql"; -import { getStringOrPlaceholder } from "@saleor/misc"; import clsx from "clsx"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderFulfilledProductsCard/OrderFulfilledProductsCard.tsx b/src/orders/components/OrderFulfilledProductsCard/OrderFulfilledProductsCard.tsx index 29ce6ddca..c4e571fa5 100644 --- a/src/orders/components/OrderFulfilledProductsCard/OrderFulfilledProductsCard.tsx +++ b/src/orders/components/OrderFulfilledProductsCard/OrderFulfilledProductsCard.tsx @@ -1,10 +1,10 @@ +import CardSpacer from "@dashboard/components/CardSpacer"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import { FulfillmentStatus, OrderDetailsFragment } from "@dashboard/graphql"; +import TrashIcon from "@dashboard/icons/Trash"; +import { mergeRepeatedOrderLines } from "@dashboard/orders/utils/data"; import { Card, TableBody } from "@material-ui/core"; -import CardSpacer from "@saleor/components/CardSpacer"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import { FulfillmentStatus, OrderDetailsFragment } from "@saleor/graphql"; -import TrashIcon from "@saleor/icons/Trash"; import { IconButton } from "@saleor/macaw-ui"; -import { mergeRepeatedOrderLines } from "@saleor/orders/utils/data"; import React from "react"; import { renderCollection } from "../../../misc"; diff --git a/src/orders/components/OrderFulfillmentApproveDialog/OrderFulfillmentApproveDialog.tsx b/src/orders/components/OrderFulfillmentApproveDialog/OrderFulfillmentApproveDialog.tsx index f02804d80..3783363f7 100644 --- a/src/orders/components/OrderFulfillmentApproveDialog/OrderFulfillmentApproveDialog.tsx +++ b/src/orders/components/OrderFulfillmentApproveDialog/OrderFulfillmentApproveDialog.tsx @@ -1,3 +1,11 @@ +import { Button } from "@dashboard/components/Button"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import ControlledCheckbox from "@dashboard/components/ControlledCheckbox"; +import Form from "@dashboard/components/Form"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import { OrderErrorFragment } from "@dashboard/graphql"; +import { buttonMessages } from "@dashboard/intl"; +import getOrderErrorMessage from "@dashboard/utils/errors/order"; import { Dialog, DialogActions, @@ -5,15 +13,7 @@ import { DialogContentText, DialogTitle, } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; -import Form from "@saleor/components/Form"; -import FormSpacer from "@saleor/components/FormSpacer"; -import { OrderErrorFragment } from "@saleor/graphql"; -import { buttonMessages } from "@saleor/intl"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import getOrderErrorMessage from "@saleor/utils/errors/order"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderFulfillmentCancelDialog/OrderFulfillmentCancelDialog.tsx b/src/orders/components/OrderFulfillmentCancelDialog/OrderFulfillmentCancelDialog.tsx index 5e137b3e2..446c557f1 100644 --- a/src/orders/components/OrderFulfillmentCancelDialog/OrderFulfillmentCancelDialog.tsx +++ b/src/orders/components/OrderFulfillmentCancelDialog/OrderFulfillmentCancelDialog.tsx @@ -1,3 +1,12 @@ +import BackButton from "@dashboard/components/BackButton"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import Form from "@dashboard/components/Form"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import SingleAutocompleteSelectField from "@dashboard/components/SingleAutocompleteSelectField"; +import { OrderErrorFragment, WarehouseFragment } from "@dashboard/graphql"; +import { buttonMessages } from "@dashboard/intl"; +import getOrderErrorMessage from "@dashboard/utils/errors/order"; +import createSingleAutocompleteSelectHandler from "@dashboard/utils/handlers/singleAutocompleteSelectChangeHandler"; import { Dialog, DialogActions, @@ -5,16 +14,7 @@ import { DialogContentText, DialogTitle, } from "@material-ui/core"; -import BackButton from "@saleor/components/BackButton"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import Form from "@saleor/components/Form"; -import FormSpacer from "@saleor/components/FormSpacer"; -import SingleAutocompleteSelectField from "@saleor/components/SingleAutocompleteSelectField"; -import { OrderErrorFragment, WarehouseFragment } from "@saleor/graphql"; -import { buttonMessages } from "@saleor/intl"; import { ConfirmButtonTransitionState, makeStyles } from "@saleor/macaw-ui"; -import getOrderErrorMessage from "@saleor/utils/errors/order"; -import createSingleAutocompleteSelectHandler from "@saleor/utils/handlers/singleAutocompleteSelectChangeHandler"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderFulfillmentSettings/OrderFulfillmentSettings.tsx b/src/orders/components/OrderFulfillmentSettings/OrderFulfillmentSettings.tsx index d71f7c4e1..2cba2fc3f 100644 --- a/src/orders/components/OrderFulfillmentSettings/OrderFulfillmentSettings.tsx +++ b/src/orders/components/OrderFulfillmentSettings/OrderFulfillmentSettings.tsx @@ -1,7 +1,7 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import ControlledCheckbox from "@dashboard/components/ControlledCheckbox"; +import FormSpacer from "@dashboard/components/FormSpacer"; import { Card, CardContent, Typography } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; -import FormSpacer from "@saleor/components/FormSpacer"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderFulfillmentTrackingDialog/OrderFulfillmentTrackingDialog.tsx b/src/orders/components/OrderFulfillmentTrackingDialog/OrderFulfillmentTrackingDialog.tsx index 34e7850a1..fe557b49d 100644 --- a/src/orders/components/OrderFulfillmentTrackingDialog/OrderFulfillmentTrackingDialog.tsx +++ b/src/orders/components/OrderFulfillmentTrackingDialog/OrderFulfillmentTrackingDialog.tsx @@ -1,3 +1,12 @@ +import BackButton from "@dashboard/components/BackButton"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import Form from "@dashboard/components/Form"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import { OrderErrorFragment } from "@dashboard/graphql"; +import useModalDialogErrors from "@dashboard/hooks/useModalDialogErrors"; +import { buttonMessages } from "@dashboard/intl"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getOrderErrorMessage from "@dashboard/utils/errors/order"; import { Dialog, DialogActions, @@ -6,16 +15,7 @@ import { DialogTitle, TextField, } from "@material-ui/core"; -import BackButton from "@saleor/components/BackButton"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import Form from "@saleor/components/Form"; -import FormSpacer from "@saleor/components/FormSpacer"; -import { OrderErrorFragment } from "@saleor/graphql"; -import useModalDialogErrors from "@saleor/hooks/useModalDialogErrors"; -import { buttonMessages } from "@saleor/intl"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { getFormErrors } from "@saleor/utils/errors"; -import getOrderErrorMessage from "@saleor/utils/errors/order"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderHistory/ExtendedDiscountTimelineEvent/ExtendedDiscountTimelineEvent.tsx b/src/orders/components/OrderHistory/ExtendedDiscountTimelineEvent/ExtendedDiscountTimelineEvent.tsx index 83020ce45..9e9b156fd 100644 --- a/src/orders/components/OrderHistory/ExtendedDiscountTimelineEvent/ExtendedDiscountTimelineEvent.tsx +++ b/src/orders/components/OrderHistory/ExtendedDiscountTimelineEvent/ExtendedDiscountTimelineEvent.tsx @@ -1,9 +1,9 @@ +import HorizontalSpacer from "@dashboard/apps/components/HorizontalSpacer"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import { TimelineEvent } from "@dashboard/components/Timeline"; +import { TitleElement } from "@dashboard/components/Timeline/TimelineEventHeader"; +import { OrderEventFragment, OrderEventsEnum } from "@dashboard/graphql"; import { Typography } from "@material-ui/core"; -import HorizontalSpacer from "@saleor/apps/components/HorizontalSpacer"; -import CardSpacer from "@saleor/components/CardSpacer"; -import { TimelineEvent } from "@saleor/components/Timeline"; -import { TitleElement } from "@saleor/components/Timeline/TimelineEventHeader"; -import { OrderEventFragment, OrderEventsEnum } from "@saleor/graphql"; import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; import { defineMessages, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderHistory/ExtendedDiscountTimelineEvent/MoneySection.tsx b/src/orders/components/OrderHistory/ExtendedDiscountTimelineEvent/MoneySection.tsx index cbce3b548..49944d413 100644 --- a/src/orders/components/OrderHistory/ExtendedDiscountTimelineEvent/MoneySection.tsx +++ b/src/orders/components/OrderHistory/ExtendedDiscountTimelineEvent/MoneySection.tsx @@ -1,6 +1,6 @@ +import HorizontalSpacer from "@dashboard/apps/components/HorizontalSpacer"; +import { DiscountValueTypeEnum, MoneyFragment } from "@dashboard/graphql"; import { Typography } from "@material-ui/core"; -import HorizontalSpacer from "@saleor/apps/components/HorizontalSpacer"; -import { DiscountValueTypeEnum, MoneyFragment } from "@saleor/graphql"; import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; import { defineMessages, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderHistory/ExtendedTimelineEvent.tsx b/src/orders/components/OrderHistory/ExtendedTimelineEvent.tsx index d9e1e4efc..1e7c28674 100644 --- a/src/orders/components/OrderHistory/ExtendedTimelineEvent.tsx +++ b/src/orders/components/OrderHistory/ExtendedTimelineEvent.tsx @@ -1,7 +1,7 @@ +import Money from "@dashboard/components/Money"; +import { TimelineEvent } from "@dashboard/components/Timeline"; +import { OrderEventFragment, OrderEventsEnum } from "@dashboard/graphql"; import { Typography } from "@material-ui/core"; -import Money from "@saleor/components/Money"; -import { TimelineEvent } from "@saleor/components/Timeline"; -import { OrderEventFragment, OrderEventsEnum } from "@saleor/graphql"; import { makeStyles } from "@saleor/macaw-ui"; import camelCase from "lodash/camelCase"; import React from "react"; diff --git a/src/orders/components/OrderHistory/LinkedTimelineEvent.tsx b/src/orders/components/OrderHistory/LinkedTimelineEvent.tsx index 77fdffec6..81b787d68 100644 --- a/src/orders/components/OrderHistory/LinkedTimelineEvent.tsx +++ b/src/orders/components/OrderHistory/LinkedTimelineEvent.tsx @@ -1,7 +1,7 @@ -import { TimelineEvent } from "@saleor/components/Timeline"; -import { TitleElement } from "@saleor/components/Timeline/TimelineEventHeader"; -import { OrderEventFragment, OrderEventsEnum } from "@saleor/graphql"; -import { orderUrl } from "@saleor/orders/urls"; +import { TimelineEvent } from "@dashboard/components/Timeline"; +import { TitleElement } from "@dashboard/components/Timeline/TimelineEventHeader"; +import { OrderEventFragment, OrderEventsEnum } from "@dashboard/graphql"; +import { orderUrl } from "@dashboard/orders/urls"; import React from "react"; import { defineMessages, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderHistory/OrderHistory.tsx b/src/orders/components/OrderHistory/OrderHistory.tsx index 9a403774e..a67023d33 100644 --- a/src/orders/components/OrderHistory/OrderHistory.tsx +++ b/src/orders/components/OrderHistory/OrderHistory.tsx @@ -1,16 +1,16 @@ -import { Typography } from "@material-ui/core"; -import Form from "@saleor/components/Form"; -import Hr from "@saleor/components/Hr"; -import Skeleton from "@saleor/components/Skeleton"; +import Form from "@dashboard/components/Form"; +import Hr from "@dashboard/components/Hr"; +import Skeleton from "@dashboard/components/Skeleton"; import { Timeline, TimelineAddNote, TimelineEvent, TimelineEventProps, TimelineNote, -} from "@saleor/components/Timeline"; -import { OrderEventFragment } from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; +} from "@dashboard/components/Timeline"; +import { OrderEventFragment } from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import { Typography } from "@material-ui/core"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderHistory/messages.ts b/src/orders/components/OrderHistory/messages.ts index 5f110a208..c73352d0e 100644 --- a/src/orders/components/OrderHistory/messages.ts +++ b/src/orders/components/OrderHistory/messages.ts @@ -2,7 +2,7 @@ import { OrderEventFragment, OrderEventsEmailsEnum, OrderEventsEnum, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import { IntlShape } from "react-intl"; export const getEventMessage = (event: OrderEventFragment, intl: IntlShape) => { diff --git a/src/orders/components/OrderHistory/utils.tsx b/src/orders/components/OrderHistory/utils.tsx index 9dab0ab8c..1fdda1d87 100644 --- a/src/orders/components/OrderHistory/utils.tsx +++ b/src/orders/components/OrderHistory/utils.tsx @@ -1,7 +1,7 @@ -import { OrderEventFragment, OrderEventsEnum } from "@saleor/graphql"; -import { getFullName } from "@saleor/misc"; -import { orderUrl } from "@saleor/orders/urls"; -import { staffMemberDetailsUrl } from "@saleor/staff/urls"; +import { OrderEventFragment, OrderEventsEnum } from "@dashboard/graphql"; +import { getFullName } from "@dashboard/misc"; +import { orderUrl } from "@dashboard/orders/urls"; +import { staffMemberDetailsUrl } from "@dashboard/staff/urls"; import { MessageDescriptor } from "react-intl"; export const getEventSecondaryTitle = ( diff --git a/src/orders/components/OrderInvoiceEmailSendDialog/OrderInvoiceEmailSendDialog.tsx b/src/orders/components/OrderInvoiceEmailSendDialog/OrderInvoiceEmailSendDialog.tsx index 898a73460..592c83f40 100644 --- a/src/orders/components/OrderInvoiceEmailSendDialog/OrderInvoiceEmailSendDialog.tsx +++ b/src/orders/components/OrderInvoiceEmailSendDialog/OrderInvoiceEmailSendDialog.tsx @@ -1,3 +1,10 @@ +import BackButton from "@dashboard/components/BackButton"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import { InvoiceErrorFragment, InvoiceFragment } from "@dashboard/graphql"; +import { buttonMessages } from "@dashboard/intl"; +import { DialogProps } from "@dashboard/types"; +import getInvoiceErrorMessage from "@dashboard/utils/errors/invoice"; import { Dialog, DialogActions, @@ -5,14 +12,7 @@ import { DialogContentText, DialogTitle, } from "@material-ui/core"; -import BackButton from "@saleor/components/BackButton"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import FormSpacer from "@saleor/components/FormSpacer"; -import { InvoiceErrorFragment, InvoiceFragment } from "@saleor/graphql"; -import { buttonMessages } from "@saleor/intl"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { DialogProps } from "@saleor/types"; -import getInvoiceErrorMessage from "@saleor/utils/errors/invoice"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderInvoiceList/OrderInvoiceList.tsx b/src/orders/components/OrderInvoiceList/OrderInvoiceList.tsx index ca12b6f3e..fdbba6d86 100644 --- a/src/orders/components/OrderInvoiceList/OrderInvoiceList.tsx +++ b/src/orders/components/OrderInvoiceList/OrderInvoiceList.tsx @@ -1,3 +1,11 @@ +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import Date from "@dashboard/components/Date"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { InvoiceFragment } from "@dashboard/graphql"; +import { buttonMessages } from "@dashboard/intl"; import { Card, CardContent, @@ -5,14 +13,6 @@ import { TableCell, Typography, } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import Date from "@saleor/components/Date"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { InvoiceFragment } from "@saleor/graphql"; -import { buttonMessages } from "@saleor/intl"; import { makeStyles } from "@saleor/macaw-ui"; import clsx from "clsx"; import React from "react"; diff --git a/src/orders/components/OrderLimitReached.tsx b/src/orders/components/OrderLimitReached.tsx index 1d8254e56..d4242d14b 100644 --- a/src/orders/components/OrderLimitReached.tsx +++ b/src/orders/components/OrderLimitReached.tsx @@ -1,4 +1,4 @@ -import LimitReachedAlert from "@saleor/components/LimitReachedAlert"; +import LimitReachedAlert from "@dashboard/components/LimitReachedAlert"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderList/OrderList.tsx b/src/orders/components/OrderList/OrderList.tsx index d30273186..06a5fbb4d 100644 --- a/src/orders/components/OrderList/OrderList.tsx +++ b/src/orders/components/OrderList/OrderList.tsx @@ -1,3 +1,20 @@ +import { DateTime } from "@dashboard/components/Date"; +import Money from "@dashboard/components/Money"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableCellHeader from "@dashboard/components/TableCellHeader"; +import { TablePaginationWithContext } from "@dashboard/components/TablePagination"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { OrderListQuery } from "@dashboard/graphql"; +import { + maybe, + renderCollection, + transformOrderStatus, + transformPaymentStatus, +} from "@dashboard/misc"; +import { OrderListUrlSortField, orderUrl } from "@dashboard/orders/urls"; +import { ListProps, RelayToFlat, SortPage } from "@dashboard/types"; +import { getArrowDirection } from "@dashboard/utils/sort"; import { TableBody, TableCell, @@ -5,24 +22,7 @@ import { TableHead, } from "@material-ui/core"; import { CSSProperties } from "@material-ui/styles"; -import { DateTime } from "@saleor/components/Date"; -import Money from "@saleor/components/Money"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableCellHeader from "@saleor/components/TableCellHeader"; -import { TablePaginationWithContext } from "@saleor/components/TablePagination"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { OrderListQuery } from "@saleor/graphql"; import { makeStyles, Pill } from "@saleor/macaw-ui"; -import { - maybe, - renderCollection, - transformOrderStatus, - transformPaymentStatus, -} from "@saleor/misc"; -import { OrderListUrlSortField, orderUrl } from "@saleor/orders/urls"; -import { ListProps, RelayToFlat, SortPage } from "@saleor/types"; -import { getArrowDirection } from "@saleor/utils/sort"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderListPage/OrderListPage.stories.tsx b/src/orders/components/OrderListPage/OrderListPage.stories.tsx index 07a1aaae9..34993532a 100644 --- a/src/orders/components/OrderListPage/OrderListPage.stories.tsx +++ b/src/orders/components/OrderListPage/OrderListPage.stories.tsx @@ -5,12 +5,12 @@ import { listActionsProps, pageListProps, sortPageProps, -} from "@saleor/fixtures"; -import { OrderStatusFilter, PaymentChargeStatusEnum } from "@saleor/graphql"; -import { orders } from "@saleor/orders/fixtures"; -import { OrderListUrlSortField } from "@saleor/orders/urls"; -import Decorator from "@saleor/storybook/Decorator"; -import { PaginatorContextDecorator } from "@saleor/storybook/PaginatorContextDecorator"; +} from "@dashboard/fixtures"; +import { OrderStatusFilter, PaymentChargeStatusEnum } from "@dashboard/graphql"; +import { orders } from "@dashboard/orders/fixtures"; +import { OrderListUrlSortField } from "@dashboard/orders/urls"; +import Decorator from "@dashboard/storybook/Decorator"; +import { PaginatorContextDecorator } from "@dashboard/storybook/PaginatorContextDecorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/orders/components/OrderListPage/OrderListPage.tsx b/src/orders/components/OrderListPage/OrderListPage.tsx index aac9b37ed..7c1b75166 100644 --- a/src/orders/components/OrderListPage/OrderListPage.tsx +++ b/src/orders/components/OrderListPage/OrderListPage.tsx @@ -1,25 +1,25 @@ -import { Card } from "@material-ui/core"; import { extensionMountPoints, mapToMenuItems, useExtensions, -} from "@saleor/apps/useExtensions"; -import { ButtonWithSelect } from "@saleor/components/ButtonWithSelect"; -import CardMenu from "@saleor/components/CardMenu"; -import Container from "@saleor/components/Container"; -import FilterBar from "@saleor/components/FilterBar"; -import PageHeader from "@saleor/components/PageHeader"; -import { OrderListQuery, RefreshLimitsQuery } from "@saleor/graphql"; -import { sectionNames } from "@saleor/intl"; -import { makeStyles } from "@saleor/macaw-ui"; -import { OrderListUrlSortField } from "@saleor/orders/urls"; +} from "@dashboard/apps/useExtensions"; +import { ButtonWithSelect } from "@dashboard/components/ButtonWithSelect"; +import CardMenu from "@dashboard/components/CardMenu"; +import Container from "@dashboard/components/Container"; +import FilterBar from "@dashboard/components/FilterBar"; +import PageHeader from "@dashboard/components/PageHeader"; +import { OrderListQuery, RefreshLimitsQuery } from "@dashboard/graphql"; +import { sectionNames } from "@dashboard/intl"; +import { OrderListUrlSortField } from "@dashboard/orders/urls"; import { FilterPageProps, PageListProps, RelayToFlat, SortPage, -} from "@saleor/types"; -import { hasLimits, isLimitReached } from "@saleor/utils/limits"; +} from "@dashboard/types"; +import { hasLimits, isLimitReached } from "@dashboard/utils/limits"; +import { Card } from "@material-ui/core"; +import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderListPage/filters.ts b/src/orders/components/OrderListPage/filters.ts index d84398b09..65180aebd 100644 --- a/src/orders/components/OrderListPage/filters.ts +++ b/src/orders/components/OrderListPage/filters.ts @@ -1,20 +1,20 @@ -import { IFilter } from "@saleor/components/Filter"; -import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField"; -import { OrderStatusFilter, PaymentChargeStatusEnum } from "@saleor/graphql"; +import { IFilter } from "@dashboard/components/Filter"; +import { MultiAutocompleteChoiceType } from "@dashboard/components/MultiAutocompleteSelectField"; +import { OrderStatusFilter, PaymentChargeStatusEnum } from "@dashboard/graphql"; import { commonMessages, commonStatusMessages, orderStatusMessages, paymentStatusMessages, -} from "@saleor/intl"; -import { FilterOpts, KeyValue, MinMax } from "@saleor/types"; +} from "@dashboard/intl"; +import { FilterOpts, KeyValue, MinMax } from "@dashboard/types"; import { createBooleanField, createDateField, createKeyValueField, createOptionsField, createTextField, -} from "@saleor/utils/filters/fields"; +} from "@dashboard/utils/filters/fields"; import { defineMessages, IntlShape } from "react-intl"; export enum OrderFilterKeys { diff --git a/src/orders/components/OrderMarkAsPaidDialog/OrderMarkAsPaidDialog.tsx b/src/orders/components/OrderMarkAsPaidDialog/OrderMarkAsPaidDialog.tsx index 0dd30818d..15e8c31a3 100644 --- a/src/orders/components/OrderMarkAsPaidDialog/OrderMarkAsPaidDialog.tsx +++ b/src/orders/components/OrderMarkAsPaidDialog/OrderMarkAsPaidDialog.tsx @@ -1,10 +1,10 @@ +import ActionDialog from "@dashboard/components/ActionDialog"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import { OrderErrorFragment } from "@dashboard/graphql"; +import useModalDialogErrors from "@dashboard/hooks/useModalDialogErrors"; +import getOrderErrorMessage from "@dashboard/utils/errors/order"; import { DialogContentText, TextField } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; -import FormSpacer from "@saleor/components/FormSpacer"; -import { OrderErrorFragment } from "@saleor/graphql"; -import useModalDialogErrors from "@saleor/hooks/useModalDialogErrors"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import getOrderErrorMessage from "@saleor/utils/errors/order"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderPayment/OrderPayment.tsx b/src/orders/components/OrderPayment/OrderPayment.tsx index b40490c6d..1288be16e 100644 --- a/src/orders/components/OrderPayment/OrderPayment.tsx +++ b/src/orders/components/OrderPayment/OrderPayment.tsx @@ -1,16 +1,16 @@ -import { Card, CardContent } from "@material-ui/core"; -import HorizontalSpacer from "@saleor/apps/components/HorizontalSpacer"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import { Hr } from "@saleor/components/Hr"; -import Money from "@saleor/components/Money"; -import Skeleton from "@saleor/components/Skeleton"; +import HorizontalSpacer from "@dashboard/apps/components/HorizontalSpacer"; +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import { Hr } from "@dashboard/components/Hr"; +import Money from "@dashboard/components/Money"; +import Skeleton from "@dashboard/components/Skeleton"; import { OrderAction, OrderDetailsFragment, OrderDiscountType, OrderStatus, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; +import { Card, CardContent } from "@material-ui/core"; import { Pill } from "@saleor/macaw-ui"; import clsx from "clsx"; import React from "react"; diff --git a/src/orders/components/OrderPayment/utils.ts b/src/orders/components/OrderPayment/utils.ts index 5dd57af6e..bf82f8c0c 100644 --- a/src/orders/components/OrderPayment/utils.ts +++ b/src/orders/components/OrderPayment/utils.ts @@ -1,9 +1,9 @@ -import { IMoney, subtractMoney } from "@saleor/components/Money"; +import { IMoney, subtractMoney } from "@dashboard/components/Money"; import { GiftCardEventsEnum, OrderDetailsFragment, PaymentChargeStatusEnum, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import compact from "lodash/compact"; export const extractOrderGiftCardUsedAmount = ( diff --git a/src/orders/components/OrderPaymentDialog/OrderPaymentDialog.tsx b/src/orders/components/OrderPaymentDialog/OrderPaymentDialog.tsx index 34db50310..8f99d2d56 100644 --- a/src/orders/components/OrderPaymentDialog/OrderPaymentDialog.tsx +++ b/src/orders/components/OrderPaymentDialog/OrderPaymentDialog.tsx @@ -1,3 +1,11 @@ +import BackButton from "@dashboard/components/BackButton"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import Form from "@dashboard/components/Form"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import { OrderErrorFragment } from "@dashboard/graphql"; +import { buttonMessages } from "@dashboard/intl"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getOrderErrorMessage from "@dashboard/utils/errors/order"; import { Dialog, DialogActions, @@ -6,15 +14,7 @@ import { DialogTitle, TextField, } from "@material-ui/core"; -import BackButton from "@saleor/components/BackButton"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import Form from "@saleor/components/Form"; -import FormSpacer from "@saleor/components/FormSpacer"; -import { OrderErrorFragment } from "@saleor/graphql"; -import { buttonMessages } from "@saleor/intl"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { getFormErrors } from "@saleor/utils/errors"; -import getOrderErrorMessage from "@saleor/utils/errors/order"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderPaymentVoidDialog/OrderPaymentVoidDialog.tsx b/src/orders/components/OrderPaymentVoidDialog/OrderPaymentVoidDialog.tsx index 81933001b..0b8a9db96 100644 --- a/src/orders/components/OrderPaymentVoidDialog/OrderPaymentVoidDialog.tsx +++ b/src/orders/components/OrderPaymentVoidDialog/OrderPaymentVoidDialog.tsx @@ -1,3 +1,9 @@ +import BackButton from "@dashboard/components/BackButton"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import { OrderErrorFragment } from "@dashboard/graphql"; +import { buttonMessages } from "@dashboard/intl"; +import getOrderErrorMessage from "@dashboard/utils/errors/order"; import { Dialog, DialogActions, @@ -5,13 +11,7 @@ import { DialogContentText, DialogTitle, } from "@material-ui/core"; -import BackButton from "@saleor/components/BackButton"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import FormSpacer from "@saleor/components/FormSpacer"; -import { OrderErrorFragment } from "@saleor/graphql"; -import { buttonMessages } from "@saleor/intl"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import getOrderErrorMessage from "@saleor/utils/errors/order"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderPriceLabel/OrderPriceLabel.tsx b/src/orders/components/OrderPriceLabel/OrderPriceLabel.tsx index b093b95cd..e04b65391 100644 --- a/src/orders/components/OrderPriceLabel/OrderPriceLabel.tsx +++ b/src/orders/components/OrderPriceLabel/OrderPriceLabel.tsx @@ -1,7 +1,7 @@ +import DiscountedPrice from "@dashboard/components/DiscountedPrice/DiscountedPrice"; +import Money from "@dashboard/components/Money"; +import { SearchOrderVariantQuery } from "@dashboard/graphql"; import { Typography } from "@material-ui/core"; -import DiscountedPrice from "@saleor/components/DiscountedPrice/DiscountedPrice"; -import Money from "@saleor/components/Money"; -import { SearchOrderVariantQuery } from "@saleor/graphql"; import * as React from "react"; import { useStyles } from "./styles"; diff --git a/src/orders/components/OrderProductAddDialog/OrderProductAddDialog.tsx b/src/orders/components/OrderProductAddDialog/OrderProductAddDialog.tsx index ad03fb3ed..8b1dfc112 100644 --- a/src/orders/components/OrderProductAddDialog/OrderProductAddDialog.tsx +++ b/src/orders/components/OrderProductAddDialog/OrderProductAddDialog.tsx @@ -1,3 +1,21 @@ +import BackButton from "@dashboard/components/BackButton"; +import Checkbox from "@dashboard/components/Checkbox"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import TableCellAvatar from "@dashboard/components/TableCellAvatar"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { + OrderErrorFragment, + SearchOrderVariantQuery, +} from "@dashboard/graphql"; +import useModalDialogErrors from "@dashboard/hooks/useModalDialogErrors"; +import useModalDialogOpen from "@dashboard/hooks/useModalDialogOpen"; +import useSearchQuery from "@dashboard/hooks/useSearchQuery"; +import { buttonMessages } from "@dashboard/intl"; +import { maybe, renderCollection } from "@dashboard/misc"; +import { FetchMoreProps, RelayToFlat } from "@dashboard/types"; +import getOrderErrorMessage from "@dashboard/utils/errors/order"; import { CircularProgress, Dialog, @@ -10,22 +28,7 @@ import { TextField, Typography, } from "@material-ui/core"; -import BackButton from "@saleor/components/BackButton"; -import Checkbox from "@saleor/components/Checkbox"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import FormSpacer from "@saleor/components/FormSpacer"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import TableCellAvatar from "@saleor/components/TableCellAvatar"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { OrderErrorFragment, SearchOrderVariantQuery } from "@saleor/graphql"; -import useModalDialogErrors from "@saleor/hooks/useModalDialogErrors"; -import useModalDialogOpen from "@saleor/hooks/useModalDialogOpen"; -import useSearchQuery from "@saleor/hooks/useSearchQuery"; -import { buttonMessages } from "@saleor/intl"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { maybe, renderCollection } from "@saleor/misc"; -import { FetchMoreProps, RelayToFlat } from "@saleor/types"; -import getOrderErrorMessage from "@saleor/utils/errors/order"; import React from "react"; import InfiniteScroll from "react-infinite-scroll-component"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderProductAddDialog/utils.ts b/src/orders/components/OrderProductAddDialog/utils.ts index 23e52176b..5a4e2defe 100644 --- a/src/orders/components/OrderProductAddDialog/utils.ts +++ b/src/orders/components/OrderProductAddDialog/utils.ts @@ -1,4 +1,4 @@ -import { SearchOrderVariantQuery } from "@saleor/graphql"; +import { SearchOrderVariantQuery } from "@dashboard/graphql"; type SetVariantsAction = ( data: SearchOrderVariantQuery["search"]["edges"][0]["node"]["variants"], diff --git a/src/orders/components/OrderProductsCardElements/OrderProductsCardHeader.tsx b/src/orders/components/OrderProductsCardElements/OrderProductsCardHeader.tsx index 9abcc4253..208d4b761 100644 --- a/src/orders/components/OrderProductsCardElements/OrderProductsCardHeader.tsx +++ b/src/orders/components/OrderProductsCardElements/OrderProductsCardHeader.tsx @@ -1,5 +1,5 @@ +import TableRowLink from "@dashboard/components/TableRowLink"; import { TableCell, TableHead } from "@material-ui/core"; -import TableRowLink from "@saleor/components/TableRowLink"; import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/orders/components/OrderProductsCardElements/OrderProductsTableRow.tsx b/src/orders/components/OrderProductsCardElements/OrderProductsTableRow.tsx index 4c1136117..13748b243 100644 --- a/src/orders/components/OrderProductsCardElements/OrderProductsTableRow.tsx +++ b/src/orders/components/OrderProductsCardElements/OrderProductsTableRow.tsx @@ -1,12 +1,12 @@ +import Money from "@dashboard/components/Money"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableCellAvatar from "@dashboard/components/TableCellAvatar"; +import { AVATAR_MARGIN } from "@dashboard/components/TableCellAvatar/Avatar"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { OrderDetailsFragment, OrderLineFragment } from "@dashboard/graphql"; +import { maybe } from "@dashboard/misc"; import { TableCell } from "@material-ui/core"; -import Money from "@saleor/components/Money"; -import Skeleton from "@saleor/components/Skeleton"; -import TableCellAvatar from "@saleor/components/TableCellAvatar"; -import { AVATAR_MARGIN } from "@saleor/components/TableCellAvatar/Avatar"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { OrderDetailsFragment, OrderLineFragment } from "@saleor/graphql"; import { makeStyles } from "@saleor/macaw-ui"; -import { maybe } from "@saleor/misc"; import React from "react"; const useStyles = makeStyles( diff --git a/src/orders/components/OrderRefund/OrderRefund.tsx b/src/orders/components/OrderRefund/OrderRefund.tsx index 51da90771..4bb5ed81b 100644 --- a/src/orders/components/OrderRefund/OrderRefund.tsx +++ b/src/orders/components/OrderRefund/OrderRefund.tsx @@ -1,6 +1,6 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import RadioGroupField from "@dashboard/components/RadioGroupField"; import { Card, CardContent } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import RadioGroupField from "@saleor/components/RadioGroupField"; import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; import { defineMessages, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderRefundFulfilledProducts/OrderRefundFulfilledProducts.tsx b/src/orders/components/OrderRefundFulfilledProducts/OrderRefundFulfilledProducts.tsx index 55441c7fb..3f48036f3 100644 --- a/src/orders/components/OrderRefundFulfilledProducts/OrderRefundFulfilledProducts.tsx +++ b/src/orders/components/OrderRefundFulfilledProducts/OrderRefundFulfilledProducts.tsx @@ -1,3 +1,12 @@ +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import Money from "@dashboard/components/Money"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableCellAvatar from "@dashboard/components/TableCellAvatar"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { OrderRefundDataQuery } from "@dashboard/graphql"; +import { FormsetChange } from "@dashboard/hooks/useFormset"; +import { renderCollection } from "@dashboard/misc"; import { Card, CardContent, @@ -8,16 +17,7 @@ import { TextField, Typography, } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import Money from "@saleor/components/Money"; -import Skeleton from "@saleor/components/Skeleton"; -import TableCellAvatar from "@saleor/components/TableCellAvatar"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { OrderRefundDataQuery } from "@saleor/graphql"; -import { FormsetChange } from "@saleor/hooks/useFormset"; import { makeStyles } from "@saleor/macaw-ui"; -import { renderCollection } from "@saleor/misc"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderRefundFulfilledProducts/messages.ts b/src/orders/components/OrderRefundFulfilledProducts/messages.ts index 40c58db6f..153dad3bc 100644 --- a/src/orders/components/OrderRefundFulfilledProducts/messages.ts +++ b/src/orders/components/OrderRefundFulfilledProducts/messages.ts @@ -1,4 +1,4 @@ -import { FulfillmentStatus } from "@saleor/graphql"; +import { FulfillmentStatus } from "@dashboard/graphql"; import { defineMessages, IntlShape } from "react-intl"; export const messages = defineMessages({ diff --git a/src/orders/components/OrderRefundPage/OrderRefundPage.stories.tsx b/src/orders/components/OrderRefundPage/OrderRefundPage.stories.tsx index 57ba7cb5f..09671a2e7 100644 --- a/src/orders/components/OrderRefundPage/OrderRefundPage.stories.tsx +++ b/src/orders/components/OrderRefundPage/OrderRefundPage.stories.tsx @@ -1,5 +1,5 @@ import placeholderImage from "@assets/images/placeholder60x60.png"; -import Decorator from "@saleor/storybook/Decorator"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/orders/components/OrderRefundPage/OrderRefundPage.tsx b/src/orders/components/OrderRefundPage/OrderRefundPage.tsx index 86489799e..85de86798 100644 --- a/src/orders/components/OrderRefundPage/OrderRefundPage.tsx +++ b/src/orders/components/OrderRefundPage/OrderRefundPage.tsx @@ -1,16 +1,16 @@ -import { Backlink } from "@saleor/components/Backlink"; -import CardSpacer from "@saleor/components/CardSpacer"; -import Container from "@saleor/components/Container"; -import Grid from "@saleor/components/Grid"; -import PageHeader from "@saleor/components/PageHeader"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import Container from "@dashboard/components/Container"; +import Grid from "@dashboard/components/Grid"; +import PageHeader from "@dashboard/components/PageHeader"; import { FulfillmentStatus, OrderErrorFragment, OrderRefundDataQuery, -} from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import { renderCollection } from "@saleor/misc"; -import { orderUrl } from "@saleor/orders/urls"; +} from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import { renderCollection } from "@dashboard/misc"; +import { orderUrl } from "@dashboard/orders/urls"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/orders/components/OrderRefundPage/fixtures.ts b/src/orders/components/OrderRefundPage/fixtures.ts index d1f5ed2fe..60b4ca064 100644 --- a/src/orders/components/OrderRefundPage/fixtures.ts +++ b/src/orders/components/OrderRefundPage/fixtures.ts @@ -1,4 +1,4 @@ -import { FulfillmentStatus, OrderRefundDataQuery } from "@saleor/graphql"; +import { FulfillmentStatus, OrderRefundDataQuery } from "@dashboard/graphql"; export const orderToRefund = ( placeholder: string, diff --git a/src/orders/components/OrderRefundPage/form.tsx b/src/orders/components/OrderRefundPage/form.tsx index 96907cb8a..b5f6fc1f2 100644 --- a/src/orders/components/OrderRefundPage/form.tsx +++ b/src/orders/components/OrderRefundPage/form.tsx @@ -1,14 +1,14 @@ -import { useExitFormDialog } from "@saleor/components/Form/useExitFormDialog"; -import { OrderRefundDataQuery } from "@saleor/graphql"; +import { useExitFormDialog } from "@dashboard/components/Form/useExitFormDialog"; +import { OrderRefundDataQuery } from "@dashboard/graphql"; import useForm, { CommonUseFormResultWithHandlers, SubmitPromise, -} from "@saleor/hooks/useForm"; +} from "@dashboard/hooks/useForm"; import useFormset, { FormsetChange, FormsetData, -} from "@saleor/hooks/useFormset"; -import useHandleFormSubmit from "@saleor/hooks/useHandleFormSubmit"; +} from "@dashboard/hooks/useFormset"; +import useHandleFormSubmit from "@dashboard/hooks/useHandleFormSubmit"; import React, { useEffect } from "react"; import { refundFulfilledStatuses } from "./OrderRefundPage"; diff --git a/src/orders/components/OrderRefundReturnAmount/OrderRefundReturnAmount.tsx b/src/orders/components/OrderRefundReturnAmount/OrderRefundReturnAmount.tsx index 006415dd2..f588f0889 100644 --- a/src/orders/components/OrderRefundReturnAmount/OrderRefundReturnAmount.tsx +++ b/src/orders/components/OrderRefundReturnAmount/OrderRefundReturnAmount.tsx @@ -1,3 +1,13 @@ +import { Button } from "@dashboard/components/Button"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import CardTitle from "@dashboard/components/CardTitle"; +import ControlledCheckbox from "@dashboard/components/ControlledCheckbox"; +import Hr from "@dashboard/components/Hr"; +import { + OrderDetailsFragment, + OrderErrorFragment, + OrderRefundDataQuery, +} from "@dashboard/graphql"; import { Card, CardContent, @@ -6,16 +16,6 @@ import { RadioGroup, Typography, } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardSpacer from "@saleor/components/CardSpacer"; -import CardTitle from "@saleor/components/CardTitle"; -import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; -import Hr from "@saleor/components/Hr"; -import { - OrderDetailsFragment, - OrderErrorFragment, - OrderRefundDataQuery, -} from "@saleor/graphql"; import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; import { defineMessages, FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderRefundReturnAmount/OrderRefundReturnAmountValues.tsx b/src/orders/components/OrderRefundReturnAmount/OrderRefundReturnAmountValues.tsx index e28392f18..bf680e543 100644 --- a/src/orders/components/OrderRefundReturnAmount/OrderRefundReturnAmountValues.tsx +++ b/src/orders/components/OrderRefundReturnAmount/OrderRefundReturnAmountValues.tsx @@ -1,5 +1,5 @@ -import Money, { IMoney } from "@saleor/components/Money"; -import Skeleton from "@saleor/components/Skeleton"; +import Money, { IMoney } from "@dashboard/components/Money"; +import Skeleton from "@dashboard/components/Skeleton"; import { makeStyles } from "@saleor/macaw-ui"; import clsx from "clsx"; import reduce from "lodash/reduce"; diff --git a/src/orders/components/OrderRefundReturnAmount/RefundAmountInput.tsx b/src/orders/components/OrderRefundReturnAmount/RefundAmountInput.tsx index d3e1543ea..b06a69bf3 100644 --- a/src/orders/components/OrderRefundReturnAmount/RefundAmountInput.tsx +++ b/src/orders/components/OrderRefundReturnAmount/RefundAmountInput.tsx @@ -1,9 +1,9 @@ -import { IMoney } from "@saleor/components/Money"; -import PriceField from "@saleor/components/PriceField"; -import { OrderErrorFragment } from "@saleor/graphql"; +import { IMoney } from "@dashboard/components/Money"; +import PriceField from "@dashboard/components/PriceField"; +import { OrderErrorFragment } from "@dashboard/graphql"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getOrderErrorMessage from "@dashboard/utils/errors/order"; import { makeStyles } from "@saleor/macaw-ui"; -import { getFormErrors } from "@saleor/utils/errors"; -import getOrderErrorMessage from "@saleor/utils/errors/order"; import React from "react"; import { defineMessages, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderRefundReturnAmount/utils.ts b/src/orders/components/OrderRefundReturnAmount/utils.ts index 2703b2ef7..3ca621c58 100644 --- a/src/orders/components/OrderRefundReturnAmount/utils.ts +++ b/src/orders/components/OrderRefundReturnAmount/utils.ts @@ -1,13 +1,13 @@ -import { IMoney } from "@saleor/components/Money"; -import { OrderDetailsFragment, OrderRefundDataQuery } from "@saleor/graphql"; -import { FormsetData } from "@saleor/hooks/useFormset"; +import { IMoney } from "@dashboard/components/Money"; +import { OrderDetailsFragment, OrderRefundDataQuery } from "@dashboard/graphql"; +import { FormsetData } from "@dashboard/hooks/useFormset"; import { getAllFulfillmentLinesPriceSum, getPreviouslyRefundedPrice, getRefundedLinesPriceSum, getReplacedProductsAmount, getReturnSelectedProductsAmount, -} from "@saleor/orders/utils/data"; +} from "@dashboard/orders/utils/data"; import { OrderRefundFormData } from "../OrderRefundPage/form"; import { LineItemData, OrderReturnFormData } from "../OrderReturnPage/form"; diff --git a/src/orders/components/OrderRefundUnfulfilledProducts/OrderRefundUnfulfilledProducts.tsx b/src/orders/components/OrderRefundUnfulfilledProducts/OrderRefundUnfulfilledProducts.tsx index 0d407bd4b..cd08092ae 100644 --- a/src/orders/components/OrderRefundUnfulfilledProducts/OrderRefundUnfulfilledProducts.tsx +++ b/src/orders/components/OrderRefundUnfulfilledProducts/OrderRefundUnfulfilledProducts.tsx @@ -1,3 +1,12 @@ +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import Money from "@dashboard/components/Money"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableCellAvatar from "@dashboard/components/TableCellAvatar"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { OrderRefundDataQuery } from "@dashboard/graphql"; +import { FormsetChange } from "@dashboard/hooks/useFormset"; +import { renderCollection } from "@dashboard/misc"; import { Card, CardContent, @@ -8,16 +17,7 @@ import { TextField, Typography, } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import Money from "@saleor/components/Money"; -import Skeleton from "@saleor/components/Skeleton"; -import TableCellAvatar from "@saleor/components/TableCellAvatar"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { OrderRefundDataQuery } from "@saleor/graphql"; -import { FormsetChange } from "@saleor/hooks/useFormset"; import { makeStyles } from "@saleor/macaw-ui"; -import { renderCollection } from "@saleor/misc"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderReturnPage/OrderReturnPage.tsx b/src/orders/components/OrderReturnPage/OrderReturnPage.tsx index 983565f36..034433edc 100644 --- a/src/orders/components/OrderReturnPage/OrderReturnPage.tsx +++ b/src/orders/components/OrderReturnPage/OrderReturnPage.tsx @@ -1,12 +1,12 @@ -import { Backlink } from "@saleor/components/Backlink"; -import CardSpacer from "@saleor/components/CardSpacer"; -import Container from "@saleor/components/Container"; -import Grid from "@saleor/components/Grid"; -import PageHeader from "@saleor/components/PageHeader"; -import { OrderDetailsFragment, OrderErrorFragment } from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import { renderCollection } from "@saleor/misc"; -import { orderUrl } from "@saleor/orders/urls"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import Container from "@dashboard/components/Container"; +import Grid from "@dashboard/components/Grid"; +import PageHeader from "@dashboard/components/PageHeader"; +import { OrderDetailsFragment, OrderErrorFragment } from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import { renderCollection } from "@dashboard/misc"; +import { orderUrl } from "@dashboard/orders/urls"; import React from "react"; import { defineMessages, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderReturnPage/OrderReturnRefundItemsCard/MaximalButton.tsx b/src/orders/components/OrderReturnPage/OrderReturnRefundItemsCard/MaximalButton.tsx index ea7000dec..ccbed8192 100644 --- a/src/orders/components/OrderReturnPage/OrderReturnRefundItemsCard/MaximalButton.tsx +++ b/src/orders/components/OrderReturnPage/OrderReturnRefundItemsCard/MaximalButton.tsx @@ -1,4 +1,4 @@ -import { Button } from "@saleor/components/Button"; +import { Button } from "@dashboard/components/Button"; import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/orders/components/OrderReturnPage/OrderReturnRefundItemsCard/ProductErrorCell.tsx b/src/orders/components/OrderReturnPage/OrderReturnRefundItemsCard/ProductErrorCell.tsx index 1fa00e121..35f19b3f6 100644 --- a/src/orders/components/OrderReturnPage/OrderReturnRefundItemsCard/ProductErrorCell.tsx +++ b/src/orders/components/OrderReturnPage/OrderReturnRefundItemsCard/ProductErrorCell.tsx @@ -1,5 +1,5 @@ +import ErrorExclamationCircleIcon from "@dashboard/icons/ErrorExclamationCircle"; import { Popper, TableCell, Typography } from "@material-ui/core"; -import ErrorExclamationCircleIcon from "@saleor/icons/ErrorExclamationCircle"; import { makeStyles } from "@saleor/macaw-ui"; import React, { useState } from "react"; import { defineMessages, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderReturnPage/OrderReturnRefundItemsCard/ReturnItemsCard.tsx b/src/orders/components/OrderReturnPage/OrderReturnRefundItemsCard/ReturnItemsCard.tsx index 3169789dd..525558d95 100644 --- a/src/orders/components/OrderReturnPage/OrderReturnRefundItemsCard/ReturnItemsCard.tsx +++ b/src/orders/components/OrderReturnPage/OrderReturnRefundItemsCard/ReturnItemsCard.tsx @@ -1,3 +1,14 @@ +import Money from "@dashboard/components/Money"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableCellAvatar from "@dashboard/components/TableCellAvatar"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { + OrderDetailsFragment, + OrderErrorFragment, + OrderLineFragment, +} from "@dashboard/graphql"; +import { FormsetChange } from "@dashboard/hooks/useFormset"; +import { getById, renderCollection } from "@dashboard/misc"; import { Card, CardContent, @@ -7,18 +18,7 @@ import { TableHead, TextField, } from "@material-ui/core"; -import Money from "@saleor/components/Money"; -import Skeleton from "@saleor/components/Skeleton"; -import TableCellAvatar from "@saleor/components/TableCellAvatar"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { - OrderDetailsFragment, - OrderErrorFragment, - OrderLineFragment, -} from "@saleor/graphql"; -import { FormsetChange } from "@saleor/hooks/useFormset"; import { makeStyles, ResponsiveTable } from "@saleor/macaw-ui"; -import { getById, renderCollection } from "@saleor/misc"; import React, { CSSProperties } from "react"; import { defineMessages, FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderReturnPage/form.tsx b/src/orders/components/OrderReturnPage/form.tsx index 89e0de7e9..11058bb6d 100644 --- a/src/orders/components/OrderReturnPage/form.tsx +++ b/src/orders/components/OrderReturnPage/form.tsx @@ -1,15 +1,15 @@ -import { useExitFormDialog } from "@saleor/components/Form/useExitFormDialog"; -import { FulfillmentStatus, OrderDetailsFragment } from "@saleor/graphql"; +import { useExitFormDialog } from "@dashboard/components/Form/useExitFormDialog"; +import { FulfillmentStatus, OrderDetailsFragment } from "@dashboard/graphql"; import useForm, { CommonUseFormResultWithHandlers, SubmitPromise, -} from "@saleor/hooks/useForm"; +} from "@dashboard/hooks/useForm"; import useFormset, { FormsetChange, FormsetData, -} from "@saleor/hooks/useFormset"; -import useHandleFormSubmit from "@saleor/hooks/useHandleFormSubmit"; -import { getById } from "@saleor/misc"; +} from "@dashboard/hooks/useFormset"; +import useHandleFormSubmit from "@dashboard/hooks/useHandleFormSubmit"; +import { getById } from "@dashboard/misc"; import React, { useEffect } from "react"; import { OrderRefundAmountCalculationMode } from "../OrderRefundPage/form"; diff --git a/src/orders/components/OrderReturnPage/utils.tsx b/src/orders/components/OrderReturnPage/utils.tsx index c39a949da..f57b639c2 100644 --- a/src/orders/components/OrderReturnPage/utils.tsx +++ b/src/orders/components/OrderReturnPage/utils.tsx @@ -1,6 +1,6 @@ -import { FulfillmentStatus, OrderDetailsFragment } from "@saleor/graphql"; -import { getById } from "@saleor/misc"; -import { Node } from "@saleor/types"; +import { FulfillmentStatus, OrderDetailsFragment } from "@dashboard/graphql"; +import { getById } from "@dashboard/misc"; +import { Node } from "@dashboard/types"; import { FormsetQuantityData, diff --git a/src/orders/components/OrderSettings/OrderSettings.tsx b/src/orders/components/OrderSettings/OrderSettings.tsx index 78e63eb58..b40703a59 100644 --- a/src/orders/components/OrderSettings/OrderSettings.tsx +++ b/src/orders/components/OrderSettings/OrderSettings.tsx @@ -1,7 +1,7 @@ +import CardSpacer from "@dashboard/components/CardSpacer"; +import CardTitle from "@dashboard/components/CardTitle"; +import ControlledCheckbox from "@dashboard/components/ControlledCheckbox"; import { Card, CardContent, Typography } from "@material-ui/core"; -import CardSpacer from "@saleor/components/CardSpacer"; -import CardTitle from "@saleor/components/CardTitle"; -import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderSettingsPage/OrderSettingsPage.stories.tsx b/src/orders/components/OrderSettingsPage/OrderSettingsPage.stories.tsx index ff380df6d..ad69f6c7a 100644 --- a/src/orders/components/OrderSettingsPage/OrderSettingsPage.stories.tsx +++ b/src/orders/components/OrderSettingsPage/OrderSettingsPage.stories.tsx @@ -1,8 +1,8 @@ import { orderSettings as orderSettingsFixture, shopOrderSettings as shopOrderSettingsFixture, -} from "@saleor/orders/fixtures"; -import Decorator from "@saleor/storybook/Decorator"; +} from "@dashboard/orders/fixtures"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/orders/components/OrderSettingsPage/OrderSettingsPage.tsx b/src/orders/components/OrderSettingsPage/OrderSettingsPage.tsx index 1511c4e2f..600524316 100644 --- a/src/orders/components/OrderSettingsPage/OrderSettingsPage.tsx +++ b/src/orders/components/OrderSettingsPage/OrderSettingsPage.tsx @@ -1,18 +1,18 @@ -import { Typography } from "@material-ui/core"; -import { Backlink } from "@saleor/components/Backlink"; -import Container from "@saleor/components/Container"; -import Grid from "@saleor/components/Grid"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; +import { Backlink } from "@dashboard/components/Backlink"; +import Container from "@dashboard/components/Container"; +import Grid from "@dashboard/components/Grid"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; import { OrderSettingsFragment, ShopOrderSettingsFragment, -} from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { sectionNames } from "@saleor/intl"; +} from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { sectionNames } from "@dashboard/intl"; +import { orderListUrl } from "@dashboard/orders/urls"; +import { Typography } from "@material-ui/core"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { orderListUrl } from "@saleor/orders/urls"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderSettingsPage/form.tsx b/src/orders/components/OrderSettingsPage/form.tsx index 859842137..270d5629d 100644 --- a/src/orders/components/OrderSettingsPage/form.tsx +++ b/src/orders/components/OrderSettingsPage/form.tsx @@ -1,12 +1,12 @@ import { OrderSettingsFragment, ShopOrderSettingsFragment, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import useForm, { CommonUseFormResult, SubmitPromise, -} from "@saleor/hooks/useForm"; -import useHandleFormSubmit from "@saleor/hooks/useHandleFormSubmit"; +} from "@dashboard/hooks/useForm"; +import useHandleFormSubmit from "@dashboard/hooks/useHandleFormSubmit"; import React from "react"; export interface OrderSettingsFormData { diff --git a/src/orders/components/OrderShippingMethodEditDialog/OrderShippingMethodEditDialog.tsx b/src/orders/components/OrderShippingMethodEditDialog/OrderShippingMethodEditDialog.tsx index ecbd8d0bc..90342c308 100644 --- a/src/orders/components/OrderShippingMethodEditDialog/OrderShippingMethodEditDialog.tsx +++ b/src/orders/components/OrderShippingMethodEditDialog/OrderShippingMethodEditDialog.tsx @@ -1,3 +1,14 @@ +import BackButton from "@dashboard/components/BackButton"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import Form from "@dashboard/components/Form"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import Money from "@dashboard/components/Money"; +import { SingleSelectField } from "@dashboard/components/SingleSelectField"; +import { OrderDetailsFragment, OrderErrorFragment } from "@dashboard/graphql"; +import useModalDialogErrors from "@dashboard/hooks/useModalDialogErrors"; +import { buttonMessages } from "@dashboard/intl"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getOrderErrorMessage from "@dashboard/utils/errors/order"; import { Dialog, DialogActions, @@ -6,18 +17,7 @@ import { DialogTitle, Typography, } from "@material-ui/core"; -import BackButton from "@saleor/components/BackButton"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import Form from "@saleor/components/Form"; -import FormSpacer from "@saleor/components/FormSpacer"; -import Money from "@saleor/components/Money"; -import { SingleSelectField } from "@saleor/components/SingleSelectField"; -import { OrderDetailsFragment, OrderErrorFragment } from "@saleor/graphql"; -import useModalDialogErrors from "@saleor/hooks/useModalDialogErrors"; -import { buttonMessages } from "@saleor/intl"; import { ConfirmButtonTransitionState, makeStyles } from "@saleor/macaw-ui"; -import { getFormErrors } from "@saleor/utils/errors"; -import getOrderErrorMessage from "@saleor/utils/errors/order"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderUnfulfilledProductsCard/OrderUnfulfilledProductsCard.tsx b/src/orders/components/OrderUnfulfilledProductsCard/OrderUnfulfilledProductsCard.tsx index f6f7146c8..28ec53e6b 100644 --- a/src/orders/components/OrderUnfulfilledProductsCard/OrderUnfulfilledProductsCard.tsx +++ b/src/orders/components/OrderUnfulfilledProductsCard/OrderUnfulfilledProductsCard.tsx @@ -1,10 +1,10 @@ +import { Button } from "@dashboard/components/Button"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import { OrderLineFragment } from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; +import { renderCollection } from "@dashboard/misc"; import { Card, CardActions, TableBody, Typography } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardSpacer from "@saleor/components/CardSpacer"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import { OrderLineFragment } from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; -import { renderCollection } from "@saleor/misc"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/orders/containers/OrderOperations.tsx b/src/orders/containers/OrderOperations.tsx index d9795bd00..404bad028 100644 --- a/src/orders/containers/OrderOperations.tsx +++ b/src/orders/containers/OrderOperations.tsx @@ -53,7 +53,7 @@ import { useOrderShippingMethodUpdateMutation, useOrderUpdateMutation, useOrderVoidMutation, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import React from "react"; import { getMutationProviderData } from "../../misc"; diff --git a/src/orders/fixtures.ts b/src/orders/fixtures.ts index 2de49f206..39830b968 100644 --- a/src/orders/fixtures.ts +++ b/src/orders/fixtures.ts @@ -19,9 +19,12 @@ import { SearchWarehousesQuery, ShopOrderSettingsFragment, WeightUnitsEnum, -} from "@saleor/graphql"; -import { RelayToFlat } from "@saleor/types"; -import { warehouseForPickup, warehouseList } from "@saleor/warehouses/fixtures"; +} from "@dashboard/graphql"; +import { RelayToFlat } from "@dashboard/types"; +import { + warehouseForPickup, + warehouseList, +} from "@dashboard/warehouses/fixtures"; import { MessageDescriptor } from "react-intl"; import { transformOrderStatus, transformPaymentStatus } from "../misc"; diff --git a/src/orders/index.tsx b/src/orders/index.tsx index 29acb005c..5f0c012a1 100644 --- a/src/orders/index.tsx +++ b/src/orders/index.tsx @@ -1,5 +1,5 @@ -import { sectionNames } from "@saleor/intl"; -import { asSortParams } from "@saleor/utils/sort"; +import { sectionNames } from "@dashboard/intl"; +import { asSortParams } from "@dashboard/utils/sort"; import { parse as parseQs } from "qs"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/orders/urls.ts b/src/orders/urls.ts index 627443a24..7a18d1648 100644 --- a/src/orders/urls.ts +++ b/src/orders/urls.ts @@ -1,4 +1,4 @@ -import { stringifyQs } from "@saleor/utils/urls"; +import { stringifyQs } from "@dashboard/utils/urls"; import urlJoin from "url-join"; import { diff --git a/src/orders/utils/data.test.ts b/src/orders/utils/data.test.ts index 04e2b3452..6545f39bb 100644 --- a/src/orders/utils/data.test.ts +++ b/src/orders/utils/data.test.ts @@ -5,8 +5,8 @@ import { OrderRefundDataQuery, OrderStatus, PaymentChargeStatusEnum, -} from "@saleor/graphql"; -import { FormsetData } from "@saleor/hooks/useFormset"; +} from "@dashboard/graphql"; +import { FormsetData } from "@dashboard/hooks/useFormset"; import { LineItemData } from "../components/OrderReturnPage/form"; import { diff --git a/src/orders/utils/data.ts b/src/orders/utils/data.ts index a4ab6de2e..cf334d527 100644 --- a/src/orders/utils/data.ts +++ b/src/orders/utils/data.ts @@ -1,4 +1,4 @@ -import { IMoney, subtractMoney } from "@saleor/components/Money"; +import { IMoney, subtractMoney } from "@dashboard/components/Money"; import { AddressFragment, AddressInput, @@ -12,9 +12,9 @@ import { OrderRefundDataQuery, StockFragment, WarehouseFragment, -} from "@saleor/graphql"; -import { FormsetData } from "@saleor/hooks/useFormset"; -import { findInEnum, getById } from "@saleor/misc"; +} from "@dashboard/graphql"; +import { FormsetData } from "@dashboard/hooks/useFormset"; +import { findInEnum, getById } from "@dashboard/misc"; import { LineItemData, diff --git a/src/orders/views/OrderDetails/OrderDetails.tsx b/src/orders/views/OrderDetails/OrderDetails.tsx index 15a9ca0fa..de2496ed6 100644 --- a/src/orders/views/OrderDetails/OrderDetails.tsx +++ b/src/orders/views/OrderDetails/OrderDetails.tsx @@ -1,6 +1,6 @@ -import { MetadataFormData } from "@saleor/components/Metadata"; -import NotFoundPage from "@saleor/components/NotFoundPage"; -import { Task } from "@saleor/containers/BackgroundTasks/types"; +import { MetadataFormData } from "@dashboard/components/Metadata"; +import NotFoundPage from "@dashboard/components/NotFoundPage"; +import { Task } from "@dashboard/containers/BackgroundTasks/types"; import { JobStatusEnum, OrderStatus, @@ -8,14 +8,14 @@ import { useOrderDetailsQuery, useUpdateMetadataMutation, useUpdatePrivateMetadataMutation, -} from "@saleor/graphql"; -import useBackgroundTask from "@saleor/hooks/useBackgroundTask"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { commonMessages } from "@saleor/intl"; -import getOrderErrorMessage from "@saleor/utils/errors/order"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createMetadataUpdateHandler from "@saleor/utils/handlers/metadataUpdateHandler"; +} from "@dashboard/graphql"; +import useBackgroundTask from "@dashboard/hooks/useBackgroundTask"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { commonMessages } from "@dashboard/intl"; +import getOrderErrorMessage from "@dashboard/utils/errors/order"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createMetadataUpdateHandler from "@dashboard/utils/handlers/metadataUpdateHandler"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/orders/views/OrderDetails/OrderDetailsMessages.tsx b/src/orders/views/OrderDetails/OrderDetailsMessages.tsx index 3e0018d0a..bc9d23994 100644 --- a/src/orders/views/OrderDetails/OrderDetailsMessages.tsx +++ b/src/orders/views/OrderDetails/OrderDetailsMessages.tsx @@ -1,5 +1,5 @@ -import { handleNestedMutationErrors } from "@saleor/auth"; -import messages from "@saleor/containers/BackgroundTasks/messages"; +import { handleNestedMutationErrors } from "@dashboard/auth"; +import messages from "@dashboard/containers/BackgroundTasks/messages"; import { InvoiceEmailSendMutation, InvoiceRequestMutation, @@ -20,11 +20,11 @@ import { OrderShippingMethodUpdateMutation, OrderUpdateMutation, OrderVoidMutation, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import getOrderErrorMessage from "@saleor/utils/errors/order"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import getOrderErrorMessage from "@dashboard/utils/errors/order"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/orders/views/OrderDetails/OrderDraftDetails/index.tsx b/src/orders/views/OrderDetails/OrderDraftDetails/index.tsx index cc12ac6fc..58717d57f 100644 --- a/src/orders/views/OrderDetails/OrderDraftDetails/index.tsx +++ b/src/orders/views/OrderDetails/OrderDraftDetails/index.tsx @@ -1,5 +1,5 @@ -import { WindowTitle } from "@saleor/components/WindowTitle"; -import { DEFAULT_INITIAL_SEARCH_DATA } from "@saleor/config"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; +import { DEFAULT_INITIAL_SEARCH_DATA } from "@dashboard/config"; import { OrderDetailsQuery, OrderDraftCancelMutation, @@ -13,22 +13,22 @@ import { StockAvailability, useChannelUsabilityDataQuery, useCustomerAddressesQuery, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { CustomerEditData } from "@saleor/orders/components/OrderCustomer"; -import { OrderCustomerAddressesEditDialogOutput } from "@saleor/orders/components/OrderCustomerAddressesEditDialog/types"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { CustomerEditData } from "@dashboard/orders/components/OrderCustomer"; +import { OrderCustomerAddressesEditDialogOutput } from "@dashboard/orders/components/OrderCustomerAddressesEditDialog/types"; import { CustomerChangeActionEnum, OrderCustomerChangeData, -} from "@saleor/orders/components/OrderCustomerChangeDialog/form"; -import OrderCustomerChangeDialog from "@saleor/orders/components/OrderCustomerChangeDialog/OrderCustomerChangeDialog"; -import { getVariantSearchAddress } from "@saleor/orders/utils/data"; -import { OrderDiscountProvider } from "@saleor/products/components/OrderDiscountProviders/OrderDiscountProvider"; -import { OrderLineDiscountProvider } from "@saleor/products/components/OrderDiscountProviders/OrderLineDiscountProvider"; -import useCustomerSearch from "@saleor/searches/useCustomerSearch"; -import { useOrderVariantSearch } from "@saleor/searches/useOrderVariantSearch"; -import { PartialMutationProviderOutput } from "@saleor/types"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/orders/components/OrderCustomerChangeDialog/form"; +import OrderCustomerChangeDialog from "@dashboard/orders/components/OrderCustomerChangeDialog/OrderCustomerChangeDialog"; +import { getVariantSearchAddress } from "@dashboard/orders/utils/data"; +import { OrderDiscountProvider } from "@dashboard/products/components/OrderDiscountProviders/OrderDiscountProvider"; +import { OrderLineDiscountProvider } from "@dashboard/products/components/OrderDiscountProviders/OrderLineDiscountProvider"; +import useCustomerSearch from "@dashboard/searches/useCustomerSearch"; +import { useOrderVariantSearch } from "@dashboard/searches/useOrderVariantSearch"; +import { PartialMutationProviderOutput } from "@dashboard/types"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/orders/views/OrderDetails/OrderNormalDetails/index.tsx b/src/orders/views/OrderDetails/OrderNormalDetails/index.tsx index b57b63f6a..ab5472dcd 100644 --- a/src/orders/views/OrderDetails/OrderNormalDetails/index.tsx +++ b/src/orders/views/OrderDetails/OrderNormalDetails/index.tsx @@ -1,4 +1,4 @@ -import { WindowTitle } from "@saleor/components/WindowTitle"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; import { FulfillmentFragment, FulfillmentStatus, @@ -9,22 +9,22 @@ import { OrderUpdateMutationVariables, useCustomerAddressesQuery, useWarehouseListQuery, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; import { extractMutationErrors, getById, getMutationState, getStringOrPlaceholder, -} from "@saleor/misc"; -import OrderCannotCancelOrderDialog from "@saleor/orders/components/OrderCannotCancelOrderDialog"; -import { OrderCustomerAddressesEditDialogOutput } from "@saleor/orders/components/OrderCustomerAddressesEditDialog/types"; -import OrderFulfillmentApproveDialog from "@saleor/orders/components/OrderFulfillmentApproveDialog"; -import OrderFulfillStockExceededDialog from "@saleor/orders/components/OrderFulfillStockExceededDialog"; -import OrderInvoiceEmailSendDialog from "@saleor/orders/components/OrderInvoiceEmailSendDialog"; -import { transformFuflillmentLinesToStockFormsetData } from "@saleor/orders/utils/data"; -import { PartialMutationProviderOutput } from "@saleor/types"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/misc"; +import OrderCannotCancelOrderDialog from "@dashboard/orders/components/OrderCannotCancelOrderDialog"; +import { OrderCustomerAddressesEditDialogOutput } from "@dashboard/orders/components/OrderCustomerAddressesEditDialog/types"; +import OrderFulfillmentApproveDialog from "@dashboard/orders/components/OrderFulfillmentApproveDialog"; +import OrderFulfillStockExceededDialog from "@dashboard/orders/components/OrderFulfillStockExceededDialog"; +import OrderInvoiceEmailSendDialog from "@dashboard/orders/components/OrderInvoiceEmailSendDialog"; +import { transformFuflillmentLinesToStockFormsetData } from "@dashboard/orders/utils/data"; +import { PartialMutationProviderOutput } from "@dashboard/types"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/orders/views/OrderDetails/OrderUnconfirmedDetails/index.tsx b/src/orders/views/OrderDetails/OrderUnconfirmedDetails/index.tsx index 26a46bbbe..cca5ea4d0 100644 --- a/src/orders/views/OrderDetails/OrderUnconfirmedDetails/index.tsx +++ b/src/orders/views/OrderDetails/OrderUnconfirmedDetails/index.tsx @@ -1,5 +1,5 @@ -import { WindowTitle } from "@saleor/components/WindowTitle"; -import { DEFAULT_INITIAL_SEARCH_DATA } from "@saleor/config"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; +import { DEFAULT_INITIAL_SEARCH_DATA } from "@dashboard/config"; import { FulfillmentStatus, OrderFulfillmentApproveMutation, @@ -8,17 +8,17 @@ import { OrderUpdateMutationVariables, useCustomerAddressesQuery, useWarehouseListQuery, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import OrderCannotCancelOrderDialog from "@saleor/orders/components/OrderCannotCancelOrderDialog"; -import { OrderCustomerAddressesEditDialogOutput } from "@saleor/orders/components/OrderCustomerAddressesEditDialog/types"; -import OrderFulfillmentApproveDialog from "@saleor/orders/components/OrderFulfillmentApproveDialog"; -import OrderInvoiceEmailSendDialog from "@saleor/orders/components/OrderInvoiceEmailSendDialog"; -import { OrderDiscountProvider } from "@saleor/products/components/OrderDiscountProviders/OrderDiscountProvider"; -import { OrderLineDiscountProvider } from "@saleor/products/components/OrderDiscountProviders/OrderLineDiscountProvider"; -import { useOrderVariantSearch } from "@saleor/searches/useOrderVariantSearch"; -import { PartialMutationProviderOutput } from "@saleor/types"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import OrderCannotCancelOrderDialog from "@dashboard/orders/components/OrderCannotCancelOrderDialog"; +import { OrderCustomerAddressesEditDialogOutput } from "@dashboard/orders/components/OrderCustomerAddressesEditDialog/types"; +import OrderFulfillmentApproveDialog from "@dashboard/orders/components/OrderFulfillmentApproveDialog"; +import OrderInvoiceEmailSendDialog from "@dashboard/orders/components/OrderInvoiceEmailSendDialog"; +import { OrderDiscountProvider } from "@dashboard/products/components/OrderDiscountProviders/OrderDiscountProvider"; +import { OrderLineDiscountProvider } from "@dashboard/products/components/OrderDiscountProviders/OrderLineDiscountProvider"; +import { useOrderVariantSearch } from "@dashboard/searches/useOrderVariantSearch"; +import { PartialMutationProviderOutput } from "@dashboard/types"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/orders/views/OrderDraftList/OrderDraftList.tsx b/src/orders/views/OrderDraftList/OrderDraftList.tsx index 81fdbb9f0..af2cf81f1 100644 --- a/src/orders/views/OrderDraftList/OrderDraftList.tsx +++ b/src/orders/views/OrderDraftList/OrderDraftList.tsx @@ -1,34 +1,34 @@ -import { DialogContentText } from "@material-ui/core"; -import ChannelPickerDialog from "@saleor/channels/components/ChannelPickerDialog"; -import ActionDialog from "@saleor/components/ActionDialog"; -import useAppChannel from "@saleor/components/AppLayout/AppChannelContext"; -import DeleteFilterTabDialog from "@saleor/components/DeleteFilterTabDialog"; +import ChannelPickerDialog from "@dashboard/channels/components/ChannelPickerDialog"; +import ActionDialog from "@dashboard/components/ActionDialog"; +import useAppChannel from "@dashboard/components/AppLayout/AppChannelContext"; +import DeleteFilterTabDialog from "@dashboard/components/DeleteFilterTabDialog"; import SaveFilterTabDialog, { SaveFilterTabDialogFormData, -} from "@saleor/components/SaveFilterTabDialog"; -import { useShopLimitsQuery } from "@saleor/components/Shop/queries"; +} from "@dashboard/components/SaveFilterTabDialog"; +import { useShopLimitsQuery } from "@dashboard/components/Shop/queries"; import { useOrderDraftBulkCancelMutation, useOrderDraftCreateMutation, useOrderDraftListQuery, -} from "@saleor/graphql"; -import useBulkActions from "@saleor/hooks/useBulkActions"; -import useListSettings from "@saleor/hooks/useListSettings"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; +} from "@dashboard/graphql"; +import useBulkActions from "@dashboard/hooks/useBulkActions"; +import useListSettings from "@dashboard/hooks/useListSettings"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { usePaginationReset } from "@dashboard/hooks/usePaginationReset"; import usePaginator, { createPaginationState, PaginatorContext, -} from "@saleor/hooks/usePaginator"; +} from "@dashboard/hooks/usePaginator"; +import { maybe } from "@dashboard/misc"; +import { ListViews } from "@dashboard/types"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createFilterHandlers from "@dashboard/utils/handlers/filterHandlers"; +import createSortHandler from "@dashboard/utils/handlers/sortHandler"; +import { mapEdgesToItems, mapNodeToChoice } from "@dashboard/utils/maps"; +import { getSortParams } from "@dashboard/utils/sort"; +import { DialogContentText } from "@material-ui/core"; import { DeleteIcon, IconButton } from "@saleor/macaw-ui"; -import { maybe } from "@saleor/misc"; -import { ListViews } from "@saleor/types"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createFilterHandlers from "@saleor/utils/handlers/filterHandlers"; -import createSortHandler from "@saleor/utils/handlers/sortHandler"; -import { mapEdgesToItems, mapNodeToChoice } from "@saleor/utils/maps"; -import { getSortParams } from "@saleor/utils/sort"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/views/OrderDraftList/filters.test.ts b/src/orders/views/OrderDraftList/filters.test.ts index 0b8d2681b..edc9fc4b7 100644 --- a/src/orders/views/OrderDraftList/filters.test.ts +++ b/src/orders/views/OrderDraftList/filters.test.ts @@ -1,8 +1,8 @@ -import { date } from "@saleor/fixtures"; -import { createFilterStructure } from "@saleor/orders/components/OrderDraftListPage"; -import { OrderDraftListUrlFilters } from "@saleor/orders/urls"; -import { getFilterQueryParams } from "@saleor/utils/filters"; -import { stringifyQs } from "@saleor/utils/urls"; +import { date } from "@dashboard/fixtures"; +import { createFilterStructure } from "@dashboard/orders/components/OrderDraftListPage"; +import { OrderDraftListUrlFilters } from "@dashboard/orders/urls"; +import { getFilterQueryParams } from "@dashboard/utils/filters"; +import { stringifyQs } from "@dashboard/utils/urls"; import { getExistingKeys, setFilterOptsStatus } from "@test/filters"; import { config } from "@test/intl"; import { createIntl } from "react-intl"; diff --git a/src/orders/views/OrderDraftList/filters.ts b/src/orders/views/OrderDraftList/filters.ts index 0e7085c63..bc00c5bb6 100644 --- a/src/orders/views/OrderDraftList/filters.ts +++ b/src/orders/views/OrderDraftList/filters.ts @@ -1,10 +1,10 @@ -import { FilterElement } from "@saleor/components/Filter"; -import { OrderDraftFilterInput } from "@saleor/graphql"; -import { maybe } from "@saleor/misc"; +import { FilterElement } from "@dashboard/components/Filter"; +import { OrderDraftFilterInput } from "@dashboard/graphql"; +import { maybe } from "@dashboard/misc"; import { OrderDraftFilterKeys, OrderDraftListFilterOpts, -} from "@saleor/orders/components/OrderDraftListPage"; +} from "@dashboard/orders/components/OrderDraftListPage"; import { createFilterTabUtils, diff --git a/src/orders/views/OrderDraftList/sort.ts b/src/orders/views/OrderDraftList/sort.ts index 37e5fb7e6..b427c7680 100644 --- a/src/orders/views/OrderDraftList/sort.ts +++ b/src/orders/views/OrderDraftList/sort.ts @@ -1,6 +1,6 @@ -import { OrderSortField } from "@saleor/graphql"; -import { OrderDraftListUrlSortField } from "@saleor/orders/urls"; -import { createGetSortQueryVariables } from "@saleor/utils/sort"; +import { OrderSortField } from "@dashboard/graphql"; +import { OrderDraftListUrlSortField } from "@dashboard/orders/urls"; +import { createGetSortQueryVariables } from "@dashboard/utils/sort"; export function getSortQueryField( sort: OrderDraftListUrlSortField, diff --git a/src/orders/views/OrderFulfill/OrderFulfill.tsx b/src/orders/views/OrderFulfill/OrderFulfill.tsx index 79aa63754..8d58a1600 100644 --- a/src/orders/views/OrderFulfill/OrderFulfill.tsx +++ b/src/orders/views/OrderFulfill/OrderFulfill.tsx @@ -1,23 +1,23 @@ -import { handleNestedMutationErrors } from "@saleor/auth"; -import { WindowTitle } from "@saleor/components/WindowTitle"; +import { handleNestedMutationErrors } from "@dashboard/auth"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; import { useFulfillOrderMutation, useOrderFulfillDataQuery, useOrderFulfillSettingsQuery, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { getMutationErrors } from "@saleor/misc"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { getMutationErrors } from "@dashboard/misc"; import OrderFulfillPage, { OrderFulfillSubmitData, -} from "@saleor/orders/components/OrderFulfillPage"; +} from "@dashboard/orders/components/OrderFulfillPage"; import { orderFulfillUrl, OrderFulfillUrlDialog, OrderFulfillUrlQueryParams, orderUrl, -} from "@saleor/orders/urls"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; +} from "@dashboard/orders/urls"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/orders/views/OrderList/OrderList.tsx b/src/orders/views/OrderList/OrderList.tsx index ca2592369..65f8d25fc 100644 --- a/src/orders/views/OrderList/OrderList.tsx +++ b/src/orders/views/OrderList/OrderList.tsx @@ -1,30 +1,30 @@ -import ChannelPickerDialog from "@saleor/channels/components/ChannelPickerDialog"; -import useAppChannel from "@saleor/components/AppLayout/AppChannelContext"; -import DeleteFilterTabDialog from "@saleor/components/DeleteFilterTabDialog"; +import ChannelPickerDialog from "@dashboard/channels/components/ChannelPickerDialog"; +import useAppChannel from "@dashboard/components/AppLayout/AppChannelContext"; +import DeleteFilterTabDialog from "@dashboard/components/DeleteFilterTabDialog"; import SaveFilterTabDialog, { SaveFilterTabDialogFormData, -} from "@saleor/components/SaveFilterTabDialog"; -import { useShopLimitsQuery } from "@saleor/components/Shop/queries"; +} from "@dashboard/components/SaveFilterTabDialog"; +import { useShopLimitsQuery } from "@dashboard/components/Shop/queries"; import { useOrderDraftCreateMutation, useOrderListQuery, -} from "@saleor/graphql"; -import useListSettings from "@saleor/hooks/useListSettings"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; +} from "@dashboard/graphql"; +import useListSettings from "@dashboard/hooks/useListSettings"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { usePaginationReset } from "@dashboard/hooks/usePaginationReset"; import usePaginator, { createPaginationState, PaginatorContext, -} from "@saleor/hooks/usePaginator"; -import { useSortRedirects } from "@saleor/hooks/useSortRedirects"; -import { getStringOrPlaceholder } from "@saleor/misc"; -import { ListViews } from "@saleor/types"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createFilterHandlers from "@saleor/utils/handlers/filterHandlers"; -import createSortHandler from "@saleor/utils/handlers/sortHandler"; -import { mapEdgesToItems, mapNodeToChoice } from "@saleor/utils/maps"; -import { getSortParams } from "@saleor/utils/sort"; +} from "@dashboard/hooks/usePaginator"; +import { useSortRedirects } from "@dashboard/hooks/useSortRedirects"; +import { getStringOrPlaceholder } from "@dashboard/misc"; +import { ListViews } from "@dashboard/types"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createFilterHandlers from "@dashboard/utils/handlers/filterHandlers"; +import createSortHandler from "@dashboard/utils/handlers/sortHandler"; +import { mapEdgesToItems, mapNodeToChoice } from "@dashboard/utils/maps"; +import { getSortParams } from "@dashboard/utils/sort"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/orders/views/OrderList/filters.test.ts b/src/orders/views/OrderList/filters.test.ts index deaec645c..f6b7b674d 100644 --- a/src/orders/views/OrderList/filters.test.ts +++ b/src/orders/views/OrderList/filters.test.ts @@ -1,12 +1,12 @@ -import { date } from "@saleor/fixtures"; -import { OrderStatusFilter, PaymentChargeStatusEnum } from "@saleor/graphql"; +import { date } from "@dashboard/fixtures"; +import { OrderStatusFilter, PaymentChargeStatusEnum } from "@dashboard/graphql"; import { createFilterStructure, OrderFilterGiftCard, -} from "@saleor/orders/components/OrderListPage"; -import { OrderListUrlFilters } from "@saleor/orders/urls"; -import { getFilterQueryParams } from "@saleor/utils/filters"; -import { stringifyQs } from "@saleor/utils/urls"; +} from "@dashboard/orders/components/OrderListPage"; +import { OrderListUrlFilters } from "@dashboard/orders/urls"; +import { getFilterQueryParams } from "@dashboard/utils/filters"; +import { stringifyQs } from "@dashboard/utils/urls"; import { getExistingKeys, setFilterOptsStatus } from "@test/filters"; import { config } from "@test/intl"; import { createIntl } from "react-intl"; diff --git a/src/orders/views/OrderList/filters.ts b/src/orders/views/OrderList/filters.ts index 4601e1c90..f3ed19154 100644 --- a/src/orders/views/OrderList/filters.ts +++ b/src/orders/views/OrderList/filters.ts @@ -1,15 +1,15 @@ -import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField"; +import { MultiAutocompleteChoiceType } from "@dashboard/components/MultiAutocompleteSelectField"; import { OrderFilterInput, OrderStatusFilter, PaymentChargeStatusEnum, -} from "@saleor/graphql"; -import { findInEnum, findValueInEnum, parseBoolean } from "@saleor/misc"; +} from "@dashboard/graphql"; +import { findInEnum, findValueInEnum, parseBoolean } from "@dashboard/misc"; import { OrderFilterGiftCard, OrderFilterKeys, OrderListFilterOpts, -} from "@saleor/orders/components/OrderListPage/filters"; +} from "@dashboard/orders/components/OrderListPage/filters"; import { FilterElement, diff --git a/src/orders/views/OrderList/sort.ts b/src/orders/views/OrderList/sort.ts index 158a79d9b..ff6bda288 100644 --- a/src/orders/views/OrderList/sort.ts +++ b/src/orders/views/OrderList/sort.ts @@ -1,6 +1,6 @@ -import { OrderSortField } from "@saleor/graphql"; -import { OrderListUrlSortField } from "@saleor/orders/urls"; -import { createGetSortQueryVariables } from "@saleor/utils/sort"; +import { OrderSortField } from "@dashboard/graphql"; +import { OrderListUrlSortField } from "@dashboard/orders/urls"; +import { createGetSortQueryVariables } from "@dashboard/utils/sort"; export const DEFAULT_SORT_KEY = OrderListUrlSortField.number; diff --git a/src/orders/views/OrderRefund/OrderRefund.tsx b/src/orders/views/OrderRefund/OrderRefund.tsx index 165379d23..1cf6afd44 100644 --- a/src/orders/views/OrderRefund/OrderRefund.tsx +++ b/src/orders/views/OrderRefund/OrderRefund.tsx @@ -2,17 +2,17 @@ import { useOrderFulfillmentRefundProductsMutation, useOrderRefundDataQuery, useOrderRefundMutation, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { extractMutationErrors } from "@saleor/misc"; -import OrderRefundPage from "@saleor/orders/components/OrderRefundPage"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { extractMutationErrors } from "@dashboard/misc"; +import OrderRefundPage from "@dashboard/orders/components/OrderRefundPage"; import { OrderRefundAmountCalculationMode, OrderRefundSubmitData, OrderRefundType, -} from "@saleor/orders/components/OrderRefundPage/form"; -import { orderUrl } from "@saleor/orders/urls"; +} from "@dashboard/orders/components/OrderRefundPage/form"; +import { orderUrl } from "@dashboard/orders/urls"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/orders/views/OrderReturn/OrderReturn.tsx b/src/orders/views/OrderReturn/OrderReturn.tsx index 618da795b..65ccf483a 100644 --- a/src/orders/views/OrderReturn/OrderReturn.tsx +++ b/src/orders/views/OrderReturn/OrderReturn.tsx @@ -2,14 +2,14 @@ import { OrderErrorCode, useFulfillmentReturnProductsMutation, useOrderDetailsQuery, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { commonMessages } from "@saleor/intl"; -import { extractMutationErrors } from "@saleor/misc"; -import OrderReturnPage from "@saleor/orders/components/OrderReturnPage"; -import { OrderReturnFormData } from "@saleor/orders/components/OrderReturnPage/form"; -import { orderUrl } from "@saleor/orders/urls"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { commonMessages } from "@dashboard/intl"; +import { extractMutationErrors } from "@dashboard/misc"; +import OrderReturnPage from "@dashboard/orders/components/OrderReturnPage"; +import { OrderReturnFormData } from "@dashboard/orders/components/OrderReturnPage/form"; +import { orderUrl } from "@dashboard/orders/urls"; import React from "react"; import { defineMessages, useIntl } from "react-intl"; diff --git a/src/orders/views/OrderReturn/utils.tsx b/src/orders/views/OrderReturn/utils.tsx index c4c98f840..ba9e0e372 100644 --- a/src/orders/views/OrderReturn/utils.tsx +++ b/src/orders/views/OrderReturn/utils.tsx @@ -3,13 +3,13 @@ import { OrderReturnFulfillmentLineInput, OrderReturnLineInput, OrderReturnProductsInput, -} from "@saleor/graphql"; -import { getById } from "@saleor/misc"; -import { OrderRefundAmountCalculationMode } from "@saleor/orders/components/OrderRefundPage/form"; +} from "@dashboard/graphql"; +import { getById } from "@dashboard/misc"; +import { OrderRefundAmountCalculationMode } from "@dashboard/orders/components/OrderRefundPage/form"; import { FormsetQuantityData, OrderReturnFormData, -} from "@saleor/orders/components/OrderReturnPage/form"; +} from "@dashboard/orders/components/OrderReturnPage/form"; class ReturnFormDataParser { private order: OrderDetailsFragment; diff --git a/src/orders/views/OrderSettings.tsx b/src/orders/views/OrderSettings.tsx index 6d93b2bea..642c72832 100644 --- a/src/orders/views/OrderSettings.tsx +++ b/src/orders/views/OrderSettings.tsx @@ -1,11 +1,11 @@ import { useOrderSettingsQuery, useOrderSettingsUpdateMutation, -} from "@saleor/graphql"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { commonMessages } from "@saleor/intl"; -import { extractMutationErrors, getMutationState } from "@saleor/misc"; -import OrderSettingsPage from "@saleor/orders/components/OrderSettingsPage"; +} from "@dashboard/graphql"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { commonMessages } from "@dashboard/intl"; +import { extractMutationErrors, getMutationState } from "@dashboard/misc"; +import OrderSettingsPage from "@dashboard/orders/components/OrderSettingsPage"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/pageTypes/components/PageTypeAttributes/PageTypeAttributes.tsx b/src/pageTypes/components/PageTypeAttributes/PageTypeAttributes.tsx index bdec8bce1..dd85b6f59 100644 --- a/src/pageTypes/components/PageTypeAttributes/PageTypeAttributes.tsx +++ b/src/pageTypes/components/PageTypeAttributes/PageTypeAttributes.tsx @@ -1,21 +1,21 @@ -import { Card, TableCell } from "@material-ui/core"; -import { attributeUrl } from "@saleor/attributes/urls"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import Checkbox from "@saleor/components/Checkbox"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; +import { attributeUrl } from "@dashboard/attributes/urls"; +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import Checkbox from "@dashboard/components/Checkbox"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; import { SortableTableBody, SortableTableRow, -} from "@saleor/components/SortableTable"; -import { TableButtonWrapper } from "@saleor/components/TableButtonWrapper/TableButtonWrapper"; -import TableHead from "@saleor/components/TableHead"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { AttributeFragment, AttributeTypeEnum } from "@saleor/graphql"; +} from "@dashboard/components/SortableTable"; +import { TableButtonWrapper } from "@dashboard/components/TableButtonWrapper/TableButtonWrapper"; +import TableHead from "@dashboard/components/TableHead"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { AttributeFragment, AttributeTypeEnum } from "@dashboard/graphql"; +import { renderCollection } from "@dashboard/misc"; +import { ListActions, ReorderAction } from "@dashboard/types"; +import { Card, TableCell } from "@material-ui/core"; import { DeleteIcon, IconButton, makeStyles } from "@saleor/macaw-ui"; -import { renderCollection } from "@saleor/misc"; -import { ListActions, ReorderAction } from "@saleor/types"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/pageTypes/components/PageTypeBulkDeleteDialog/PageTypeBulkDeleteDialog.tsx b/src/pageTypes/components/PageTypeBulkDeleteDialog/PageTypeBulkDeleteDialog.tsx index f1375ae73..f6df44e11 100644 --- a/src/pageTypes/components/PageTypeBulkDeleteDialog/PageTypeBulkDeleteDialog.tsx +++ b/src/pageTypes/components/PageTypeBulkDeleteDialog/PageTypeBulkDeleteDialog.tsx @@ -1,5 +1,5 @@ +import ActionDialog from "@dashboard/components/ActionDialog"; import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/pageTypes/components/PageTypeCreatePage/PageTypeCreatePage.stories.tsx b/src/pageTypes/components/PageTypeCreatePage/PageTypeCreatePage.stories.tsx index df53e0307..be6de08ed 100644 --- a/src/pageTypes/components/PageTypeCreatePage/PageTypeCreatePage.stories.tsx +++ b/src/pageTypes/components/PageTypeCreatePage/PageTypeCreatePage.stories.tsx @@ -1,5 +1,5 @@ -import { PageErrorCode } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; +import { PageErrorCode } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/pageTypes/components/PageTypeCreatePage/PageTypeCreatePage.tsx b/src/pageTypes/components/PageTypeCreatePage/PageTypeCreatePage.tsx index 9a0380f7b..db8ddb3ac 100644 --- a/src/pageTypes/components/PageTypeCreatePage/PageTypeCreatePage.tsx +++ b/src/pageTypes/components/PageTypeCreatePage/PageTypeCreatePage.tsx @@ -1,18 +1,18 @@ +import { Backlink } from "@dashboard/components/Backlink"; +import Container from "@dashboard/components/Container"; +import Form from "@dashboard/components/Form"; +import Grid from "@dashboard/components/Grid"; +import Hr from "@dashboard/components/Hr"; +import Metadata, { MetadataFormData } from "@dashboard/components/Metadata"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; +import { PageErrorFragment } from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { commonMessages, sectionNames } from "@dashboard/intl"; +import { pageTypeListUrl } from "@dashboard/pageTypes/urls"; +import useMetadataChangeTrigger from "@dashboard/utils/metadata/useMetadataChangeTrigger"; import { Typography } from "@material-ui/core"; -import { Backlink } from "@saleor/components/Backlink"; -import Container from "@saleor/components/Container"; -import Form from "@saleor/components/Form"; -import Grid from "@saleor/components/Grid"; -import Hr from "@saleor/components/Hr"; -import Metadata, { MetadataFormData } from "@saleor/components/Metadata"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; -import { PageErrorFragment } from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { commonMessages, sectionNames } from "@saleor/intl"; import { ConfirmButtonTransitionState, makeStyles } from "@saleor/macaw-ui"; -import { pageTypeListUrl } from "@saleor/pageTypes/urls"; -import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/pageTypes/components/PageTypeDetails/PageTypeDetails.tsx b/src/pageTypes/components/PageTypeDetails/PageTypeDetails.tsx index 4f2059403..3e69604a9 100644 --- a/src/pageTypes/components/PageTypeDetails/PageTypeDetails.tsx +++ b/src/pageTypes/components/PageTypeDetails/PageTypeDetails.tsx @@ -1,9 +1,9 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import { PageErrorFragment } from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getPageErrorMessage from "@dashboard/utils/errors/page"; import { Card, CardContent, TextField } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import { PageErrorFragment } from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; -import { getFormErrors } from "@saleor/utils/errors"; -import getPageErrorMessage from "@saleor/utils/errors/page"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/pageTypes/components/PageTypeDetailsPage/PageTypeDetailsPage.stories.tsx b/src/pageTypes/components/PageTypeDetailsPage/PageTypeDetailsPage.stories.tsx index 92155e6fd..d71b591e2 100644 --- a/src/pageTypes/components/PageTypeDetailsPage/PageTypeDetailsPage.stories.tsx +++ b/src/pageTypes/components/PageTypeDetailsPage/PageTypeDetailsPage.stories.tsx @@ -1,6 +1,6 @@ -import { listActionsProps } from "@saleor/fixtures"; -import { PageErrorCode } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; +import { listActionsProps } from "@dashboard/fixtures"; +import { PageErrorCode } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/pageTypes/components/PageTypeDetailsPage/PageTypeDetailsPage.tsx b/src/pageTypes/components/PageTypeDetailsPage/PageTypeDetailsPage.tsx index 3a7222436..82124dd3f 100644 --- a/src/pageTypes/components/PageTypeDetailsPage/PageTypeDetailsPage.tsx +++ b/src/pageTypes/components/PageTypeDetailsPage/PageTypeDetailsPage.tsx @@ -1,26 +1,26 @@ -import { Typography } from "@material-ui/core"; -import { Backlink } from "@saleor/components/Backlink"; -import Container from "@saleor/components/Container"; -import Form from "@saleor/components/Form"; -import Grid from "@saleor/components/Grid"; -import Hr from "@saleor/components/Hr"; -import Metadata from "@saleor/components/Metadata/Metadata"; -import { MetadataFormData } from "@saleor/components/Metadata/types"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; -import { SingleAutocompleteChoiceType } from "@saleor/components/SingleAutocompleteSelectField"; +import { Backlink } from "@dashboard/components/Backlink"; +import Container from "@dashboard/components/Container"; +import Form from "@dashboard/components/Form"; +import Grid from "@dashboard/components/Grid"; +import Hr from "@dashboard/components/Hr"; +import Metadata from "@dashboard/components/Metadata/Metadata"; +import { MetadataFormData } from "@dashboard/components/Metadata/types"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; +import { SingleAutocompleteChoiceType } from "@dashboard/components/SingleAutocompleteSelectField"; import { AttributeTypeEnum, PageErrorFragment, PageTypeDetailsFragment, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { commonMessages, sectionNames } from "@saleor/intl"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { commonMessages, sectionNames } from "@dashboard/intl"; +import { pageTypeListUrl } from "@dashboard/pageTypes/urls"; +import { ListActions, ReorderEvent } from "@dashboard/types"; +import { mapMetadataItemToInput } from "@dashboard/utils/maps"; +import useMetadataChangeTrigger from "@dashboard/utils/metadata/useMetadataChangeTrigger"; +import { Typography } from "@material-ui/core"; import { ConfirmButtonTransitionState, makeStyles } from "@saleor/macaw-ui"; -import { pageTypeListUrl } from "@saleor/pageTypes/urls"; -import { ListActions, ReorderEvent } from "@saleor/types"; -import { mapMetadataItemToInput } from "@saleor/utils/maps"; -import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/pageTypes/components/PageTypeList/PageTypeList.tsx b/src/pageTypes/components/PageTypeList/PageTypeList.tsx index 57fd04f17..83d5faa8f 100644 --- a/src/pageTypes/components/PageTypeList/PageTypeList.tsx +++ b/src/pageTypes/components/PageTypeList/PageTypeList.tsx @@ -1,15 +1,18 @@ +import Checkbox from "@dashboard/components/Checkbox"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableCellHeader from "@dashboard/components/TableCellHeader"; +import TableHead from "@dashboard/components/TableHead"; +import { TablePaginationWithContext } from "@dashboard/components/TablePagination"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { PageTypeFragment } from "@dashboard/graphql"; +import { + PageTypeListUrlSortField, + pageTypeUrl, +} from "@dashboard/pageTypes/urls"; +import { getArrowDirection } from "@dashboard/utils/sort"; import { TableBody, TableCell, TableFooter } from "@material-ui/core"; -import Checkbox from "@saleor/components/Checkbox"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableCellHeader from "@saleor/components/TableCellHeader"; -import TableHead from "@saleor/components/TableHead"; -import { TablePaginationWithContext } from "@saleor/components/TablePagination"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { PageTypeFragment } from "@saleor/graphql"; import { makeStyles } from "@saleor/macaw-ui"; -import { PageTypeListUrlSortField, pageTypeUrl } from "@saleor/pageTypes/urls"; -import { getArrowDirection } from "@saleor/utils/sort"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/pageTypes/components/PageTypeListPage/PageTypeListPage.stories.tsx b/src/pageTypes/components/PageTypeListPage/PageTypeListPage.stories.tsx index adf3e669c..364a7d0ab 100644 --- a/src/pageTypes/components/PageTypeListPage/PageTypeListPage.stories.tsx +++ b/src/pageTypes/components/PageTypeListPage/PageTypeListPage.stories.tsx @@ -4,10 +4,10 @@ import { searchPageProps, sortPageProps, tabPageProps, -} from "@saleor/fixtures"; -import { PageTypeListUrlSortField } from "@saleor/pageTypes/urls"; -import Decorator from "@saleor/storybook/Decorator"; -import { PaginatorContextDecorator } from "@saleor/storybook/PaginatorContextDecorator"; +} from "@dashboard/fixtures"; +import { PageTypeListUrlSortField } from "@dashboard/pageTypes/urls"; +import Decorator from "@dashboard/storybook/Decorator"; +import { PaginatorContextDecorator } from "@dashboard/storybook/PaginatorContextDecorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/pageTypes/components/PageTypeListPage/PageTypeListPage.tsx b/src/pageTypes/components/PageTypeListPage/PageTypeListPage.tsx index f937dd6d4..7f413a811 100644 --- a/src/pageTypes/components/PageTypeListPage/PageTypeListPage.tsx +++ b/src/pageTypes/components/PageTypeListPage/PageTypeListPage.tsx @@ -1,16 +1,16 @@ -import { Card } from "@material-ui/core"; -import { Backlink } from "@saleor/components/Backlink"; -import { Button } from "@saleor/components/Button"; -import Container from "@saleor/components/Container"; -import PageHeader from "@saleor/components/PageHeader"; -import SearchBar from "@saleor/components/SearchBar"; -import { configurationMenuUrl } from "@saleor/configuration"; -import { PageTypeFragment } from "@saleor/graphql"; -import { sectionNames } from "@saleor/intl"; +import { Backlink } from "@dashboard/components/Backlink"; +import { Button } from "@dashboard/components/Button"; +import Container from "@dashboard/components/Container"; +import PageHeader from "@dashboard/components/PageHeader"; +import SearchBar from "@dashboard/components/SearchBar"; +import { configurationMenuUrl } from "@dashboard/configuration"; +import { PageTypeFragment } from "@dashboard/graphql"; +import { sectionNames } from "@dashboard/intl"; import { pageTypeAddUrl, PageTypeListUrlSortField, -} from "@saleor/pageTypes/urls"; +} from "@dashboard/pageTypes/urls"; +import { Card } from "@material-ui/core"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/pageTypes/fixtures.ts b/src/pageTypes/fixtures.ts index 085ebff1c..7079b8459 100644 --- a/src/pageTypes/fixtures.ts +++ b/src/pageTypes/fixtures.ts @@ -3,7 +3,7 @@ import { AttributeTypeEnum, PageTypeDetailsFragment, PageTypeFragment, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; export const pageTypes: PageTypeFragment[] = [ { diff --git a/src/pageTypes/hooks/usePageTypeDelete/types.ts b/src/pageTypes/hooks/usePageTypeDelete/types.ts index a89455cd4..ed4aec49c 100644 --- a/src/pageTypes/hooks/usePageTypeDelete/types.ts +++ b/src/pageTypes/hooks/usePageTypeDelete/types.ts @@ -1,5 +1,5 @@ -import { TypeDeleteMessages } from "@saleor/components/TypeDeleteWarningDialog"; -import { Ids } from "@saleor/types"; +import { TypeDeleteMessages } from "@dashboard/components/TypeDeleteWarningDialog"; +import { Ids } from "@dashboard/types"; export interface UseTypeDeleteData extends TypeDeleteMessages { isOpen: boolean; diff --git a/src/pageTypes/hooks/usePageTypeDelete/usePageTypeDelete.tsx b/src/pageTypes/hooks/usePageTypeDelete/usePageTypeDelete.tsx index 3e63ae08d..826e84c42 100644 --- a/src/pageTypes/hooks/usePageTypeDelete/usePageTypeDelete.tsx +++ b/src/pageTypes/hooks/usePageTypeDelete/usePageTypeDelete.tsx @@ -1,9 +1,9 @@ -import { PageCountQueryVariables, usePageCountQuery } from "@saleor/graphql"; -import { pageListUrl } from "@saleor/pages/urls"; +import { PageCountQueryVariables, usePageCountQuery } from "@dashboard/graphql"; +import { pageListUrl } from "@dashboard/pages/urls"; import { PageTypeListUrlQueryParams, PageTypeUrlQueryParams, -} from "@saleor/pageTypes/urls"; +} from "@dashboard/pageTypes/urls"; import React from "react"; import * as messages from "./messages"; diff --git a/src/pageTypes/index.tsx b/src/pageTypes/index.tsx index d72512d65..45bd6b773 100644 --- a/src/pageTypes/index.tsx +++ b/src/pageTypes/index.tsx @@ -1,5 +1,5 @@ -import { sectionNames } from "@saleor/intl"; -import { asSortParams } from "@saleor/utils/sort"; +import { sectionNames } from "@dashboard/intl"; +import { asSortParams } from "@dashboard/utils/sort"; import { parse as parseQs } from "qs"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/pageTypes/urls.ts b/src/pageTypes/urls.ts index 0ad8b950a..1966335cc 100644 --- a/src/pageTypes/urls.ts +++ b/src/pageTypes/urls.ts @@ -1,4 +1,4 @@ -import { stringifyQs } from "@saleor/utils/urls"; +import { stringifyQs } from "@dashboard/utils/urls"; import urlJoin from "url-join"; import { diff --git a/src/pageTypes/views/PageTypeCreate.tsx b/src/pageTypes/views/PageTypeCreate.tsx index c7b37ea05..1ec4a93f9 100644 --- a/src/pageTypes/views/PageTypeCreate.tsx +++ b/src/pageTypes/views/PageTypeCreate.tsx @@ -1,13 +1,13 @@ -import { WindowTitle } from "@saleor/components/WindowTitle"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; import { usePageTypeCreateMutation, useUpdateMetadataMutation, useUpdatePrivateMetadataMutation, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { getMutationErrors } from "@saleor/misc"; -import createMetadataCreateHandler from "@saleor/utils/handlers/metadataCreateHandler"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { getMutationErrors } from "@dashboard/misc"; +import createMetadataCreateHandler from "@dashboard/utils/handlers/metadataCreateHandler"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/pageTypes/views/PageTypeDetails.tsx b/src/pageTypes/views/PageTypeDetails.tsx index 4b49031d2..c762f742c 100644 --- a/src/pageTypes/views/PageTypeDetails.tsx +++ b/src/pageTypes/views/PageTypeDetails.tsx @@ -1,11 +1,11 @@ -import AssignAttributeDialog from "@saleor/components/AssignAttributeDialog"; -import AttributeUnassignDialog from "@saleor/components/AttributeUnassignDialog"; -import BulkAttributeUnassignDialog from "@saleor/components/BulkAttributeUnassignDialog"; -import { Button } from "@saleor/components/Button"; -import NotFoundPage from "@saleor/components/NotFoundPage"; -import TypeDeleteWarningDialog from "@saleor/components/TypeDeleteWarningDialog"; -import { WindowTitle } from "@saleor/components/WindowTitle"; -import { DEFAULT_INITIAL_SEARCH_DATA } from "@saleor/config"; +import AssignAttributeDialog from "@dashboard/components/AssignAttributeDialog"; +import AttributeUnassignDialog from "@dashboard/components/AttributeUnassignDialog"; +import BulkAttributeUnassignDialog from "@dashboard/components/BulkAttributeUnassignDialog"; +import { Button } from "@dashboard/components/Button"; +import NotFoundPage from "@dashboard/components/NotFoundPage"; +import TypeDeleteWarningDialog from "@dashboard/components/TypeDeleteWarningDialog"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; +import { DEFAULT_INITIAL_SEARCH_DATA } from "@dashboard/config"; import { useAssignPageAttributeMutation, usePageTypeAttributeReorderMutation, @@ -15,16 +15,16 @@ import { useUnassignPageAttributeMutation, useUpdateMetadataMutation, useUpdatePrivateMetadataMutation, -} from "@saleor/graphql"; -import useBulkActions from "@saleor/hooks/useBulkActions"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { commonMessages } from "@saleor/intl"; -import { getStringOrPlaceholder } from "@saleor/misc"; -import { ReorderEvent } from "@saleor/types"; -import getPageErrorMessage from "@saleor/utils/errors/page"; -import createMetadataUpdateHandler from "@saleor/utils/handlers/metadataUpdateHandler"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/graphql"; +import useBulkActions from "@dashboard/hooks/useBulkActions"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { commonMessages } from "@dashboard/intl"; +import { getStringOrPlaceholder } from "@dashboard/misc"; +import { ReorderEvent } from "@dashboard/types"; +import getPageErrorMessage from "@dashboard/utils/errors/page"; +import createMetadataUpdateHandler from "@dashboard/utils/handlers/metadataUpdateHandler"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/pageTypes/views/PageTypeList/PageTypeList.tsx b/src/pageTypes/views/PageTypeList/PageTypeList.tsx index 9d590d7d6..821deae9d 100644 --- a/src/pageTypes/views/PageTypeList/PageTypeList.tsx +++ b/src/pageTypes/views/PageTypeList/PageTypeList.tsx @@ -1,30 +1,30 @@ -import DeleteFilterTabDialog from "@saleor/components/DeleteFilterTabDialog"; +import DeleteFilterTabDialog from "@dashboard/components/DeleteFilterTabDialog"; import SaveFilterTabDialog, { SaveFilterTabDialogFormData, -} from "@saleor/components/SaveFilterTabDialog"; -import TypeDeleteWarningDialog from "@saleor/components/TypeDeleteWarningDialog"; +} from "@dashboard/components/SaveFilterTabDialog"; +import TypeDeleteWarningDialog from "@dashboard/components/TypeDeleteWarningDialog"; import { usePageTypeBulkDeleteMutation, usePageTypeListQuery, -} from "@saleor/graphql"; -import useBulkActions from "@saleor/hooks/useBulkActions"; -import useListSettings from "@saleor/hooks/useListSettings"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; +} from "@dashboard/graphql"; +import useBulkActions from "@dashboard/hooks/useBulkActions"; +import useListSettings from "@dashboard/hooks/useListSettings"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { usePaginationReset } from "@dashboard/hooks/usePaginationReset"; import usePaginator, { createPaginationState, PaginatorContext, -} from "@saleor/hooks/usePaginator"; -import { commonMessages } from "@saleor/intl"; +} from "@dashboard/hooks/usePaginator"; +import { commonMessages } from "@dashboard/intl"; +import { getStringOrPlaceholder } from "@dashboard/misc"; +import usePageTypeDelete from "@dashboard/pageTypes/hooks/usePageTypeDelete"; +import { ListViews } from "@dashboard/types"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createSortHandler from "@dashboard/utils/handlers/sortHandler"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; +import { getSortParams } from "@dashboard/utils/sort"; import { DeleteIcon, IconButton } from "@saleor/macaw-ui"; -import { getStringOrPlaceholder } from "@saleor/misc"; -import usePageTypeDelete from "@saleor/pageTypes/hooks/usePageTypeDelete"; -import { ListViews } from "@saleor/types"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createSortHandler from "@saleor/utils/handlers/sortHandler"; -import { mapEdgesToItems } from "@saleor/utils/maps"; -import { getSortParams } from "@saleor/utils/sort"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/pageTypes/views/PageTypeList/filters.ts b/src/pageTypes/views/PageTypeList/filters.ts index 0d237a0f0..51eb3a2c2 100644 --- a/src/pageTypes/views/PageTypeList/filters.ts +++ b/src/pageTypes/views/PageTypeList/filters.ts @@ -1,4 +1,4 @@ -import { PageTypeFilterInput } from "@saleor/graphql"; +import { PageTypeFilterInput } from "@dashboard/graphql"; import { createFilterTabUtils, diff --git a/src/pageTypes/views/PageTypeList/sort.ts b/src/pageTypes/views/PageTypeList/sort.ts index 7b298c81f..830eb41bd 100644 --- a/src/pageTypes/views/PageTypeList/sort.ts +++ b/src/pageTypes/views/PageTypeList/sort.ts @@ -1,6 +1,6 @@ -import { PageTypeSortField } from "@saleor/graphql"; -import { PageTypeListUrlSortField } from "@saleor/pageTypes/urls"; -import { createGetSortQueryVariables } from "@saleor/utils/sort"; +import { PageTypeSortField } from "@dashboard/graphql"; +import { PageTypeListUrlSortField } from "@dashboard/pageTypes/urls"; +import { createGetSortQueryVariables } from "@dashboard/utils/sort"; export function getSortQueryField( sort: PageTypeListUrlSortField, diff --git a/src/pages/components/PageDetailsPage/PageDetailsPage.stories.tsx b/src/pages/components/PageDetailsPage/PageDetailsPage.stories.tsx index af685a148..db5d6c167 100644 --- a/src/pages/components/PageDetailsPage/PageDetailsPage.stories.tsx +++ b/src/pages/components/PageDetailsPage/PageDetailsPage.stories.tsx @@ -1,8 +1,8 @@ -import { fetchMoreProps } from "@saleor/fixtures"; -import { PageErrorCode } from "@saleor/graphql"; -import { PageData } from "@saleor/pages/components/PageDetailsPage/form"; -import { page } from "@saleor/pages/fixtures"; -import Decorator from "@saleor/storybook/Decorator"; +import { fetchMoreProps } from "@dashboard/fixtures"; +import { PageErrorCode } from "@dashboard/graphql"; +import { PageData } from "@dashboard/pages/components/PageDetailsPage/form"; +import { page } from "@dashboard/pages/fixtures"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/pages/components/PageDetailsPage/PageDetailsPage.tsx b/src/pages/components/PageDetailsPage/PageDetailsPage.tsx index aebd8ee8c..481025894 100644 --- a/src/pages/components/PageDetailsPage/PageDetailsPage.tsx +++ b/src/pages/components/PageDetailsPage/PageDetailsPage.tsx @@ -1,18 +1,18 @@ import { getReferenceAttributeEntityTypeFromAttribute, mergeAttributeValues, -} from "@saleor/attributes/utils/data"; -import AssignAttributeValueDialog from "@saleor/components/AssignAttributeValueDialog"; -import Attributes, { AttributeInput } from "@saleor/components/Attributes"; -import { Backlink } from "@saleor/components/Backlink"; -import CardSpacer from "@saleor/components/CardSpacer"; -import Container from "@saleor/components/Container"; -import Grid from "@saleor/components/Grid"; -import Metadata from "@saleor/components/Metadata"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; -import SeoForm from "@saleor/components/SeoForm"; -import VisibilityCard from "@saleor/components/VisibilityCard"; +} from "@dashboard/attributes/utils/data"; +import AssignAttributeValueDialog from "@dashboard/components/AssignAttributeValueDialog"; +import Attributes, { AttributeInput } from "@dashboard/components/Attributes"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import Container from "@dashboard/components/Container"; +import Grid from "@dashboard/components/Grid"; +import Metadata from "@dashboard/components/Metadata"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; +import SeoForm from "@dashboard/components/SeoForm"; +import VisibilityCard from "@dashboard/components/VisibilityCard"; import { PageDetailsFragment, PageErrorWithAttributesFragment, @@ -20,15 +20,15 @@ import { SearchPagesQuery, SearchPageTypesQuery, SearchProductsQuery, -} from "@saleor/graphql"; -import useDateLocalize from "@saleor/hooks/useDateLocalize"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { sectionNames } from "@saleor/intl"; +} from "@dashboard/graphql"; +import useDateLocalize from "@dashboard/hooks/useDateLocalize"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { sectionNames } from "@dashboard/intl"; +import { pageListUrl } from "@dashboard/pages/urls"; +import { FetchMoreProps, RelayToFlat } from "@dashboard/types"; +import { mapNodeToChoice } from "@dashboard/utils/maps"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { pageListUrl } from "@saleor/pages/urls"; -import { FetchMoreProps, RelayToFlat } from "@saleor/types"; -import { mapNodeToChoice } from "@saleor/utils/maps"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/pages/components/PageDetailsPage/form.tsx b/src/pages/components/PageDetailsPage/form.tsx index b3e18abfc..05e64c54b 100644 --- a/src/pages/components/PageDetailsPage/form.tsx +++ b/src/pages/components/PageDetailsPage/form.tsx @@ -1,11 +1,10 @@ -import { OutputData } from "@editorjs/editorjs"; import { getAttributesDisplayData, getRichTextAttributesFromMap, getRichTextDataFromAttributes, mergeAttributes, RichTextProps, -} from "@saleor/attributes/utils/data"; +} from "@dashboard/attributes/utils/data"; import { createAttributeChangeHandler, createAttributeFileChangeHandler, @@ -14,41 +13,42 @@ import { createAttributeValueReorderHandler, createFetchMoreReferencesHandler, createFetchReferencesHandler, -} from "@saleor/attributes/utils/handlers"; -import { AttributeInput } from "@saleor/components/Attributes"; -import { useExitFormDialog } from "@saleor/components/Form/useExitFormDialog"; -import { MetadataFormData } from "@saleor/components/Metadata"; +} from "@dashboard/attributes/utils/handlers"; +import { AttributeInput } from "@dashboard/components/Attributes"; +import { useExitFormDialog } from "@dashboard/components/Form/useExitFormDialog"; +import { MetadataFormData } from "@dashboard/components/Metadata"; import { PageDetailsFragment, PageErrorWithAttributesFragment, SearchPagesQuery, SearchPageTypesQuery, SearchProductsQuery, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import useForm, { CommonUseFormResultWithHandlers, FormChange, SubmitPromise, -} from "@saleor/hooks/useForm"; +} from "@dashboard/hooks/useForm"; import useFormset, { FormsetChange, FormsetData, -} from "@saleor/hooks/useFormset"; -import useHandleFormSubmit from "@saleor/hooks/useHandleFormSubmit"; +} from "@dashboard/hooks/useFormset"; +import useHandleFormSubmit from "@dashboard/hooks/useHandleFormSubmit"; import { getAttributeInputFromPage, getAttributeInputFromPageType, -} from "@saleor/pages/utils/data"; -import { createPageTypeSelectHandler } from "@saleor/pages/utils/handlers"; -import { validatePageCreateData } from "@saleor/pages/utils/validation"; -import { FetchMoreProps, RelayToFlat, ReorderEvent } from "@saleor/types"; -import getPublicationData from "@saleor/utils/data/getPublicationData"; -import { mapMetadataItemToInput } from "@saleor/utils/maps"; -import getMetadata from "@saleor/utils/metadata/getMetadata"; -import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger"; -import { RichTextContext } from "@saleor/utils/richText/context"; -import { useMultipleRichText } from "@saleor/utils/richText/useMultipleRichText"; -import useRichText from "@saleor/utils/richText/useRichText"; +} from "@dashboard/pages/utils/data"; +import { createPageTypeSelectHandler } from "@dashboard/pages/utils/handlers"; +import { validatePageCreateData } from "@dashboard/pages/utils/validation"; +import { FetchMoreProps, RelayToFlat, ReorderEvent } from "@dashboard/types"; +import getPublicationData from "@dashboard/utils/data/getPublicationData"; +import { mapMetadataItemToInput } from "@dashboard/utils/maps"; +import getMetadata from "@dashboard/utils/metadata/getMetadata"; +import useMetadataChangeTrigger from "@dashboard/utils/metadata/useMetadataChangeTrigger"; +import { RichTextContext } from "@dashboard/utils/richText/context"; +import { useMultipleRichText } from "@dashboard/utils/richText/useMultipleRichText"; +import useRichText from "@dashboard/utils/richText/useRichText"; +import { OutputData } from "@editorjs/editorjs"; import React, { useEffect, useState } from "react"; export interface PageFormData extends MetadataFormData { diff --git a/src/pages/components/PageInfo/PageInfo.tsx b/src/pages/components/PageInfo/PageInfo.tsx index 44d42e08c..cb24d9e19 100644 --- a/src/pages/components/PageInfo/PageInfo.tsx +++ b/src/pages/components/PageInfo/PageInfo.tsx @@ -1,14 +1,14 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import RichTextEditor from "@dashboard/components/RichTextEditor"; +import { RichTextEditorLoading } from "@dashboard/components/RichTextEditor/RichTextEditorLoading"; +import { PageErrorFragment } from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getPageErrorMessage from "@dashboard/utils/errors/page"; +import { useRichTextContext } from "@dashboard/utils/richText/context"; import { Card, CardContent, TextField } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import FormSpacer from "@saleor/components/FormSpacer"; -import RichTextEditor from "@saleor/components/RichTextEditor"; -import { RichTextEditorLoading } from "@saleor/components/RichTextEditor/RichTextEditorLoading"; -import { PageErrorFragment } from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; import { makeStyles } from "@saleor/macaw-ui"; -import { getFormErrors } from "@saleor/utils/errors"; -import getPageErrorMessage from "@saleor/utils/errors/page"; -import { useRichTextContext } from "@saleor/utils/richText/context"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/pages/components/PageList/PageList.tsx b/src/pages/components/PageList/PageList.tsx index a258af7cc..dfd68bad4 100644 --- a/src/pages/components/PageList/PageList.tsx +++ b/src/pages/components/PageList/PageList.tsx @@ -1,17 +1,17 @@ +import Checkbox from "@dashboard/components/Checkbox"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableCellHeader from "@dashboard/components/TableCellHeader"; +import TableHead from "@dashboard/components/TableHead"; +import { TablePaginationWithContext } from "@dashboard/components/TablePagination"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { PageFragment } from "@dashboard/graphql"; +import { maybe, renderCollection } from "@dashboard/misc"; +import { PageListUrlSortField, pageUrl } from "@dashboard/pages/urls"; +import { ListActions, ListProps, SortPage } from "@dashboard/types"; +import { getArrowDirection } from "@dashboard/utils/sort"; import { Card, TableBody, TableCell, TableFooter } from "@material-ui/core"; -import Checkbox from "@saleor/components/Checkbox"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableCellHeader from "@saleor/components/TableCellHeader"; -import TableHead from "@saleor/components/TableHead"; -import { TablePaginationWithContext } from "@saleor/components/TablePagination"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { PageFragment } from "@saleor/graphql"; import { makeStyles, Pill } from "@saleor/macaw-ui"; -import { maybe, renderCollection } from "@saleor/misc"; -import { PageListUrlSortField, pageUrl } from "@saleor/pages/urls"; -import { ListActions, ListProps, SortPage } from "@saleor/types"; -import { getArrowDirection } from "@saleor/utils/sort"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/pages/components/PageListPage/PageListPage.stories.tsx b/src/pages/components/PageListPage/PageListPage.stories.tsx index 99729a3f0..efdf41f7f 100644 --- a/src/pages/components/PageListPage/PageListPage.stories.tsx +++ b/src/pages/components/PageListPage/PageListPage.stories.tsx @@ -2,11 +2,11 @@ import { listActionsProps, pageListProps, sortPageProps, -} from "@saleor/fixtures"; -import { pageList } from "@saleor/pages/fixtures"; -import { PageListUrlSortField } from "@saleor/pages/urls"; -import Decorator from "@saleor/storybook/Decorator"; -import { PaginatorContextDecorator } from "@saleor/storybook/PaginatorContextDecorator"; +} from "@dashboard/fixtures"; +import { pageList } from "@dashboard/pages/fixtures"; +import { PageListUrlSortField } from "@dashboard/pages/urls"; +import Decorator from "@dashboard/storybook/Decorator"; +import { PaginatorContextDecorator } from "@dashboard/storybook/PaginatorContextDecorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/pages/components/PageListPage/PageListPage.tsx b/src/pages/components/PageListPage/PageListPage.tsx index 6d5b6896d..e0543639c 100644 --- a/src/pages/components/PageListPage/PageListPage.tsx +++ b/src/pages/components/PageListPage/PageListPage.tsx @@ -1,15 +1,15 @@ -import { Card } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import Container from "@saleor/components/Container"; -import PageHeader from "@saleor/components/PageHeader"; -import { PageFragment } from "@saleor/graphql"; -import { sectionNames } from "@saleor/intl"; +import { Button } from "@dashboard/components/Button"; +import Container from "@dashboard/components/Container"; +import PageHeader from "@dashboard/components/PageHeader"; +import { PageFragment } from "@dashboard/graphql"; +import { sectionNames } from "@dashboard/intl"; import { PageListUrlDialog, PageListUrlQueryParams, PageListUrlSortField, -} from "@saleor/pages/urls"; -import { ListActions, PageListProps, SortPage } from "@saleor/types"; +} from "@dashboard/pages/urls"; +import { ListActions, PageListProps, SortPage } from "@dashboard/types"; +import { Card } from "@material-ui/core"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/pages/components/PageListPage/PageListSearchAndFilters.tsx b/src/pages/components/PageListPage/PageListSearchAndFilters.tsx index 25941ac57..81732798a 100644 --- a/src/pages/components/PageListPage/PageListSearchAndFilters.tsx +++ b/src/pages/components/PageListPage/PageListSearchAndFilters.tsx @@ -1,16 +1,16 @@ -import DeleteFilterTabDialog from "@saleor/components/DeleteFilterTabDialog"; -import FilterBar from "@saleor/components/FilterBar"; +import DeleteFilterTabDialog from "@dashboard/components/DeleteFilterTabDialog"; +import FilterBar from "@dashboard/components/FilterBar"; import SaveFilterTabDialog, { SaveFilterTabDialogFormData, -} from "@saleor/components/SaveFilterTabDialog"; -import { DEFAULT_INITIAL_SEARCH_DATA } from "@saleor/config"; -import { getSearchFetchMoreProps } from "@saleor/hooks/makeTopLevelSearch/utils"; -import useBulkActions from "@saleor/hooks/useBulkActions"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { pageListUrl, PageListUrlQueryParams } from "@saleor/pages/urls"; -import usePageTypeSearch from "@saleor/searches/usePageTypeSearch"; -import createFilterHandlers from "@saleor/utils/handlers/filterHandlers"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/components/SaveFilterTabDialog"; +import { DEFAULT_INITIAL_SEARCH_DATA } from "@dashboard/config"; +import { getSearchFetchMoreProps } from "@dashboard/hooks/makeTopLevelSearch/utils"; +import useBulkActions from "@dashboard/hooks/useBulkActions"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { pageListUrl, PageListUrlQueryParams } from "@dashboard/pages/urls"; +import usePageTypeSearch from "@dashboard/searches/usePageTypeSearch"; +import createFilterHandlers from "@dashboard/utils/handlers/filterHandlers"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/pages/components/PageListPage/filters.ts b/src/pages/components/PageListPage/filters.ts index 1c1f96985..f0bfea2af 100644 --- a/src/pages/components/PageListPage/filters.ts +++ b/src/pages/components/PageListPage/filters.ts @@ -1,28 +1,28 @@ -import { FilterElement, IFilter } from "@saleor/components/Filter"; -import { SearchWithFetchMoreProps } from "@saleor/giftCards/GiftCardsList/GiftCardListSearchAndFilters/types"; -import { SearchPageTypesQuery } from "@saleor/graphql"; +import { FilterElement, IFilter } from "@dashboard/components/Filter"; +import { SearchWithFetchMoreProps } from "@dashboard/giftCards/GiftCardsList/GiftCardListSearchAndFilters/types"; +import { SearchPageTypesQuery } from "@dashboard/graphql"; import { PageListUrlFilters, PageListUrlFiltersWithMultipleValues, PageListUrlSort, -} from "@saleor/pages/urls"; +} from "@dashboard/pages/urls"; import { ActiveTab, AutocompleteFilterOpts, FilterOpts, Pagination, Search, -} from "@saleor/types"; +} from "@dashboard/types"; import { createFilterTabUtils, createFilterUtils, getMultipleValueQueryParam, -} from "@saleor/utils/filters"; -import { createAutocompleteField } from "@saleor/utils/filters/fields"; +} from "@dashboard/utils/filters"; +import { createAutocompleteField } from "@dashboard/utils/filters/fields"; import { mapNodeToChoice, mapSingleValueNodeToChoice, -} from "@saleor/utils/maps"; +} from "@dashboard/utils/maps"; import { defineMessages, IntlShape } from "react-intl"; export enum PageListFilterKeys { diff --git a/src/pages/components/PageOrganizeContent/PageOrganizeContent.tsx b/src/pages/components/PageOrganizeContent/PageOrganizeContent.tsx index 50d663d3d..bdf16dc93 100644 --- a/src/pages/components/PageOrganizeContent/PageOrganizeContent.tsx +++ b/src/pages/components/PageOrganizeContent/PageOrganizeContent.tsx @@ -1,14 +1,14 @@ -import { Card, CardContent, Typography } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; +import CardTitle from "@dashboard/components/CardTitle"; import SingleAutocompleteSelectField, { SingleAutocompleteChoiceType, -} from "@saleor/components/SingleAutocompleteSelectField"; -import { PageDetailsFragment, PageErrorFragment } from "@saleor/graphql"; -import { FormChange } from "@saleor/hooks/useForm"; +} from "@dashboard/components/SingleAutocompleteSelectField"; +import { PageDetailsFragment, PageErrorFragment } from "@dashboard/graphql"; +import { FormChange } from "@dashboard/hooks/useForm"; +import { FetchMoreProps } from "@dashboard/types"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getPageErrorMessage from "@dashboard/utils/errors/page"; +import { Card, CardContent, Typography } from "@material-ui/core"; import { makeStyles } from "@saleor/macaw-ui"; -import { FetchMoreProps } from "@saleor/types"; -import { getFormErrors } from "@saleor/utils/errors"; -import getPageErrorMessage from "@saleor/utils/errors/page"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/pages/components/PageTypePickerDialog/PageTypePickerDialog.tsx b/src/pages/components/PageTypePickerDialog/PageTypePickerDialog.tsx index ab5f6eabc..c1772e6dc 100644 --- a/src/pages/components/PageTypePickerDialog/PageTypePickerDialog.tsx +++ b/src/pages/components/PageTypePickerDialog/PageTypePickerDialog.tsx @@ -1,11 +1,11 @@ -import ActionDialog from "@saleor/components/ActionDialog"; +import ActionDialog from "@dashboard/components/ActionDialog"; import SingleAutocompleteSelectField, { SingleAutocompleteChoiceType, -} from "@saleor/components/SingleAutocompleteSelectField"; -import useModalDialogOpen from "@saleor/hooks/useModalDialogOpen"; -import useStateFromProps from "@saleor/hooks/useStateFromProps"; +} from "@dashboard/components/SingleAutocompleteSelectField"; +import useModalDialogOpen from "@dashboard/hooks/useModalDialogOpen"; +import useStateFromProps from "@dashboard/hooks/useStateFromProps"; +import { FetchMoreProps } from "@dashboard/types"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { FetchMoreProps } from "@saleor/types"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/pages/fixtures.ts b/src/pages/fixtures.ts index 9dbd59fae..41e38b8db 100644 --- a/src/pages/fixtures.ts +++ b/src/pages/fixtures.ts @@ -2,7 +2,7 @@ import { AttributeInputTypeEnum, PageDetailsFragment, PageFragment, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import { PageType } from "@saleor/sdk/dist/apollo/types"; import * as richTextEditorFixtures from "../components/RichTextEditor/fixtures.json"; diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 38dce948d..ea7d7d9f8 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -1,5 +1,5 @@ -import { sectionNames } from "@saleor/intl"; -import { asSortParams } from "@saleor/utils/sort"; +import { sectionNames } from "@dashboard/intl"; +import { asSortParams } from "@dashboard/utils/sort"; import { parse as parseQs } from "qs"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/pages/urls.ts b/src/pages/urls.ts index 701555e87..b5ab6c7b3 100644 --- a/src/pages/urls.ts +++ b/src/pages/urls.ts @@ -1,4 +1,4 @@ -import { stringifyQs } from "@saleor/utils/urls"; +import { stringifyQs } from "@dashboard/utils/urls"; import urlJoin from "url-join"; import { diff --git a/src/pages/utils/data.ts b/src/pages/utils/data.ts index 813f51133..dc185294f 100644 --- a/src/pages/utils/data.ts +++ b/src/pages/utils/data.ts @@ -1,10 +1,10 @@ import { getSelectedAttributeValues, mergeChoicesWithValues, -} from "@saleor/attributes/utils/data"; -import { AttributeInput } from "@saleor/components/Attributes"; -import { PageDetailsFragment } from "@saleor/graphql"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/attributes/utils/data"; +import { AttributeInput } from "@dashboard/components/Attributes"; +import { PageDetailsFragment } from "@dashboard/graphql"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; export function getAttributeInputFromPage( page: PageDetailsFragment, diff --git a/src/pages/utils/handlers.ts b/src/pages/utils/handlers.ts index f7c5d631b..4121e1fb3 100644 --- a/src/pages/utils/handlers.ts +++ b/src/pages/utils/handlers.ts @@ -1,4 +1,4 @@ -import { FormChange } from "@saleor/hooks/useForm"; +import { FormChange } from "@dashboard/hooks/useForm"; export function createPageTypeSelectHandler( setPageType: (pageTypeId: string) => void, diff --git a/src/pages/utils/validation.ts b/src/pages/utils/validation.ts index e5f87ea72..6d58ba6f0 100644 --- a/src/pages/utils/validation.ts +++ b/src/pages/utils/validation.ts @@ -1,7 +1,7 @@ import { PageErrorCode, PageErrorWithAttributesFragment, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import { PageData } from "../components/PageDetailsPage/form"; diff --git a/src/pages/views/PageCreate.tsx b/src/pages/views/PageCreate.tsx index 867701c00..0d3edc47e 100644 --- a/src/pages/views/PageCreate.tsx +++ b/src/pages/views/PageCreate.tsx @@ -1,14 +1,14 @@ -import { getAttributesAfterFileAttributesUpdate } from "@saleor/attributes/utils/data"; +import { getAttributesAfterFileAttributesUpdate } from "@dashboard/attributes/utils/data"; import { handleUploadMultipleFiles, prepareAttributesInput, -} from "@saleor/attributes/utils/handlers"; -import { AttributeInput } from "@saleor/components/Attributes"; -import { WindowTitle } from "@saleor/components/WindowTitle"; +} from "@dashboard/attributes/utils/handlers"; +import { AttributeInput } from "@dashboard/components/Attributes"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; import { DEFAULT_INITIAL_SEARCH_DATA, VALUES_PAGINATE_BY, -} from "@saleor/config"; +} from "@dashboard/config"; import { PageErrorWithAttributesFragment, useFileUploadMutation, @@ -16,17 +16,17 @@ import { usePageTypeQuery, useUpdateMetadataMutation, useUpdatePrivateMetadataMutation, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { getMutationErrors } from "@saleor/misc"; -import usePageSearch from "@saleor/searches/usePageSearch"; -import usePageTypeSearch from "@saleor/searches/usePageTypeSearch"; -import useProductSearch from "@saleor/searches/useProductSearch"; -import useAttributeValueSearchHandler from "@saleor/utils/handlers/attributeValueSearchHandler"; -import createMetadataCreateHandler from "@saleor/utils/handlers/metadataCreateHandler"; -import { mapEdgesToItems } from "@saleor/utils/maps"; -import { getParsedDataForJsonStringField } from "@saleor/utils/richText/misc"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { getMutationErrors } from "@dashboard/misc"; +import usePageSearch from "@dashboard/searches/usePageSearch"; +import usePageTypeSearch from "@dashboard/searches/usePageTypeSearch"; +import useProductSearch from "@dashboard/searches/useProductSearch"; +import useAttributeValueSearchHandler from "@dashboard/utils/handlers/attributeValueSearchHandler"; +import createMetadataCreateHandler from "@dashboard/utils/handlers/metadataCreateHandler"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; +import { getParsedDataForJsonStringField } from "@dashboard/utils/richText/misc"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/pages/views/PageDetails.tsx b/src/pages/views/PageDetails.tsx index 6f1b5a7e0..fe0a92a11 100644 --- a/src/pages/views/PageDetails.tsx +++ b/src/pages/views/PageDetails.tsx @@ -1,21 +1,20 @@ -import { DialogContentText } from "@material-ui/core"; import { getAttributesAfterFileAttributesUpdate, mergeAttributeValueDeleteErrors, mergeFileUploadErrors, -} from "@saleor/attributes/utils/data"; +} from "@dashboard/attributes/utils/data"; import { handleDeleteMultipleAttributeValues, handleUploadMultipleFiles, prepareAttributesInput, -} from "@saleor/attributes/utils/handlers"; -import ActionDialog from "@saleor/components/ActionDialog"; -import { AttributeInput } from "@saleor/components/Attributes"; -import { WindowTitle } from "@saleor/components/WindowTitle"; +} from "@dashboard/attributes/utils/handlers"; +import ActionDialog from "@dashboard/components/ActionDialog"; +import { AttributeInput } from "@dashboard/components/Attributes"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; import { DEFAULT_INITIAL_SEARCH_DATA, VALUES_PAGINATE_BY, -} from "@saleor/config"; +} from "@dashboard/config"; import { AttributeErrorFragment, AttributeValueInput, @@ -30,16 +29,17 @@ import { usePageUpdateMutation, useUpdateMetadataMutation, useUpdatePrivateMetadataMutation, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { commonMessages } from "@saleor/intl"; -import usePageSearch from "@saleor/searches/usePageSearch"; -import useProductSearch from "@saleor/searches/useProductSearch"; -import useAttributeValueSearchHandler from "@saleor/utils/handlers/attributeValueSearchHandler"; -import createMetadataUpdateHandler from "@saleor/utils/handlers/metadataUpdateHandler"; -import { mapEdgesToItems } from "@saleor/utils/maps"; -import { getParsedDataForJsonStringField } from "@saleor/utils/richText/misc"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { commonMessages } from "@dashboard/intl"; +import usePageSearch from "@dashboard/searches/usePageSearch"; +import useProductSearch from "@dashboard/searches/useProductSearch"; +import useAttributeValueSearchHandler from "@dashboard/utils/handlers/attributeValueSearchHandler"; +import createMetadataUpdateHandler from "@dashboard/utils/handlers/metadataUpdateHandler"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; +import { getParsedDataForJsonStringField } from "@dashboard/utils/richText/misc"; +import { DialogContentText } from "@material-ui/core"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/pages/views/PageList/PageList.tsx b/src/pages/views/PageList/PageList.tsx index d9326a0f6..51dce0dba 100644 --- a/src/pages/views/PageList/PageList.tsx +++ b/src/pages/views/PageList/PageList.tsx @@ -1,30 +1,30 @@ -import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; -import { Button } from "@saleor/components/Button"; -import { DEFAULT_INITIAL_SEARCH_DATA } from "@saleor/config"; +import ActionDialog from "@dashboard/components/ActionDialog"; +import { Button } from "@dashboard/components/Button"; +import { DEFAULT_INITIAL_SEARCH_DATA } from "@dashboard/config"; import { usePageBulkPublishMutation, usePageBulkRemoveMutation, usePageListQuery, -} from "@saleor/graphql"; -import useBulkActions from "@saleor/hooks/useBulkActions"; -import useListSettings from "@saleor/hooks/useListSettings"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; +} from "@dashboard/graphql"; +import useBulkActions from "@dashboard/hooks/useBulkActions"; +import useListSettings from "@dashboard/hooks/useListSettings"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { usePaginationReset } from "@dashboard/hooks/usePaginationReset"; import usePaginator, { createPaginationState, PaginatorContext, -} from "@saleor/hooks/usePaginator"; +} from "@dashboard/hooks/usePaginator"; +import { maybe } from "@dashboard/misc"; +import PageTypePickerDialog from "@dashboard/pages/components/PageTypePickerDialog"; +import usePageTypeSearch from "@dashboard/searches/usePageTypeSearch"; +import { ListViews } from "@dashboard/types"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createSortHandler from "@dashboard/utils/handlers/sortHandler"; +import { mapEdgesToItems, mapNodeToChoice } from "@dashboard/utils/maps"; +import { getSortParams } from "@dashboard/utils/sort"; +import { DialogContentText } from "@material-ui/core"; import { DeleteIcon, IconButton } from "@saleor/macaw-ui"; -import { maybe } from "@saleor/misc"; -import PageTypePickerDialog from "@saleor/pages/components/PageTypePickerDialog"; -import usePageTypeSearch from "@saleor/searches/usePageTypeSearch"; -import { ListViews } from "@saleor/types"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createSortHandler from "@saleor/utils/handlers/sortHandler"; -import { mapEdgesToItems, mapNodeToChoice } from "@saleor/utils/maps"; -import { getSortParams } from "@saleor/utils/sort"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/pages/views/PageList/sort.ts b/src/pages/views/PageList/sort.ts index 248fb5da8..fcfb8c0ce 100644 --- a/src/pages/views/PageList/sort.ts +++ b/src/pages/views/PageList/sort.ts @@ -1,6 +1,9 @@ -import { PageFilterInput, PageSortField } from "@saleor/graphql"; -import { PageListUrlFilters, PageListUrlSortField } from "@saleor/pages/urls"; -import { createGetSortQueryVariables } from "@saleor/utils/sort"; +import { PageFilterInput, PageSortField } from "@dashboard/graphql"; +import { + PageListUrlFilters, + PageListUrlSortField, +} from "@dashboard/pages/urls"; +import { createGetSortQueryVariables } from "@dashboard/utils/sort"; export function getSortQueryField(sort: PageListUrlSortField): PageSortField { switch (sort) { diff --git a/src/permissionGroups/components/AssignMembersDialog/AssignMembersDialog.tsx b/src/permissionGroups/components/AssignMembersDialog/AssignMembersDialog.tsx index e436c633a..1cfb52bc7 100644 --- a/src/permissionGroups/components/AssignMembersDialog/AssignMembersDialog.tsx +++ b/src/permissionGroups/components/AssignMembersDialog/AssignMembersDialog.tsx @@ -1,3 +1,26 @@ +import BackButton from "@dashboard/components/BackButton"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { SearchStaffMembersQuery } from "@dashboard/graphql"; +import useElementScroll, { + isScrolledToBottom, +} from "@dashboard/hooks/useElementScroll"; +import useSearchQuery from "@dashboard/hooks/useSearchQuery"; +import { buttonMessages } from "@dashboard/intl"; +import { + getUserInitials, + getUserName, + renderCollection, +} from "@dashboard/misc"; +import { + DialogProps, + FetchMoreProps, + RelayToFlat, + SearchPageProps, +} from "@dashboard/types"; import { Checkbox, CircularProgress, @@ -10,26 +33,7 @@ import { TextField, Typography, } from "@material-ui/core"; -import BackButton from "@saleor/components/BackButton"; -import CardSpacer from "@saleor/components/CardSpacer"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { SearchStaffMembersQuery } from "@saleor/graphql"; -import useElementScroll, { - isScrolledToBottom, -} from "@saleor/hooks/useElementScroll"; -import useSearchQuery from "@saleor/hooks/useSearchQuery"; -import { buttonMessages } from "@saleor/intl"; import { ConfirmButtonTransitionState, makeStyles } from "@saleor/macaw-ui"; -import { getUserInitials, getUserName, renderCollection } from "@saleor/misc"; -import { - DialogProps, - FetchMoreProps, - RelayToFlat, - SearchPageProps, -} from "@saleor/types"; import clsx from "clsx"; import React from "react"; import InfiniteScroll from "react-infinite-scroll-component"; diff --git a/src/permissionGroups/components/MembersErrorDialog/MembersErrorDialog.tsx b/src/permissionGroups/components/MembersErrorDialog/MembersErrorDialog.tsx index 6102d5e62..172c3e2e3 100644 --- a/src/permissionGroups/components/MembersErrorDialog/MembersErrorDialog.tsx +++ b/src/permissionGroups/components/MembersErrorDialog/MembersErrorDialog.tsx @@ -1,5 +1,5 @@ +import ActionDialog from "@dashboard/components/ActionDialog"; import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/permissionGroups/components/PermissionGroupCreatePage/PermissionGroupCreatePage.stories.tsx b/src/permissionGroups/components/PermissionGroupCreatePage/PermissionGroupCreatePage.stories.tsx index 98266ef9d..41b9580a7 100644 --- a/src/permissionGroups/components/PermissionGroupCreatePage/PermissionGroupCreatePage.stories.tsx +++ b/src/permissionGroups/components/PermissionGroupCreatePage/PermissionGroupCreatePage.stories.tsx @@ -1,5 +1,5 @@ -import { permissions } from "@saleor/fixtures"; -import Decorator from "@saleor/storybook/Decorator"; +import { permissions } from "@dashboard/fixtures"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/permissionGroups/components/PermissionGroupCreatePage/PermissionGroupCreatePage.tsx b/src/permissionGroups/components/PermissionGroupCreatePage/PermissionGroupCreatePage.tsx index 258b8bfaf..854e990a6 100644 --- a/src/permissionGroups/components/PermissionGroupCreatePage/PermissionGroupCreatePage.tsx +++ b/src/permissionGroups/components/PermissionGroupCreatePage/PermissionGroupCreatePage.tsx @@ -1,17 +1,20 @@ -import AccountPermissions from "@saleor/components/AccountPermissions"; -import { Backlink } from "@saleor/components/Backlink"; -import Container from "@saleor/components/Container"; -import Form from "@saleor/components/Form"; -import Grid from "@saleor/components/Grid"; -import Savebar from "@saleor/components/Savebar"; -import { PermissionEnum, PermissionGroupErrorFragment } from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { sectionNames } from "@saleor/intl"; +import AccountPermissions from "@dashboard/components/AccountPermissions"; +import { Backlink } from "@dashboard/components/Backlink"; +import Container from "@dashboard/components/Container"; +import Form from "@dashboard/components/Form"; +import Grid from "@dashboard/components/Grid"; +import Savebar from "@dashboard/components/Savebar"; +import { + PermissionEnum, + PermissionGroupErrorFragment, +} from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { sectionNames } from "@dashboard/intl"; +import { permissionGroupListUrl } from "@dashboard/permissionGroups/urls"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getPermissionGroupErrorMessage from "@dashboard/utils/errors/permissionGroups"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { permissionGroupListUrl } from "@saleor/permissionGroups/urls"; -import { getFormErrors } from "@saleor/utils/errors"; -import getPermissionGroupErrorMessage from "@saleor/utils/errors/permissionGroups"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/permissionGroups/components/PermissionGroupDeleteDialog/PermissionGroupDeleteDialog.tsx b/src/permissionGroups/components/PermissionGroupDeleteDialog/PermissionGroupDeleteDialog.tsx index 10d26c681..37a8a1a70 100644 --- a/src/permissionGroups/components/PermissionGroupDeleteDialog/PermissionGroupDeleteDialog.tsx +++ b/src/permissionGroups/components/PermissionGroupDeleteDialog/PermissionGroupDeleteDialog.tsx @@ -1,11 +1,11 @@ -import { DialogContentText, Typography } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; +import ActionDialog from "@dashboard/components/ActionDialog"; import { PermissionGroupErrorCode, PermissionGroupErrorFragment, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; +import getPermissionGroupErrorMessage from "@dashboard/utils/errors/permissionGroups"; +import { DialogContentText, Typography } from "@material-ui/core"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import getPermissionGroupErrorMessage from "@saleor/utils/errors/permissionGroups"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/permissionGroups/components/PermissionGroupDetailsPage/PermissionGroupDetailsPage.stories.tsx b/src/permissionGroups/components/PermissionGroupDetailsPage/PermissionGroupDetailsPage.stories.tsx index 13a46b9c7..3fef3f2f9 100644 --- a/src/permissionGroups/components/PermissionGroupDetailsPage/PermissionGroupDetailsPage.stories.tsx +++ b/src/permissionGroups/components/PermissionGroupDetailsPage/PermissionGroupDetailsPage.stories.tsx @@ -1,5 +1,5 @@ -import { permissions } from "@saleor/fixtures"; -import Decorator from "@saleor/storybook/Decorator"; +import { permissions } from "@dashboard/fixtures"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/permissionGroups/components/PermissionGroupDetailsPage/PermissionGroupDetailsPage.tsx b/src/permissionGroups/components/PermissionGroupDetailsPage/PermissionGroupDetailsPage.tsx index e4faa06cd..1394792e4 100644 --- a/src/permissionGroups/components/PermissionGroupDetailsPage/PermissionGroupDetailsPage.tsx +++ b/src/permissionGroups/components/PermissionGroupDetailsPage/PermissionGroupDetailsPage.tsx @@ -1,32 +1,32 @@ -import AccountPermissions from "@saleor/components/AccountPermissions"; -import { Backlink } from "@saleor/components/Backlink"; -import Container from "@saleor/components/Container"; -import Form from "@saleor/components/Form"; -import FormSpacer from "@saleor/components/FormSpacer"; -import Grid from "@saleor/components/Grid"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; +import AccountPermissions from "@dashboard/components/AccountPermissions"; +import { Backlink } from "@dashboard/components/Backlink"; +import Container from "@dashboard/components/Container"; +import Form from "@dashboard/components/Form"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import Grid from "@dashboard/components/Grid"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; import { PermissionEnum, PermissionGroupDetailsFragment, PermissionGroupErrorFragment, UserPermissionFragment, -} from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { sectionNames } from "@saleor/intl"; -import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; +} from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { sectionNames } from "@dashboard/intl"; import { MembersListUrlSortField, permissionGroupListUrl, -} from "@saleor/permissionGroups/urls"; +} from "@dashboard/permissionGroups/urls"; import { extractPermissionCodes, isGroupFullAccess, -} from "@saleor/permissionGroups/utils"; -import { ListActions, SortPage } from "@saleor/types"; -import { getFormErrors } from "@saleor/utils/errors"; -import getPermissionGroupErrorMessage from "@saleor/utils/errors/permissionGroups"; +} from "@dashboard/permissionGroups/utils"; +import { ListActions, SortPage } from "@dashboard/types"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getPermissionGroupErrorMessage from "@dashboard/utils/errors/permissionGroups"; +import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/permissionGroups/components/PermissionGroupInfo/PermissionGroupInfo.tsx b/src/permissionGroups/components/PermissionGroupInfo/PermissionGroupInfo.tsx index bc493c1d6..f27895221 100644 --- a/src/permissionGroups/components/PermissionGroupInfo/PermissionGroupInfo.tsx +++ b/src/permissionGroups/components/PermissionGroupInfo/PermissionGroupInfo.tsx @@ -1,10 +1,10 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import { PermissionGroupErrorFragment } from "@dashboard/graphql"; +import { FormChange } from "@dashboard/hooks/useForm"; +import { commonMessages } from "@dashboard/intl"; +import { getFieldError, getFormErrors } from "@dashboard/utils/errors"; +import getPermissionGroupErrorMessage from "@dashboard/utils/errors/permissionGroups"; import { Card, CardContent, TextField } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import { PermissionGroupErrorFragment } from "@saleor/graphql"; -import { FormChange } from "@saleor/hooks/useForm"; -import { commonMessages } from "@saleor/intl"; -import { getFieldError, getFormErrors } from "@saleor/utils/errors"; -import getPermissionGroupErrorMessage from "@saleor/utils/errors/permissionGroups"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/permissionGroups/components/PermissionGroupList/PermissionGroupList.tsx b/src/permissionGroups/components/PermissionGroupList/PermissionGroupList.tsx index a92832627..d1b5a26ce 100644 --- a/src/permissionGroups/components/PermissionGroupList/PermissionGroupList.tsx +++ b/src/permissionGroups/components/PermissionGroupList/PermissionGroupList.tsx @@ -1,24 +1,24 @@ +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import { TableButtonWrapper } from "@dashboard/components/TableButtonWrapper/TableButtonWrapper"; +import TableCellHeader from "@dashboard/components/TableCellHeader"; +import { TablePaginationWithContext } from "@dashboard/components/TablePagination"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { PermissionGroupFragment } from "@dashboard/graphql"; +import { maybe, renderCollection, stopPropagation } from "@dashboard/misc"; +import { + permissionGroupDetailsUrl, + PermissionGroupListUrlSortField, +} from "@dashboard/permissionGroups/urls"; +import { ListProps, SortPage } from "@dashboard/types"; +import { getArrowDirection } from "@dashboard/utils/sort"; import { TableBody, TableCell, TableFooter, TableHead, } from "@material-ui/core"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import { TableButtonWrapper } from "@saleor/components/TableButtonWrapper/TableButtonWrapper"; -import TableCellHeader from "@saleor/components/TableCellHeader"; -import { TablePaginationWithContext } from "@saleor/components/TablePagination"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { PermissionGroupFragment } from "@saleor/graphql"; import { DeleteIcon, IconButton, makeStyles } from "@saleor/macaw-ui"; -import { maybe, renderCollection, stopPropagation } from "@saleor/misc"; -import { - permissionGroupDetailsUrl, - PermissionGroupListUrlSortField, -} from "@saleor/permissionGroups/urls"; -import { ListProps, SortPage } from "@saleor/types"; -import { getArrowDirection } from "@saleor/utils/sort"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/permissionGroups/components/PermissionGroupListPage/PermissionGroupListPage.stories.tsx b/src/permissionGroups/components/PermissionGroupListPage/PermissionGroupListPage.stories.tsx index 65c7445ea..402e5e650 100644 --- a/src/permissionGroups/components/PermissionGroupListPage/PermissionGroupListPage.stories.tsx +++ b/src/permissionGroups/components/PermissionGroupListPage/PermissionGroupListPage.stories.tsx @@ -2,9 +2,9 @@ import { listActionsProps, pageListProps, sortPageProps, -} from "@saleor/fixtures"; -import Decorator from "@saleor/storybook/Decorator"; -import { PaginatorContextDecorator } from "@saleor/storybook/PaginatorContextDecorator"; +} from "@dashboard/fixtures"; +import Decorator from "@dashboard/storybook/Decorator"; +import { PaginatorContextDecorator } from "@dashboard/storybook/PaginatorContextDecorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/permissionGroups/components/PermissionGroupListPage/PermissionGroupListPage.tsx b/src/permissionGroups/components/PermissionGroupListPage/PermissionGroupListPage.tsx index 02006129e..dbe6153e1 100644 --- a/src/permissionGroups/components/PermissionGroupListPage/PermissionGroupListPage.tsx +++ b/src/permissionGroups/components/PermissionGroupListPage/PermissionGroupListPage.tsx @@ -1,11 +1,11 @@ +import { Backlink } from "@dashboard/components/Backlink"; +import { Button } from "@dashboard/components/Button"; +import Container from "@dashboard/components/Container"; +import PageHeader from "@dashboard/components/PageHeader"; +import { configurationMenuUrl } from "@dashboard/configuration"; +import { PermissionGroupFragment } from "@dashboard/graphql"; +import { sectionNames } from "@dashboard/intl"; import { Card } from "@material-ui/core"; -import { Backlink } from "@saleor/components/Backlink"; -import { Button } from "@saleor/components/Button"; -import Container from "@saleor/components/Container"; -import PageHeader from "@saleor/components/PageHeader"; -import { configurationMenuUrl } from "@saleor/configuration"; -import { PermissionGroupFragment } from "@saleor/graphql"; -import { sectionNames } from "@saleor/intl"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/permissionGroups/components/PermissionGroupMemberList/PermissionGroupMemberList.tsx b/src/permissionGroups/components/PermissionGroupMemberList/PermissionGroupMemberList.tsx index 27dc04c86..c776136c2 100644 --- a/src/permissionGroups/components/PermissionGroupMemberList/PermissionGroupMemberList.tsx +++ b/src/permissionGroups/components/PermissionGroupMemberList/PermissionGroupMemberList.tsx @@ -1,3 +1,22 @@ +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import Checkbox from "@dashboard/components/Checkbox"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableCellHeader from "@dashboard/components/TableCellHeader"; +import TableHead from "@dashboard/components/TableHead"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { PermissionGroupMemberFragment } from "@dashboard/graphql"; +import { + getUserInitials, + getUserName, + renderCollection, + stopPropagation, +} from "@dashboard/misc"; +import { sortMembers } from "@dashboard/permissionGroups/sort"; +import { MembersListUrlSortField } from "@dashboard/permissionGroups/urls"; +import { ListActions, SortPage } from "@dashboard/types"; +import { getArrowDirection } from "@dashboard/utils/sort"; import { Card, CardContent, @@ -5,26 +24,7 @@ import { TableCell, Typography, } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import Checkbox from "@saleor/components/Checkbox"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableCellHeader from "@saleor/components/TableCellHeader"; -import TableHead from "@saleor/components/TableHead"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { PermissionGroupMemberFragment } from "@saleor/graphql"; import { DeleteIcon, IconButton, makeStyles } from "@saleor/macaw-ui"; -import { - getUserInitials, - getUserName, - renderCollection, - stopPropagation, -} from "@saleor/misc"; -import { sortMembers } from "@saleor/permissionGroups/sort"; -import { MembersListUrlSortField } from "@saleor/permissionGroups/urls"; -import { ListActions, SortPage } from "@saleor/types"; -import { getArrowDirection } from "@saleor/utils/sort"; import clsx from "clsx"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/permissionGroups/components/UnassignMembersDialog/UnassignMembersDialog.tsx b/src/permissionGroups/components/UnassignMembersDialog/UnassignMembersDialog.tsx index 6278378c0..310a887db 100644 --- a/src/permissionGroups/components/UnassignMembersDialog/UnassignMembersDialog.tsx +++ b/src/permissionGroups/components/UnassignMembersDialog/UnassignMembersDialog.tsx @@ -1,5 +1,5 @@ +import ActionDialog from "@dashboard/components/ActionDialog"; import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/permissionGroups/fixtures.ts b/src/permissionGroups/fixtures.ts index 98a031c14..e91754e0c 100644 --- a/src/permissionGroups/fixtures.ts +++ b/src/permissionGroups/fixtures.ts @@ -7,8 +7,8 @@ import { PermissionGroupFragment, SearchStaffMembersQuery, StaffMemberDetailsFragment, -} from "@saleor/graphql"; -import { RelayToFlat } from "@saleor/types"; +} from "@dashboard/graphql"; +import { RelayToFlat } from "@dashboard/types"; export const permissionGroups: PermissionGroupFragment[] = [ { diff --git a/src/permissionGroups/index.tsx b/src/permissionGroups/index.tsx index 4b965766a..5c2ad78aa 100644 --- a/src/permissionGroups/index.tsx +++ b/src/permissionGroups/index.tsx @@ -1,5 +1,5 @@ -import { sectionNames } from "@saleor/intl"; -import { asSortParams } from "@saleor/utils/sort"; +import { sectionNames } from "@dashboard/intl"; +import { asSortParams } from "@dashboard/utils/sort"; import { parse as parseQs } from "qs"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/permissionGroups/sort.ts b/src/permissionGroups/sort.ts index cc1f8b43a..1f4d98032 100644 --- a/src/permissionGroups/sort.ts +++ b/src/permissionGroups/sort.ts @@ -1,5 +1,5 @@ -import { StaffMemberFragment } from "@saleor/graphql"; -import { getUserName } from "@saleor/misc"; +import { StaffMemberFragment } from "@dashboard/graphql"; +import { getUserName } from "@dashboard/misc"; import { MembersListUrlSortField } from "./urls"; diff --git a/src/permissionGroups/urls.ts b/src/permissionGroups/urls.ts index e9a32f1fd..e47d5745e 100644 --- a/src/permissionGroups/urls.ts +++ b/src/permissionGroups/urls.ts @@ -5,8 +5,8 @@ import { SingleAction, Sort, TabActionDialog, -} from "@saleor/types"; -import { stringifyQs } from "@saleor/utils/urls"; +} from "@dashboard/types"; +import { stringifyQs } from "@dashboard/utils/urls"; import urlJoin from "url-join"; const permissionGroupSection = "/permission-groups/"; diff --git a/src/permissionGroups/utils.ts b/src/permissionGroups/utils.ts index 288689bff..7ea8d4a42 100644 --- a/src/permissionGroups/utils.ts +++ b/src/permissionGroups/utils.ts @@ -2,7 +2,7 @@ import { PermissionFragment, PermissionGroupDetailsFragment, UserFragment, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import difference from "lodash/difference"; import { PermissionGroupDetailsPageFormData } from "./components/PermissionGroupDetailsPage"; diff --git a/src/permissionGroups/views/PermissionGroupCreate/PermissionGroupCreate.tsx b/src/permissionGroups/views/PermissionGroupCreate/PermissionGroupCreate.tsx index 0a5a3944b..ec6733abd 100644 --- a/src/permissionGroups/views/PermissionGroupCreate/PermissionGroupCreate.tsx +++ b/src/permissionGroups/views/PermissionGroupCreate/PermissionGroupCreate.tsx @@ -1,11 +1,11 @@ -import { useUser } from "@saleor/auth"; -import { WindowTitle } from "@saleor/components/WindowTitle"; -import { usePermissionGroupCreateMutation } from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import useShop from "@saleor/hooks/useShop"; -import { extractMutationErrors } from "@saleor/misc"; -import { PermissionData } from "@saleor/permissionGroups/components/PermissionGroupDetailsPage"; +import { useUser } from "@dashboard/auth"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; +import { usePermissionGroupCreateMutation } from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import useShop from "@dashboard/hooks/useShop"; +import { extractMutationErrors } from "@dashboard/misc"; +import { PermissionData } from "@dashboard/permissionGroups/components/PermissionGroupDetailsPage"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/permissionGroups/views/PermissionGroupDetails/PermissionGroupDetails.tsx b/src/permissionGroups/views/PermissionGroupDetails/PermissionGroupDetails.tsx index d1a5ba99a..0e461689b 100644 --- a/src/permissionGroups/views/PermissionGroupDetails/PermissionGroupDetails.tsx +++ b/src/permissionGroups/views/PermissionGroupDetails/PermissionGroupDetails.tsx @@ -1,28 +1,28 @@ -import { useUser } from "@saleor/auth"; -import { Button } from "@saleor/components/Button"; -import { DEFAULT_INITIAL_SEARCH_DATA } from "@saleor/config"; +import { useUser } from "@dashboard/auth"; +import { Button } from "@dashboard/components/Button"; +import { DEFAULT_INITIAL_SEARCH_DATA } from "@dashboard/config"; import { usePermissionGroupDetailsQuery, usePermissionGroupUpdateMutation, -} from "@saleor/graphql"; -import useBulkActions from "@saleor/hooks/useBulkActions"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import useShop from "@saleor/hooks/useShop"; -import useStateFromProps from "@saleor/hooks/useStateFromProps"; -import { commonMessages } from "@saleor/intl"; -import { extractMutationErrors } from "@saleor/misc"; -import MembersErrorDialog from "@saleor/permissionGroups/components/MembersErrorDialog"; +} from "@dashboard/graphql"; +import useBulkActions from "@dashboard/hooks/useBulkActions"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import useShop from "@dashboard/hooks/useShop"; +import useStateFromProps from "@dashboard/hooks/useStateFromProps"; +import { commonMessages } from "@dashboard/intl"; +import { extractMutationErrors } from "@dashboard/misc"; +import MembersErrorDialog from "@dashboard/permissionGroups/components/MembersErrorDialog"; import { arePermissionsExceeded, permissionsDiff, usersDiff, -} from "@saleor/permissionGroups/utils"; -import useStaffMemberSearch from "@saleor/searches/useStaffMemberSearch"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createSortHandler from "@saleor/utils/handlers/sortHandler"; -import { mapEdgesToItems } from "@saleor/utils/maps"; -import { getSortParams } from "@saleor/utils/sort"; +} from "@dashboard/permissionGroups/utils"; +import useStaffMemberSearch from "@dashboard/searches/useStaffMemberSearch"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createSortHandler from "@dashboard/utils/handlers/sortHandler"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; +import { getSortParams } from "@dashboard/utils/sort"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/permissionGroups/views/PermissionGroupList/PermissionGroupList.tsx b/src/permissionGroups/views/PermissionGroupList/PermissionGroupList.tsx index c6d5e7b7a..e1a2af796 100644 --- a/src/permissionGroups/views/PermissionGroupList/PermissionGroupList.tsx +++ b/src/permissionGroups/views/PermissionGroupList/PermissionGroupList.tsx @@ -2,22 +2,22 @@ import { PermissionGroupErrorFragment, usePermissionGroupDeleteMutation, usePermissionGroupListQuery, -} from "@saleor/graphql"; -import useListSettings from "@saleor/hooks/useListSettings"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; +} from "@dashboard/graphql"; +import useListSettings from "@dashboard/hooks/useListSettings"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { usePaginationReset } from "@dashboard/hooks/usePaginationReset"; import usePaginator, { createPaginationState, PaginatorContext, -} from "@saleor/hooks/usePaginator"; -import { getStringOrPlaceholder } from "@saleor/misc"; -import PermissionGroupDeleteDialog from "@saleor/permissionGroups/components/PermissionGroupDeleteDialog"; -import { ListViews } from "@saleor/types"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createSortHandler from "@saleor/utils/handlers/sortHandler"; -import { mapEdgesToItems } from "@saleor/utils/maps"; -import { getSortParams } from "@saleor/utils/sort"; +} from "@dashboard/hooks/usePaginator"; +import { getStringOrPlaceholder } from "@dashboard/misc"; +import PermissionGroupDeleteDialog from "@dashboard/permissionGroups/components/PermissionGroupDeleteDialog"; +import { ListViews } from "@dashboard/types"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createSortHandler from "@dashboard/utils/handlers/sortHandler"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; +import { getSortParams } from "@dashboard/utils/sort"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/permissionGroups/views/PermissionGroupList/sort.ts b/src/permissionGroups/views/PermissionGroupList/sort.ts index 83f1aa5e9..bafec9d00 100644 --- a/src/permissionGroups/views/PermissionGroupList/sort.ts +++ b/src/permissionGroups/views/PermissionGroupList/sort.ts @@ -1,6 +1,6 @@ -import { PermissionGroupSortField } from "@saleor/graphql"; -import { PermissionGroupListUrlSortField } from "@saleor/permissionGroups/urls"; -import { createGetSortQueryVariables } from "@saleor/utils/sort"; +import { PermissionGroupSortField } from "@dashboard/graphql"; +import { PermissionGroupListUrlSortField } from "@dashboard/permissionGroups/urls"; +import { createGetSortQueryVariables } from "@dashboard/utils/sort"; export function getSortQueryField( sort: PermissionGroupListUrlSortField, diff --git a/src/plugins/components/PluginAuthorization/PluginAuthorization.tsx b/src/plugins/components/PluginAuthorization/PluginAuthorization.tsx index 9e82ec805..cbc9b3ecc 100644 --- a/src/plugins/components/PluginAuthorization/PluginAuthorization.tsx +++ b/src/plugins/components/PluginAuthorization/PluginAuthorization.tsx @@ -1,14 +1,14 @@ -import { Card, CardContent, Typography } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import Hr from "@saleor/components/Hr"; +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import Hr from "@dashboard/components/Hr"; import { ConfigurationItemFragment, ConfigurationTypeFieldEnum, -} from "@saleor/graphql"; -import { buttonMessages } from "@saleor/intl"; +} from "@dashboard/graphql"; +import { buttonMessages } from "@dashboard/intl"; +import { isSecretField } from "@dashboard/plugins/utils"; +import { Card, CardContent, Typography } from "@material-ui/core"; import { makeStyles } from "@saleor/macaw-ui"; -import { isSecretField } from "@saleor/plugins/utils"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/plugins/components/PluginDetailsChannelsCard/PluginDetailsChannelsCard.tsx b/src/plugins/components/PluginDetailsChannelsCard/PluginDetailsChannelsCard.tsx index 2c69d2b29..03feeebae 100644 --- a/src/plugins/components/PluginDetailsChannelsCard/PluginDetailsChannelsCard.tsx +++ b/src/plugins/components/PluginDetailsChannelsCard/PluginDetailsChannelsCard.tsx @@ -1,6 +1,6 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import { sectionNames } from "@dashboard/intl"; import { Card } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import { sectionNames } from "@saleor/intl"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/plugins/components/PluginDetailsChannelsCard/PluginDetailsChannelsCardContent.tsx b/src/plugins/components/PluginDetailsChannelsCard/PluginDetailsChannelsCardContent.tsx index 5abb525ee..ba6df4c3c 100644 --- a/src/plugins/components/PluginDetailsChannelsCard/PluginDetailsChannelsCardContent.tsx +++ b/src/plugins/components/PluginDetailsChannelsCard/PluginDetailsChannelsCardContent.tsx @@ -1,9 +1,9 @@ +import CollectionWithDividers from "@dashboard/components/CollectionWithDividers"; +import Skeleton from "@dashboard/components/Skeleton"; +import { PluginsDetailsFragment } from "@dashboard/graphql"; +import { isPluginGlobal } from "@dashboard/plugins/views/utils"; import { CardContent, Typography } from "@material-ui/core"; -import CollectionWithDividers from "@saleor/components/CollectionWithDividers"; -import Skeleton from "@saleor/components/Skeleton"; -import { PluginsDetailsFragment } from "@saleor/graphql"; import { makeStyles } from "@saleor/macaw-ui"; -import { isPluginGlobal } from "@saleor/plugins/views/utils"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/plugins/components/PluginInfo/PluginInfo.tsx b/src/plugins/components/PluginInfo/PluginInfo.tsx index b03cf431b..f8c4579e1 100644 --- a/src/plugins/components/PluginInfo/PluginInfo.tsx +++ b/src/plugins/components/PluginInfo/PluginInfo.tsx @@ -1,12 +1,12 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import ControlledCheckbox from "@dashboard/components/ControlledCheckbox"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import Hr from "@dashboard/components/Hr"; +import { PluginErrorCode, PluginErrorFragment } from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; +import getPluginErrorMessage from "@dashboard/utils/errors/plugins"; import { Card, CardContent, Typography } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; -import FormSpacer from "@saleor/components/FormSpacer"; -import Hr from "@saleor/components/Hr"; -import { PluginErrorCode, PluginErrorFragment } from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; import { makeStyles } from "@saleor/macaw-ui"; -import getPluginErrorMessage from "@saleor/utils/errors/plugins"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/plugins/components/PluginSecretFieldDialog/PluginSecretFieldDialog.tsx b/src/plugins/components/PluginSecretFieldDialog/PluginSecretFieldDialog.tsx index 8981e9f39..09dad0a8d 100644 --- a/src/plugins/components/PluginSecretFieldDialog/PluginSecretFieldDialog.tsx +++ b/src/plugins/components/PluginSecretFieldDialog/PluginSecretFieldDialog.tsx @@ -1,3 +1,14 @@ +import BackButton from "@dashboard/components/BackButton"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import Form from "@dashboard/components/Form"; +import Skeleton from "@dashboard/components/Skeleton"; +import { + ConfigurationItemFragment, + ConfigurationTypeFieldEnum, +} from "@dashboard/graphql"; +import { buttonMessages } from "@dashboard/intl"; +import { maybe } from "@dashboard/misc"; +import { DialogProps } from "@dashboard/types"; import { Dialog, DialogActions, @@ -5,18 +16,7 @@ import { DialogTitle, TextField, } from "@material-ui/core"; -import BackButton from "@saleor/components/BackButton"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import Form from "@saleor/components/Form"; -import Skeleton from "@saleor/components/Skeleton"; -import { - ConfigurationItemFragment, - ConfigurationTypeFieldEnum, -} from "@saleor/graphql"; -import { buttonMessages } from "@saleor/intl"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { maybe } from "@saleor/misc"; -import { DialogProps } from "@saleor/types"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/plugins/components/PluginSettings/PluginSettings.tsx b/src/plugins/components/PluginSettings/PluginSettings.tsx index fcebedfbf..076d4ceca 100644 --- a/src/plugins/components/PluginSettings/PluginSettings.tsx +++ b/src/plugins/components/PluginSettings/PluginSettings.tsx @@ -1,3 +1,11 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import ControlledSwitch from "@dashboard/components/ControlledSwitch"; +import { + ConfigurationItemFragment, + ConfigurationTypeFieldEnum, +} from "@dashboard/graphql"; +import { UserError } from "@dashboard/types"; +import { getFieldError } from "@dashboard/utils/errors"; import { Card, CardContent, @@ -6,14 +14,6 @@ import { Typography, } from "@material-ui/core"; import InfoIcon from "@material-ui/icons/Info"; -import CardTitle from "@saleor/components/CardTitle"; -import ControlledSwitch from "@saleor/components/ControlledSwitch"; -import { - ConfigurationItemFragment, - ConfigurationTypeFieldEnum, -} from "@saleor/graphql"; -import { UserError } from "@saleor/types"; -import { getFieldError } from "@saleor/utils/errors"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/plugins/components/PluginsDetailsPage/PluginDetailsPage.stories.tsx b/src/plugins/components/PluginsDetailsPage/PluginDetailsPage.stories.tsx index 048a2761d..e5839b5e3 100644 --- a/src/plugins/components/PluginsDetailsPage/PluginDetailsPage.stories.tsx +++ b/src/plugins/components/PluginsDetailsPage/PluginDetailsPage.stories.tsx @@ -1,5 +1,5 @@ -import { PluginErrorCode } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; +import { PluginErrorCode } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/plugins/components/PluginsDetailsPage/PluginsDetailsPage.tsx b/src/plugins/components/PluginsDetailsPage/PluginsDetailsPage.tsx index 9fbf6cb24..bb19ad16e 100644 --- a/src/plugins/components/PluginsDetailsPage/PluginsDetailsPage.tsx +++ b/src/plugins/components/PluginsDetailsPage/PluginsDetailsPage.tsx @@ -1,23 +1,23 @@ -import { Backlink } from "@saleor/components/Backlink"; -import CardSpacer from "@saleor/components/CardSpacer"; -import Container from "@saleor/components/Container"; -import Form from "@saleor/components/Form"; -import Grid from "@saleor/components/Grid"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import Container from "@dashboard/components/Container"; +import Form from "@dashboard/components/Form"; +import Grid from "@dashboard/components/Grid"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; import { ConfigurationItemInput, PluginConfigurationExtendedFragment, PluginErrorFragment, PluginsDetailsFragment, -} from "@saleor/graphql"; -import { ChangeEvent, SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { sectionNames } from "@saleor/intl"; +} from "@dashboard/graphql"; +import { ChangeEvent, SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { sectionNames } from "@dashboard/intl"; +import { getStringOrPlaceholder } from "@dashboard/misc"; +import { pluginListUrl } from "@dashboard/plugins/urls"; +import { isSecretField } from "@dashboard/plugins/utils"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { getStringOrPlaceholder } from "@saleor/misc"; -import { pluginListUrl } from "@saleor/plugins/urls"; -import { isSecretField } from "@saleor/plugins/utils"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/plugins/components/PluginsList/PluginAvailabilityStatus.tsx b/src/plugins/components/PluginsList/PluginAvailabilityStatus.tsx index 0a473eedd..314a8ec06 100644 --- a/src/plugins/components/PluginsList/PluginAvailabilityStatus.tsx +++ b/src/plugins/components/PluginsList/PluginAvailabilityStatus.tsx @@ -1,6 +1,6 @@ -import { PluginBaseFragment } from "@saleor/graphql"; +import { PluginBaseFragment } from "@dashboard/graphql"; +import { isPluginGlobal } from "@dashboard/plugins/views/utils"; import { Pill } from "@saleor/macaw-ui"; -import { isPluginGlobal } from "@saleor/plugins/views/utils"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/plugins/components/PluginsList/PluginAvailabilityStatusPopup/GlobalConfigPluginPopupBody.tsx b/src/plugins/components/PluginsList/PluginAvailabilityStatusPopup/GlobalConfigPluginPopupBody.tsx index 74985c610..71637b5bd 100644 --- a/src/plugins/components/PluginsList/PluginAvailabilityStatusPopup/GlobalConfigPluginPopupBody.tsx +++ b/src/plugins/components/PluginsList/PluginAvailabilityStatusPopup/GlobalConfigPluginPopupBody.tsx @@ -1,6 +1,6 @@ +import CardSpacer from "@dashboard/components/CardSpacer"; +import { PluginBaseFragment } from "@dashboard/graphql"; import { CardContent, Typography } from "@material-ui/core"; -import CardSpacer from "@saleor/components/CardSpacer"; -import { PluginBaseFragment } from "@saleor/graphql"; import { Pill } from "@saleor/macaw-ui"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/plugins/components/PluginsList/PluginAvailabilityStatusPopup/PluginAvailabilityStatusPopup.tsx b/src/plugins/components/PluginsList/PluginAvailabilityStatusPopup/PluginAvailabilityStatusPopup.tsx index f1965c9f0..cbfdc9dca 100644 --- a/src/plugins/components/PluginsList/PluginAvailabilityStatusPopup/PluginAvailabilityStatusPopup.tsx +++ b/src/plugins/components/PluginsList/PluginAvailabilityStatusPopup/PluginAvailabilityStatusPopup.tsx @@ -1,8 +1,8 @@ +import ChannelsAvailabilityMenuContent from "@dashboard/components/ChannelsAvailabilityMenuContent"; +import { PluginBaseFragment } from "@dashboard/graphql"; +import { isPluginGlobal } from "@dashboard/plugins/views/utils"; import { Card, Popper } from "@material-ui/core"; -import ChannelsAvailabilityMenuContent from "@saleor/components/ChannelsAvailabilityMenuContent"; -import { PluginBaseFragment } from "@saleor/graphql"; import { makeStyles } from "@saleor/macaw-ui"; -import { isPluginGlobal } from "@saleor/plugins/views/utils"; import React from "react"; import { mapPluginsToPills } from "../utils"; diff --git a/src/plugins/components/PluginsList/PluginChannelAvailabilityCell.tsx b/src/plugins/components/PluginsList/PluginChannelAvailabilityCell.tsx index dfa9695d3..f17b30bd9 100644 --- a/src/plugins/components/PluginsList/PluginChannelAvailabilityCell.tsx +++ b/src/plugins/components/PluginsList/PluginChannelAvailabilityCell.tsx @@ -1,6 +1,6 @@ +import Skeleton from "@dashboard/components/Skeleton"; +import { PluginBaseFragment } from "@dashboard/graphql"; import { TableCell } from "@material-ui/core"; -import Skeleton from "@saleor/components/Skeleton"; -import { PluginBaseFragment } from "@saleor/graphql"; import React, { useRef, useState } from "react"; import PluginAvailabilityStatus from "./PluginAvailabilityStatus"; diff --git a/src/plugins/components/PluginsList/PluginChannelConfigurationCell.tsx b/src/plugins/components/PluginsList/PluginChannelConfigurationCell.tsx index f821dfaf4..c0241c730 100644 --- a/src/plugins/components/PluginsList/PluginChannelConfigurationCell.tsx +++ b/src/plugins/components/PluginsList/PluginChannelConfigurationCell.tsx @@ -1,6 +1,6 @@ +import { PluginBaseFragment } from "@dashboard/graphql"; +import { isPluginGlobal } from "@dashboard/plugins/views/utils"; import { TableCell } from "@material-ui/core"; -import { PluginBaseFragment } from "@saleor/graphql"; -import { isPluginGlobal } from "@saleor/plugins/views/utils"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/plugins/components/PluginsList/PluginListTableHead.tsx b/src/plugins/components/PluginsList/PluginListTableHead.tsx index 09dd6d142..d0a18b8b5 100644 --- a/src/plugins/components/PluginsList/PluginListTableHead.tsx +++ b/src/plugins/components/PluginsList/PluginListTableHead.tsx @@ -1,8 +1,8 @@ +import TableCellHeader from "@dashboard/components/TableCellHeader"; +import { PluginListUrlSortField } from "@dashboard/plugins/urls"; +import { SortPage } from "@dashboard/types"; +import { getArrowDirection } from "@dashboard/utils/sort"; import { TableHead } from "@material-ui/core"; -import TableCellHeader from "@saleor/components/TableCellHeader"; -import { PluginListUrlSortField } from "@saleor/plugins/urls"; -import { SortPage } from "@saleor/types"; -import { getArrowDirection } from "@saleor/utils/sort"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/plugins/components/PluginsList/PluginsList.tsx b/src/plugins/components/PluginsList/PluginsList.tsx index 60f820532..7c3e56d7f 100644 --- a/src/plugins/components/PluginsList/PluginsList.tsx +++ b/src/plugins/components/PluginsList/PluginsList.tsx @@ -1,14 +1,14 @@ +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import { TablePaginationWithContext } from "@dashboard/components/TablePagination"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { PluginBaseFragment } from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { renderCollection } from "@dashboard/misc"; +import { PluginListUrlSortField, pluginUrl } from "@dashboard/plugins/urls"; +import { ListProps, SortPage } from "@dashboard/types"; import { TableBody, TableCell, TableFooter } from "@material-ui/core"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import { TablePaginationWithContext } from "@saleor/components/TablePagination"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { PluginBaseFragment } from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; import { EditIcon, makeStyles } from "@saleor/macaw-ui"; -import { renderCollection } from "@saleor/misc"; -import { PluginListUrlSortField, pluginUrl } from "@saleor/plugins/urls"; -import { ListProps, SortPage } from "@saleor/types"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/plugins/components/PluginsList/utils.ts b/src/plugins/components/PluginsList/utils.ts index 96653f011..78ba8ddb4 100644 --- a/src/plugins/components/PluginsList/utils.ts +++ b/src/plugins/components/PluginsList/utils.ts @@ -1,5 +1,5 @@ -import { Pill } from "@saleor/components/ChannelsAvailabilityMenuContent"; -import { PluginConfigurationBaseFragment } from "@saleor/graphql"; +import { Pill } from "@dashboard/components/ChannelsAvailabilityMenuContent"; +import { PluginConfigurationBaseFragment } from "@dashboard/graphql"; import { PillColor } from "@saleor/macaw-ui"; import { MessageDescriptor } from "react-intl"; diff --git a/src/plugins/components/PluginsListPage/PluginsListPage.stories.tsx b/src/plugins/components/PluginsListPage/PluginsListPage.stories.tsx index 02944eee9..60a83be24 100644 --- a/src/plugins/components/PluginsListPage/PluginsListPage.stories.tsx +++ b/src/plugins/components/PluginsListPage/PluginsListPage.stories.tsx @@ -2,12 +2,12 @@ import { filterPageProps, pageListProps, sortPageProps, -} from "@saleor/fixtures"; -import { PluginConfigurationType } from "@saleor/graphql"; -import { pluginList } from "@saleor/plugins/fixtures"; -import { PluginListUrlSortField } from "@saleor/plugins/urls"; -import Decorator from "@saleor/storybook/Decorator"; -import { PaginatorContextDecorator } from "@saleor/storybook/PaginatorContextDecorator"; +} from "@dashboard/fixtures"; +import { PluginConfigurationType } from "@dashboard/graphql"; +import { pluginList } from "@dashboard/plugins/fixtures"; +import { PluginListUrlSortField } from "@dashboard/plugins/urls"; +import Decorator from "@dashboard/storybook/Decorator"; +import { PaginatorContextDecorator } from "@dashboard/storybook/PaginatorContextDecorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/plugins/components/PluginsListPage/PluginsListPage.tsx b/src/plugins/components/PluginsListPage/PluginsListPage.tsx index e23e70df6..19ef07d8b 100644 --- a/src/plugins/components/PluginsListPage/PluginsListPage.tsx +++ b/src/plugins/components/PluginsListPage/PluginsListPage.tsx @@ -1,18 +1,18 @@ -import { Card } from "@material-ui/core"; -import { Backlink } from "@saleor/components/Backlink"; -import Container from "@saleor/components/Container"; -import FilterBar from "@saleor/components/FilterBar"; -import PageHeader from "@saleor/components/PageHeader"; -import { configurationMenuUrl } from "@saleor/configuration"; -import { PluginBaseFragment } from "@saleor/graphql"; -import { sectionNames } from "@saleor/intl"; -import { PluginListUrlSortField } from "@saleor/plugins/urls"; +import { Backlink } from "@dashboard/components/Backlink"; +import Container from "@dashboard/components/Container"; +import FilterBar from "@dashboard/components/FilterBar"; +import PageHeader from "@dashboard/components/PageHeader"; +import { configurationMenuUrl } from "@dashboard/configuration"; +import { PluginBaseFragment } from "@dashboard/graphql"; +import { sectionNames } from "@dashboard/intl"; +import { PluginListUrlSortField } from "@dashboard/plugins/urls"; import { FilterPageProps, PageListProps, SortPage, TabPageProps, -} from "@saleor/types"; +} from "@dashboard/types"; +import { Card } from "@material-ui/core"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/plugins/components/PluginsListPage/filters.ts b/src/plugins/components/PluginsListPage/filters.ts index 4eef0eb4e..02ea7aeae 100644 --- a/src/plugins/components/PluginsListPage/filters.ts +++ b/src/plugins/components/PluginsListPage/filters.ts @@ -1,12 +1,12 @@ -import { IFilter } from "@saleor/components/Filter"; -import { PluginConfigurationType } from "@saleor/graphql"; -import { sectionNames } from "@saleor/intl"; -import { AutocompleteFilterOpts, FilterOpts } from "@saleor/types"; +import { IFilter } from "@dashboard/components/Filter"; +import { PluginConfigurationType } from "@dashboard/graphql"; +import { sectionNames } from "@dashboard/intl"; +import { AutocompleteFilterOpts, FilterOpts } from "@dashboard/types"; import { createAutocompleteField, createBooleanField, createOptionsField, -} from "@saleor/utils/filters/fields"; +} from "@dashboard/utils/filters/fields"; import { defineMessages, IntlShape } from "react-intl"; import { diff --git a/src/plugins/fixtures.ts b/src/plugins/fixtures.ts index 67fa26746..aa31678f8 100644 --- a/src/plugins/fixtures.ts +++ b/src/plugins/fixtures.ts @@ -2,7 +2,7 @@ import { ConfigurationTypeFieldEnum, PluginBaseFragment, PluginsDetailsFragment, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; export const pluginList: PluginBaseFragment[] = [ { diff --git a/src/plugins/index.tsx b/src/plugins/index.tsx index edb74a77f..13596b63a 100644 --- a/src/plugins/index.tsx +++ b/src/plugins/index.tsx @@ -1,5 +1,5 @@ -import { sectionNames } from "@saleor/intl"; -import { asSortParams } from "@saleor/utils/sort"; +import { sectionNames } from "@dashboard/intl"; +import { asSortParams } from "@dashboard/utils/sort"; import { parse as parseQs } from "qs"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/plugins/urls.ts b/src/plugins/urls.ts index 19b295f50..f6b844292 100644 --- a/src/plugins/urls.ts +++ b/src/plugins/urls.ts @@ -1,4 +1,4 @@ -import { stringifyQs } from "@saleor/utils/urls"; +import { stringifyQs } from "@dashboard/utils/urls"; import urlJoin from "url-join"; import { diff --git a/src/plugins/utils.ts b/src/plugins/utils.ts index 78e573db6..656e6a8e3 100644 --- a/src/plugins/utils.ts +++ b/src/plugins/utils.ts @@ -1,7 +1,7 @@ import { ConfigurationItemFragment, ConfigurationTypeFieldEnum, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; export function isSecretField( config: ConfigurationItemFragment[], diff --git a/src/plugins/views/PluginDetails.test.ts b/src/plugins/views/PluginDetails.test.ts index 4e902a3c8..47dfb6fc0 100644 --- a/src/plugins/views/PluginDetails.test.ts +++ b/src/plugins/views/PluginDetails.test.ts @@ -2,7 +2,7 @@ import { ConfigurationItemFragment, ConfigurationItemInput, ConfigurationTypeFieldEnum, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import { getConfigurationInput } from "./PluginsDetails"; diff --git a/src/plugins/views/PluginList/PluginList.tsx b/src/plugins/views/PluginList/PluginList.tsx index fcd921bc6..efd0042fc 100644 --- a/src/plugins/views/PluginList/PluginList.tsx +++ b/src/plugins/views/PluginList/PluginList.tsx @@ -1,23 +1,23 @@ -import DeleteFilterTabDialog from "@saleor/components/DeleteFilterTabDialog"; +import DeleteFilterTabDialog from "@dashboard/components/DeleteFilterTabDialog"; import SaveFilterTabDialog, { SaveFilterTabDialogFormData, -} from "@saleor/components/SaveFilterTabDialog"; -import { usePluginsQuery } from "@saleor/graphql"; -import { useChannelsSearchWithLoadMore } from "@saleor/hooks/useChannelsSearchWithLoadMore"; -import useListSettings from "@saleor/hooks/useListSettings"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; +} from "@dashboard/components/SaveFilterTabDialog"; +import { usePluginsQuery } from "@dashboard/graphql"; +import { useChannelsSearchWithLoadMore } from "@dashboard/hooks/useChannelsSearchWithLoadMore"; +import useListSettings from "@dashboard/hooks/useListSettings"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { usePaginationReset } from "@dashboard/hooks/usePaginationReset"; import usePaginator, { createPaginationState, PaginatorContext, -} from "@saleor/hooks/usePaginator"; -import { maybe } from "@saleor/misc"; -import { ListViews } from "@saleor/types"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createFilterHandlers from "@saleor/utils/handlers/filterHandlers"; -import createSortHandler from "@saleor/utils/handlers/sortHandler"; -import { mapEdgesToItems } from "@saleor/utils/maps"; -import { getSortParams } from "@saleor/utils/sort"; +} from "@dashboard/hooks/usePaginator"; +import { maybe } from "@dashboard/misc"; +import { ListViews } from "@dashboard/types"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createFilterHandlers from "@dashboard/utils/handlers/filterHandlers"; +import createSortHandler from "@dashboard/utils/handlers/sortHandler"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; +import { getSortParams } from "@dashboard/utils/sort"; import React from "react"; import PluginsListPage from "../../components/PluginsListPage/PluginsListPage"; diff --git a/src/plugins/views/PluginList/filters.test.ts b/src/plugins/views/PluginList/filters.test.ts index 423a4bc1c..41cb69f89 100644 --- a/src/plugins/views/PluginList/filters.test.ts +++ b/src/plugins/views/PluginList/filters.test.ts @@ -1,12 +1,12 @@ -import { FieldType } from "@saleor/components/Filter"; -import { PluginConfigurationType } from "@saleor/graphql"; +import { FieldType } from "@dashboard/components/Filter"; +import { PluginConfigurationType } from "@dashboard/graphql"; import { createFilterStructure, PluginFilterKeys, -} from "@saleor/plugins/components/PluginsListPage"; -import { PluginListUrlFilters } from "@saleor/plugins/urls"; -import { getFilterQueryParams } from "@saleor/utils/filters"; -import { stringifyQs } from "@saleor/utils/urls"; +} from "@dashboard/plugins/components/PluginsListPage"; +import { PluginListUrlFilters } from "@dashboard/plugins/urls"; +import { getFilterQueryParams } from "@dashboard/utils/filters"; +import { stringifyQs } from "@dashboard/utils/urls"; import { getExistingKeys } from "@test/filters"; import { config } from "@test/intl"; import { createIntl } from "react-intl"; diff --git a/src/plugins/views/PluginList/filters.ts b/src/plugins/views/PluginList/filters.ts index f2e8c5415..18b27b70d 100644 --- a/src/plugins/views/PluginList/filters.ts +++ b/src/plugins/views/PluginList/filters.ts @@ -1,12 +1,15 @@ -import { FilterElement, FilterElementRegular } from "@saleor/components/Filter"; -import { PluginConfigurationType, PluginFilterInput } from "@saleor/graphql"; -import { ChannelsWithLoadMoreProps } from "@saleor/hooks/useChannelsSearch"; -import { maybe, parseBoolean } from "@saleor/misc"; +import { + FilterElement, + FilterElementRegular, +} from "@dashboard/components/Filter"; +import { PluginConfigurationType, PluginFilterInput } from "@dashboard/graphql"; +import { ChannelsWithLoadMoreProps } from "@dashboard/hooks/useChannelsSearch"; +import { maybe, parseBoolean } from "@dashboard/misc"; import { PluginFilterKeys, PluginListFilterOpts, -} from "@saleor/plugins/components/PluginsListPage"; -import { mapNodeToChoice } from "@saleor/utils/maps"; +} from "@dashboard/plugins/components/PluginsListPage"; +import { mapNodeToChoice } from "@dashboard/utils/maps"; import { createFilterTabUtils, diff --git a/src/plugins/views/PluginList/sort.ts b/src/plugins/views/PluginList/sort.ts index 7eadc5098..0ef252d28 100644 --- a/src/plugins/views/PluginList/sort.ts +++ b/src/plugins/views/PluginList/sort.ts @@ -1,6 +1,6 @@ -import { PluginSortField } from "@saleor/graphql"; -import { PluginListUrlSortField } from "@saleor/plugins/urls"; -import { createGetSortQueryVariables } from "@saleor/utils/sort"; +import { PluginSortField } from "@dashboard/graphql"; +import { PluginListUrlSortField } from "@dashboard/plugins/urls"; +import { createGetSortQueryVariables } from "@dashboard/utils/sort"; export function getSortQueryField( sort: PluginListUrlSortField, diff --git a/src/plugins/views/PluginsDetails.tsx b/src/plugins/views/PluginsDetails.tsx index d0fde0b64..75df916fe 100644 --- a/src/plugins/views/PluginsDetails.tsx +++ b/src/plugins/views/PluginsDetails.tsx @@ -1,18 +1,18 @@ -import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; -import { WindowTitle } from "@saleor/components/WindowTitle"; +import ActionDialog from "@dashboard/components/ActionDialog"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; import { ConfigurationItemFragment, ConfigurationItemInput, usePluginQuery, usePluginUpdateMutation, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import useStateFromProps from "@saleor/hooks/useStateFromProps"; -import { commonMessages } from "@saleor/intl"; -import { extractMutationErrors } from "@saleor/misc"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import useStateFromProps from "@dashboard/hooks/useStateFromProps"; +import { commonMessages } from "@dashboard/intl"; +import { extractMutationErrors } from "@dashboard/misc"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import { DialogContentText } from "@material-ui/core"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/plugins/views/utils.ts b/src/plugins/views/utils.ts index df0cad9f7..d6b983a84 100644 --- a/src/plugins/views/utils.ts +++ b/src/plugins/views/utils.ts @@ -1,4 +1,4 @@ -import { PluginConfigurationBaseFragment } from "@saleor/graphql"; +import { PluginConfigurationBaseFragment } from "@dashboard/graphql"; export const isPluginGlobal = ( globalConfiguration: PluginConfigurationBaseFragment, diff --git a/src/productTypes/components/ProductTypeAttributes/ProductTypeAttributes.tsx b/src/productTypes/components/ProductTypeAttributes/ProductTypeAttributes.tsx index 5fca83cc8..dbe49b399 100644 --- a/src/productTypes/components/ProductTypeAttributes/ProductTypeAttributes.tsx +++ b/src/productTypes/components/ProductTypeAttributes/ProductTypeAttributes.tsx @@ -1,21 +1,21 @@ -import { Card, TableCell } from "@material-ui/core"; -import { attributeUrl } from "@saleor/attributes/urls"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import Checkbox from "@saleor/components/Checkbox"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; +import { attributeUrl } from "@dashboard/attributes/urls"; +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import Checkbox from "@dashboard/components/Checkbox"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; import { SortableTableBody, SortableTableRow, -} from "@saleor/components/SortableTable"; -import { TableButtonWrapper } from "@saleor/components/TableButtonWrapper/TableButtonWrapper"; -import TableHead from "@saleor/components/TableHead"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { AttributeFragment, ProductAttributeType } from "@saleor/graphql"; +} from "@dashboard/components/SortableTable"; +import { TableButtonWrapper } from "@dashboard/components/TableButtonWrapper/TableButtonWrapper"; +import TableHead from "@dashboard/components/TableHead"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { AttributeFragment, ProductAttributeType } from "@dashboard/graphql"; +import { maybe, renderCollection } from "@dashboard/misc"; +import { ListActions, ReorderAction } from "@dashboard/types"; +import { Card, TableCell } from "@material-ui/core"; import { DeleteIcon, IconButton, makeStyles } from "@saleor/macaw-ui"; -import { maybe, renderCollection } from "@saleor/misc"; -import { ListActions, ReorderAction } from "@saleor/types"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/productTypes/components/ProductTypeCreatePage/ProductTypeCreatePage.stories.tsx b/src/productTypes/components/ProductTypeCreatePage/ProductTypeCreatePage.stories.tsx index 2b5373dd6..d9ab9c261 100644 --- a/src/productTypes/components/ProductTypeCreatePage/ProductTypeCreatePage.stories.tsx +++ b/src/productTypes/components/ProductTypeCreatePage/ProductTypeCreatePage.stories.tsx @@ -1,7 +1,7 @@ -import { ProductTypeKindEnum, WeightUnitsEnum } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; -import { formError } from "@saleor/storybook/formError"; -import { taxClasses } from "@saleor/taxes/fixtures"; +import { ProductTypeKindEnum, WeightUnitsEnum } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; +import { formError } from "@dashboard/storybook/formError"; +import { taxClasses } from "@dashboard/taxes/fixtures"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/productTypes/components/ProductTypeCreatePage/ProductTypeCreatePage.tsx b/src/productTypes/components/ProductTypeCreatePage/ProductTypeCreatePage.tsx index 23cee8688..690145949 100644 --- a/src/productTypes/components/ProductTypeCreatePage/ProductTypeCreatePage.tsx +++ b/src/productTypes/components/ProductTypeCreatePage/ProductTypeCreatePage.tsx @@ -1,28 +1,28 @@ -import { Backlink } from "@saleor/components/Backlink"; -import CardSpacer from "@saleor/components/CardSpacer"; -import Container from "@saleor/components/Container"; -import Form from "@saleor/components/Form"; -import Grid from "@saleor/components/Grid"; -import Metadata, { MetadataFormData } from "@saleor/components/Metadata"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import Container from "@dashboard/components/Container"; +import Form from "@dashboard/components/Form"; +import Grid from "@dashboard/components/Grid"; +import Metadata, { MetadataFormData } from "@dashboard/components/Metadata"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; import { ProductTypeKindEnum, TaxClassBaseFragment, WeightUnitsEnum, -} from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useStateFromProps from "@saleor/hooks/useStateFromProps"; -import { sectionNames } from "@saleor/intl"; -import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; +} from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useStateFromProps from "@dashboard/hooks/useStateFromProps"; +import { sectionNames } from "@dashboard/intl"; import { handleTaxClassChange, makeProductTypeKindChangeHandler, -} from "@saleor/productTypes/handlers"; -import { productTypeListUrl } from "@saleor/productTypes/urls"; -import { FetchMoreProps, UserError } from "@saleor/types"; -import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger"; +} from "@dashboard/productTypes/handlers"; +import { productTypeListUrl } from "@dashboard/productTypes/urls"; +import { FetchMoreProps, UserError } from "@dashboard/types"; +import useMetadataChangeTrigger from "@dashboard/utils/metadata/useMetadataChangeTrigger"; +import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/productTypes/components/ProductTypeDetails/ProductTypeDetails.tsx b/src/productTypes/components/ProductTypeDetails/ProductTypeDetails.tsx index ebe8143a2..7adcf7221 100644 --- a/src/productTypes/components/ProductTypeDetails/ProductTypeDetails.tsx +++ b/src/productTypes/components/ProductTypeDetails/ProductTypeDetails.tsx @@ -1,3 +1,10 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import PreviewPill from "@dashboard/components/PreviewPill"; +import RadioGroupField from "@dashboard/components/RadioGroupField"; +import { ProductTypeKindEnum } from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; +import { UserError } from "@dashboard/types"; +import { getFieldError } from "@dashboard/utils/errors"; import { Card, CardContent, @@ -5,14 +12,7 @@ import { TextField, Typography, } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import PreviewPill from "@saleor/components/PreviewPill"; -import RadioGroupField from "@saleor/components/RadioGroupField"; -import { ProductTypeKindEnum } from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; import { makeStyles } from "@saleor/macaw-ui"; -import { UserError } from "@saleor/types"; -import { getFieldError } from "@saleor/utils/errors"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/productTypes/components/ProductTypeDetailsPage/ProductTypeDetailsPage.stories.tsx b/src/productTypes/components/ProductTypeDetailsPage/ProductTypeDetailsPage.stories.tsx index de0e1e58b..ce0ae663c 100644 --- a/src/productTypes/components/ProductTypeDetailsPage/ProductTypeDetailsPage.stories.tsx +++ b/src/productTypes/components/ProductTypeDetailsPage/ProductTypeDetailsPage.stories.tsx @@ -1,8 +1,8 @@ -import { listActionsProps } from "@saleor/fixtures"; -import { WeightUnitsEnum } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; -import { formError } from "@saleor/storybook/formError"; -import { taxClasses } from "@saleor/taxes/fixtures"; +import { listActionsProps } from "@dashboard/fixtures"; +import { WeightUnitsEnum } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; +import { formError } from "@dashboard/storybook/formError"; +import { taxClasses } from "@dashboard/taxes/fixtures"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/productTypes/components/ProductTypeDetailsPage/ProductTypeDetailsPage.tsx b/src/productTypes/components/ProductTypeDetailsPage/ProductTypeDetailsPage.tsx index d0418234c..fede7bf12 100644 --- a/src/productTypes/components/ProductTypeDetailsPage/ProductTypeDetailsPage.tsx +++ b/src/productTypes/components/ProductTypeDetailsPage/ProductTypeDetailsPage.tsx @@ -1,36 +1,36 @@ -import { Backlink } from "@saleor/components/Backlink"; -import CardSpacer from "@saleor/components/CardSpacer"; -import Container from "@saleor/components/Container"; -import ControlledSwitch from "@saleor/components/ControlledSwitch"; -import Form from "@saleor/components/Form"; -import Grid from "@saleor/components/Grid"; -import Metadata from "@saleor/components/Metadata/Metadata"; -import { MetadataFormData } from "@saleor/components/Metadata/types"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import Container from "@dashboard/components/Container"; +import ControlledSwitch from "@dashboard/components/ControlledSwitch"; +import Form from "@dashboard/components/Form"; +import Grid from "@dashboard/components/Grid"; +import Metadata from "@dashboard/components/Metadata/Metadata"; +import { MetadataFormData } from "@dashboard/components/Metadata/types"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; import { ProductAttributeType, ProductTypeDetailsQuery, ProductTypeKindEnum, TaxClassBaseFragment, WeightUnitsEnum, -} from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useStateFromProps from "@saleor/hooks/useStateFromProps"; -import { sectionNames } from "@saleor/intl"; -import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { maybe } from "@saleor/misc"; -import { handleTaxClassChange } from "@saleor/productTypes/handlers"; -import { productTypeListUrl } from "@saleor/productTypes/urls"; +} from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useStateFromProps from "@dashboard/hooks/useStateFromProps"; +import { sectionNames } from "@dashboard/intl"; +import { maybe } from "@dashboard/misc"; +import { handleTaxClassChange } from "@dashboard/productTypes/handlers"; +import { productTypeListUrl } from "@dashboard/productTypes/urls"; import { FetchMoreProps, ListActions, ReorderEvent, UserError, -} from "@saleor/types"; -import { mapMetadataItemToInput } from "@saleor/utils/maps"; -import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger"; +} from "@dashboard/types"; +import { mapMetadataItemToInput } from "@dashboard/utils/maps"; +import useMetadataChangeTrigger from "@dashboard/utils/metadata/useMetadataChangeTrigger"; +import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/productTypes/components/ProductTypeList/ProductTypeList.tsx b/src/productTypes/components/ProductTypeList/ProductTypeList.tsx index ff92dacc4..7a994770b 100644 --- a/src/productTypes/components/ProductTypeList/ProductTypeList.tsx +++ b/src/productTypes/components/ProductTypeList/ProductTypeList.tsx @@ -1,23 +1,23 @@ +import Checkbox from "@dashboard/components/Checkbox"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableCellHeader from "@dashboard/components/TableCellHeader"; +import TableHead from "@dashboard/components/TableHead"; +import { TablePaginationWithContext } from "@dashboard/components/TablePagination"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { ProductTypeFragment } from "@dashboard/graphql"; +import { + ProductTypeListUrlSortField, + productTypeUrl, +} from "@dashboard/productTypes/urls"; +import { getArrowDirection } from "@dashboard/utils/sort"; import { TableBody, TableCell, TableFooter, Typography, } from "@material-ui/core"; -import Checkbox from "@saleor/components/Checkbox"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableCellHeader from "@saleor/components/TableCellHeader"; -import TableHead from "@saleor/components/TableHead"; -import { TablePaginationWithContext } from "@saleor/components/TablePagination"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { ProductTypeFragment } from "@saleor/graphql"; import { makeStyles } from "@saleor/macaw-ui"; -import { - ProductTypeListUrlSortField, - productTypeUrl, -} from "@saleor/productTypes/urls"; -import { getArrowDirection } from "@saleor/utils/sort"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/productTypes/components/ProductTypeListPage/ProductTypeListPage.stories.tsx b/src/productTypes/components/ProductTypeListPage/ProductTypeListPage.stories.tsx index 7c3a9ba4d..0e1052585 100644 --- a/src/productTypes/components/ProductTypeListPage/ProductTypeListPage.stories.tsx +++ b/src/productTypes/components/ProductTypeListPage/ProductTypeListPage.stories.tsx @@ -5,11 +5,11 @@ import { searchPageProps, sortPageProps, tabPageProps, -} from "@saleor/fixtures"; -import { ProductTypeConfigurable, ProductTypeEnum } from "@saleor/graphql"; -import { ProductTypeListUrlSortField } from "@saleor/productTypes/urls"; -import Decorator from "@saleor/storybook/Decorator"; -import { PaginatorContextDecorator } from "@saleor/storybook/PaginatorContextDecorator"; +} from "@dashboard/fixtures"; +import { ProductTypeConfigurable, ProductTypeEnum } from "@dashboard/graphql"; +import { ProductTypeListUrlSortField } from "@dashboard/productTypes/urls"; +import Decorator from "@dashboard/storybook/Decorator"; +import { PaginatorContextDecorator } from "@dashboard/storybook/PaginatorContextDecorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/productTypes/components/ProductTypeListPage/ProductTypeListPage.tsx b/src/productTypes/components/ProductTypeListPage/ProductTypeListPage.tsx index c03ce2db6..854a91f3d 100644 --- a/src/productTypes/components/ProductTypeListPage/ProductTypeListPage.tsx +++ b/src/productTypes/components/ProductTypeListPage/ProductTypeListPage.tsx @@ -1,16 +1,16 @@ -import { Card } from "@material-ui/core"; -import { Backlink } from "@saleor/components/Backlink"; -import { Button } from "@saleor/components/Button"; -import Container from "@saleor/components/Container"; -import FilterBar from "@saleor/components/FilterBar"; -import PageHeader from "@saleor/components/PageHeader"; -import { configurationMenuUrl } from "@saleor/configuration"; -import { ProductTypeFragment } from "@saleor/graphql"; -import { sectionNames } from "@saleor/intl"; +import { Backlink } from "@dashboard/components/Backlink"; +import { Button } from "@dashboard/components/Button"; +import Container from "@dashboard/components/Container"; +import FilterBar from "@dashboard/components/FilterBar"; +import PageHeader from "@dashboard/components/PageHeader"; +import { configurationMenuUrl } from "@dashboard/configuration"; +import { ProductTypeFragment } from "@dashboard/graphql"; +import { sectionNames } from "@dashboard/intl"; import { productTypeAddUrl, ProductTypeListUrlSortField, -} from "@saleor/productTypes/urls"; +} from "@dashboard/productTypes/urls"; +import { Card } from "@material-ui/core"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/productTypes/components/ProductTypeListPage/filters.ts b/src/productTypes/components/ProductTypeListPage/filters.ts index 3e6e51da0..7518cbf26 100644 --- a/src/productTypes/components/ProductTypeListPage/filters.ts +++ b/src/productTypes/components/ProductTypeListPage/filters.ts @@ -1,8 +1,8 @@ -import { IFilter } from "@saleor/components/Filter"; -import { ProductTypeConfigurable, ProductTypeEnum } from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; -import { FilterOpts } from "@saleor/types"; -import { createOptionsField } from "@saleor/utils/filters/fields"; +import { IFilter } from "@dashboard/components/Filter"; +import { ProductTypeConfigurable, ProductTypeEnum } from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; +import { FilterOpts } from "@dashboard/types"; +import { createOptionsField } from "@dashboard/utils/filters/fields"; import { defineMessages, IntlShape } from "react-intl"; export enum ProductTypeFilterKeys { diff --git a/src/productTypes/components/ProductTypeShipping/ProductTypeShipping.tsx b/src/productTypes/components/ProductTypeShipping/ProductTypeShipping.tsx index 7c73ebbaa..49e15b923 100644 --- a/src/productTypes/components/ProductTypeShipping/ProductTypeShipping.tsx +++ b/src/productTypes/components/ProductTypeShipping/ProductTypeShipping.tsx @@ -1,6 +1,6 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import { ControlledCheckbox } from "@dashboard/components/ControlledCheckbox"; import { Card, CardContent, TextField } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import { ControlledCheckbox } from "@saleor/components/ControlledCheckbox"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/productTypes/components/ProductTypeTaxes/ProductTypeTaxes.tsx b/src/productTypes/components/ProductTypeTaxes/ProductTypeTaxes.tsx index 59d027a04..17aa54ccf 100644 --- a/src/productTypes/components/ProductTypeTaxes/ProductTypeTaxes.tsx +++ b/src/productTypes/components/ProductTypeTaxes/ProductTypeTaxes.tsx @@ -1,11 +1,11 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import SingleAutocompleteSelectField from "@dashboard/components/SingleAutocompleteSelectField"; +import { TaxClassBaseFragment } from "@dashboard/graphql"; +import { sectionNames } from "@dashboard/intl"; +import { taxesMessages } from "@dashboard/taxes/messages"; +import { FetchMoreProps } from "@dashboard/types"; import { Card, CardContent } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import SingleAutocompleteSelectField from "@saleor/components/SingleAutocompleteSelectField"; -import { TaxClassBaseFragment } from "@saleor/graphql"; -import { sectionNames } from "@saleor/intl"; import { makeStyles } from "@saleor/macaw-ui"; -import { taxesMessages } from "@saleor/taxes/messages"; -import { FetchMoreProps } from "@saleor/types"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/productTypes/components/ProductTypeVariantAttributes/ProductTypeVariantAttributes.tsx b/src/productTypes/components/ProductTypeVariantAttributes/ProductTypeVariantAttributes.tsx index 937ca31bc..6ce14cba3 100644 --- a/src/productTypes/components/ProductTypeVariantAttributes/ProductTypeVariantAttributes.tsx +++ b/src/productTypes/components/ProductTypeVariantAttributes/ProductTypeVariantAttributes.tsx @@ -1,22 +1,25 @@ -import { Card, TableCell } from "@material-ui/core"; -import HelpOutline from "@material-ui/icons/HelpOutline"; -import { attributeUrl } from "@saleor/attributes/urls"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import Checkbox from "@saleor/components/Checkbox"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; +import { attributeUrl } from "@dashboard/attributes/urls"; +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import Checkbox from "@dashboard/components/Checkbox"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; import { SortableTableBody, SortableTableRow, -} from "@saleor/components/SortableTable"; -import { TableButtonWrapper } from "@saleor/components/TableButtonWrapper/TableButtonWrapper"; -import TableHead from "@saleor/components/TableHead"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { ProductAttributeType, ProductTypeDetailsQuery } from "@saleor/graphql"; +} from "@dashboard/components/SortableTable"; +import { TableButtonWrapper } from "@dashboard/components/TableButtonWrapper/TableButtonWrapper"; +import TableHead from "@dashboard/components/TableHead"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { + ProductAttributeType, + ProductTypeDetailsQuery, +} from "@dashboard/graphql"; +import { maybe, renderCollection } from "@dashboard/misc"; +import { ListActions, ReorderAction } from "@dashboard/types"; +import { Card, TableCell } from "@material-ui/core"; +import HelpOutline from "@material-ui/icons/HelpOutline"; import { DeleteIcon, IconButton, makeStyles, Tooltip } from "@saleor/macaw-ui"; -import { maybe, renderCollection } from "@saleor/misc"; -import { ListActions, ReorderAction } from "@saleor/types"; import capitalize from "lodash/capitalize"; import React, { useEffect } from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/productTypes/fixtures.ts b/src/productTypes/fixtures.ts index f9fdd0a68..7dd5e5f22 100644 --- a/src/productTypes/fixtures.ts +++ b/src/productTypes/fixtures.ts @@ -7,8 +7,8 @@ import { ProductTypeQuery, SearchProductTypesQuery, WeightUnitsEnum, -} from "@saleor/graphql"; -import { RelayToFlat } from "@saleor/types"; +} from "@dashboard/graphql"; +import { RelayToFlat } from "@dashboard/types"; export const attributes: ProductTypeQuery["productType"]["productAttributes"] = [ { diff --git a/src/productTypes/handlers.ts b/src/productTypes/handlers.ts index 3584e20bb..2c6d80222 100644 --- a/src/productTypes/handlers.ts +++ b/src/productTypes/handlers.ts @@ -1,5 +1,5 @@ -import { ProductTypeKindEnum, TaxClassBaseFragment } from "@saleor/graphql"; -import { ChangeEvent, FormChange } from "@saleor/hooks/useForm"; +import { ProductTypeKindEnum, TaxClassBaseFragment } from "@dashboard/graphql"; +import { ChangeEvent, FormChange } from "@dashboard/hooks/useForm"; export const makeProductTypeKindChangeHandler = ( onChange: FormChange, diff --git a/src/productTypes/hooks/useProductTypeDelete/useProductTypeDelete.tsx b/src/productTypes/hooks/useProductTypeDelete/useProductTypeDelete.tsx index b842d05ea..03c669ac0 100644 --- a/src/productTypes/hooks/useProductTypeDelete/useProductTypeDelete.tsx +++ b/src/productTypes/hooks/useProductTypeDelete/useProductTypeDelete.tsx @@ -1,16 +1,16 @@ import { ProductCountQueryVariables, useProductCountQuery, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import { UseTypeDeleteData, UseTypeDeleteProps, -} from "@saleor/pageTypes/hooks/usePageTypeDelete/types"; -import { productListUrl } from "@saleor/products/urls"; +} from "@dashboard/pageTypes/hooks/usePageTypeDelete/types"; +import { productListUrl } from "@dashboard/products/urls"; import { ProductTypeListUrlQueryParams, ProductTypeUrlQueryParams, -} from "@saleor/productTypes/urls"; +} from "@dashboard/productTypes/urls"; import React from "react"; import * as messages from "./messages"; diff --git a/src/productTypes/hooks/useProductTypeOperations.ts b/src/productTypes/hooks/useProductTypeOperations.ts index 5fb631a15..ebaf6aa78 100644 --- a/src/productTypes/hooks/useProductTypeOperations.ts +++ b/src/productTypes/hooks/useProductTypeOperations.ts @@ -10,7 +10,7 @@ import { useProductTypeAttributeReorderMutation, useProductTypeDeleteMutation, useUnassignProductAttributeMutation, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import { getMutationProviderData } from "../../misc"; diff --git a/src/productTypes/index.tsx b/src/productTypes/index.tsx index 7354c9f01..2dd9de665 100644 --- a/src/productTypes/index.tsx +++ b/src/productTypes/index.tsx @@ -1,5 +1,5 @@ -import { sectionNames } from "@saleor/intl"; -import { asSortParams } from "@saleor/utils/sort"; +import { sectionNames } from "@dashboard/intl"; +import { asSortParams } from "@dashboard/utils/sort"; import { parse as parseQs } from "qs"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/productTypes/urls.ts b/src/productTypes/urls.ts index d3925c5de..8c4fa7161 100644 --- a/src/productTypes/urls.ts +++ b/src/productTypes/urls.ts @@ -1,5 +1,5 @@ -import { ProductTypeKindEnum } from "@saleor/graphql"; -import { stringifyQs } from "@saleor/utils/urls"; +import { ProductTypeKindEnum } from "@dashboard/graphql"; +import { stringifyQs } from "@dashboard/utils/urls"; import urlJoin from "url-join"; import { diff --git a/src/productTypes/views/ProductTypeCreate.tsx b/src/productTypes/views/ProductTypeCreate.tsx index b1d7ac051..c6506af29 100644 --- a/src/productTypes/views/ProductTypeCreate.tsx +++ b/src/productTypes/views/ProductTypeCreate.tsx @@ -1,15 +1,15 @@ -import { WindowTitle } from "@saleor/components/WindowTitle"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; import { ProductTypeKindEnum, useProductTypeCreateDataQuery, useProductTypeCreateMutation, useUpdateMetadataMutation, useUpdatePrivateMetadataMutation, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { useTaxClassFetchMore } from "@saleor/taxes/utils/useTaxClassFetchMore"; -import createMetadataCreateHandler from "@saleor/utils/handlers/metadataCreateHandler"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { useTaxClassFetchMore } from "@dashboard/taxes/utils/useTaxClassFetchMore"; +import createMetadataCreateHandler from "@dashboard/utils/handlers/metadataCreateHandler"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/productTypes/views/ProductTypeList/ProductTypeList.tsx b/src/productTypes/views/ProductTypeList/ProductTypeList.tsx index 64ee7a252..fafcea5f8 100644 --- a/src/productTypes/views/ProductTypeList/ProductTypeList.tsx +++ b/src/productTypes/views/ProductTypeList/ProductTypeList.tsx @@ -1,29 +1,29 @@ -import DeleteFilterTabDialog from "@saleor/components/DeleteFilterTabDialog"; +import DeleteFilterTabDialog from "@dashboard/components/DeleteFilterTabDialog"; import SaveFilterTabDialog, { SaveFilterTabDialogFormData, -} from "@saleor/components/SaveFilterTabDialog"; +} from "@dashboard/components/SaveFilterTabDialog"; import { useProductTypeBulkDeleteMutation, useProductTypeListQuery, -} from "@saleor/graphql"; -import useBulkActions from "@saleor/hooks/useBulkActions"; -import useListSettings from "@saleor/hooks/useListSettings"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; +} from "@dashboard/graphql"; +import useBulkActions from "@dashboard/hooks/useBulkActions"; +import useListSettings from "@dashboard/hooks/useListSettings"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { usePaginationReset } from "@dashboard/hooks/usePaginationReset"; import usePaginator, { createPaginationState, PaginatorContext, -} from "@saleor/hooks/usePaginator"; -import { commonMessages } from "@saleor/intl"; +} from "@dashboard/hooks/usePaginator"; +import { commonMessages } from "@dashboard/intl"; +import useProductTypeDelete from "@dashboard/productTypes/hooks/useProductTypeDelete"; +import { ListViews } from "@dashboard/types"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createFilterHandlers from "@dashboard/utils/handlers/filterHandlers"; +import createSortHandler from "@dashboard/utils/handlers/sortHandler"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; +import { getSortParams } from "@dashboard/utils/sort"; import { DeleteIcon, IconButton } from "@saleor/macaw-ui"; -import useProductTypeDelete from "@saleor/productTypes/hooks/useProductTypeDelete"; -import { ListViews } from "@saleor/types"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createFilterHandlers from "@saleor/utils/handlers/filterHandlers"; -import createSortHandler from "@saleor/utils/handlers/sortHandler"; -import { mapEdgesToItems } from "@saleor/utils/maps"; -import { getSortParams } from "@saleor/utils/sort"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/productTypes/views/ProductTypeList/filters.test.ts b/src/productTypes/views/ProductTypeList/filters.test.ts index 5984403c8..ef164ef72 100644 --- a/src/productTypes/views/ProductTypeList/filters.test.ts +++ b/src/productTypes/views/ProductTypeList/filters.test.ts @@ -1,8 +1,8 @@ -import { ProductTypeConfigurable, ProductTypeEnum } from "@saleor/graphql"; -import { createFilterStructure } from "@saleor/productTypes/components/ProductTypeListPage"; -import { ProductTypeListUrlFilters } from "@saleor/productTypes/urls"; -import { getFilterQueryParams } from "@saleor/utils/filters"; -import { stringifyQs } from "@saleor/utils/urls"; +import { ProductTypeConfigurable, ProductTypeEnum } from "@dashboard/graphql"; +import { createFilterStructure } from "@dashboard/productTypes/components/ProductTypeListPage"; +import { ProductTypeListUrlFilters } from "@dashboard/productTypes/urls"; +import { getFilterQueryParams } from "@dashboard/utils/filters"; +import { stringifyQs } from "@dashboard/utils/urls"; import { getExistingKeys, setFilterOptsStatus } from "@test/filters"; import { config } from "@test/intl"; import { createIntl } from "react-intl"; diff --git a/src/productTypes/views/ProductTypeList/filters.ts b/src/productTypes/views/ProductTypeList/filters.ts index f99f2363a..0aca558ae 100644 --- a/src/productTypes/views/ProductTypeList/filters.ts +++ b/src/productTypes/views/ProductTypeList/filters.ts @@ -1,14 +1,14 @@ -import { FilterElement } from "@saleor/components/Filter"; +import { FilterElement } from "@dashboard/components/Filter"; import { ProductTypeConfigurable, ProductTypeEnum, ProductTypeFilterInput, -} from "@saleor/graphql"; -import { findValueInEnum, maybe } from "@saleor/misc"; +} from "@dashboard/graphql"; +import { findValueInEnum, maybe } from "@dashboard/misc"; import { ProductTypeFilterKeys, ProductTypeListFilterOpts, -} from "@saleor/productTypes/components/ProductTypeListPage"; +} from "@dashboard/productTypes/components/ProductTypeListPage"; import { createFilterTabUtils, diff --git a/src/productTypes/views/ProductTypeList/sort.ts b/src/productTypes/views/ProductTypeList/sort.ts index c7782b54f..64de40e21 100644 --- a/src/productTypes/views/ProductTypeList/sort.ts +++ b/src/productTypes/views/ProductTypeList/sort.ts @@ -1,6 +1,6 @@ -import { ProductTypeSortField } from "@saleor/graphql"; -import { ProductTypeListUrlSortField } from "@saleor/productTypes/urls"; -import { createGetSortQueryVariables } from "@saleor/utils/sort"; +import { ProductTypeSortField } from "@dashboard/graphql"; +import { ProductTypeListUrlSortField } from "@dashboard/productTypes/urls"; +import { createGetSortQueryVariables } from "@dashboard/utils/sort"; export function getSortQueryField( sort: ProductTypeListUrlSortField, diff --git a/src/productTypes/views/ProductTypeUpdate/index.tsx b/src/productTypes/views/ProductTypeUpdate/index.tsx index 4c9a4c305..b9068e811 100644 --- a/src/productTypes/views/ProductTypeUpdate/index.tsx +++ b/src/productTypes/views/ProductTypeUpdate/index.tsx @@ -1,11 +1,11 @@ -import AssignAttributeDialog from "@saleor/components/AssignAttributeDialog"; -import AttributeUnassignDialog from "@saleor/components/AttributeUnassignDialog"; -import BulkAttributeUnassignDialog from "@saleor/components/BulkAttributeUnassignDialog"; -import { Button } from "@saleor/components/Button"; -import NotFoundPage from "@saleor/components/NotFoundPage"; -import TypeDeleteWarningDialog from "@saleor/components/TypeDeleteWarningDialog"; -import { WindowTitle } from "@saleor/components/WindowTitle"; -import { DEFAULT_INITIAL_SEARCH_DATA } from "@saleor/config"; +import AssignAttributeDialog from "@dashboard/components/AssignAttributeDialog"; +import AttributeUnassignDialog from "@dashboard/components/AttributeUnassignDialog"; +import BulkAttributeUnassignDialog from "@dashboard/components/BulkAttributeUnassignDialog"; +import { Button } from "@dashboard/components/Button"; +import NotFoundPage from "@dashboard/components/NotFoundPage"; +import TypeDeleteWarningDialog from "@dashboard/components/TypeDeleteWarningDialog"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; +import { DEFAULT_INITIAL_SEARCH_DATA } from "@dashboard/config"; import { AssignProductAttributeMutation, ProductAttributeType, @@ -17,19 +17,19 @@ import { useProductTypeUpdateMutation, useUpdateMetadataMutation, useUpdatePrivateMetadataMutation, -} from "@saleor/graphql"; -import useBulkActions from "@saleor/hooks/useBulkActions"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { commonMessages } from "@saleor/intl"; -import { getStringOrPlaceholder, maybe } from "@saleor/misc"; -import useProductTypeDelete from "@saleor/productTypes/hooks/useProductTypeDelete"; -import useProductTypeOperations from "@saleor/productTypes/hooks/useProductTypeOperations"; -import useAvailableProductAttributeSearch from "@saleor/searches/useAvailableProductAttributeSearch"; -import { useTaxClassFetchMore } from "@saleor/taxes/utils/useTaxClassFetchMore"; -import { ReorderEvent } from "@saleor/types"; -import createMetadataUpdateHandler from "@saleor/utils/handlers/metadataUpdateHandler"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/graphql"; +import useBulkActions from "@dashboard/hooks/useBulkActions"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { commonMessages } from "@dashboard/intl"; +import { getStringOrPlaceholder, maybe } from "@dashboard/misc"; +import useProductTypeDelete from "@dashboard/productTypes/hooks/useProductTypeDelete"; +import useProductTypeOperations from "@dashboard/productTypes/hooks/useProductTypeOperations"; +import useAvailableProductAttributeSearch from "@dashboard/searches/useAvailableProductAttributeSearch"; +import { useTaxClassFetchMore } from "@dashboard/taxes/utils/useTaxClassFetchMore"; +import { ReorderEvent } from "@dashboard/types"; +import createMetadataUpdateHandler from "@dashboard/utils/handlers/metadataUpdateHandler"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/products/components/OrderDiscountProviders/OrderDiscountProvider.tsx b/src/products/components/OrderDiscountProviders/OrderDiscountProvider.tsx index 075f0c4ba..38b0658c4 100644 --- a/src/products/components/OrderDiscountProviders/OrderDiscountProvider.tsx +++ b/src/products/components/OrderDiscountProviders/OrderDiscountProvider.tsx @@ -4,11 +4,11 @@ import { useOrderDiscountAddMutation, useOrderDiscountDeleteMutation, useOrderDiscountUpdateMutation, -} from "@saleor/graphql"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { getDefaultNotifierSuccessErrorData } from "@saleor/hooks/useNotifier/utils"; +} from "@dashboard/graphql"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { getDefaultNotifierSuccessErrorData } from "@dashboard/hooks/useNotifier/utils"; +import { OrderDiscountCommonInput } from "@dashboard/orders/components/OrderDiscountCommonModal/types"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { OrderDiscountCommonInput } from "@saleor/orders/components/OrderDiscountCommonModal/types"; import React, { createContext } from "react"; import { useIntl } from "react-intl"; diff --git a/src/products/components/OrderDiscountProviders/OrderLineDiscountProvider.tsx b/src/products/components/OrderDiscountProviders/OrderLineDiscountProvider.tsx index 44a7c5ee0..c6639d78c 100644 --- a/src/products/components/OrderDiscountProviders/OrderLineDiscountProvider.tsx +++ b/src/products/components/OrderDiscountProviders/OrderLineDiscountProvider.tsx @@ -3,12 +3,12 @@ import { OrderDetailsFragment, useOrderLineDiscountRemoveMutation, useOrderLineDiscountUpdateMutation, -} from "@saleor/graphql"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { getDefaultNotifierSuccessErrorData } from "@saleor/hooks/useNotifier/utils"; +} from "@dashboard/graphql"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { getDefaultNotifierSuccessErrorData } from "@dashboard/hooks/useNotifier/utils"; +import { getById } from "@dashboard/misc"; +import { OrderDiscountCommonInput } from "@dashboard/orders/components/OrderDiscountCommonModal/types"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { getById } from "@saleor/misc"; -import { OrderDiscountCommonInput } from "@saleor/orders/components/OrderDiscountCommonModal/types"; import React, { createContext, useState } from "react"; import { useIntl } from "react-intl"; diff --git a/src/products/components/OrderDiscountProviders/types.ts b/src/products/components/OrderDiscountProviders/types.ts index 2cd62d8cd..acbdba3f1 100644 --- a/src/products/components/OrderDiscountProviders/types.ts +++ b/src/products/components/OrderDiscountProviders/types.ts @@ -1,5 +1,5 @@ -import { MoneyFragment, TaxedMoneyFragment } from "@saleor/graphql"; -import { OrderDiscountCommonInput } from "@saleor/orders/components/OrderDiscountCommonModal/types"; +import { MoneyFragment, TaxedMoneyFragment } from "@dashboard/graphql"; +import { OrderDiscountCommonInput } from "@dashboard/orders/components/OrderDiscountCommonModal/types"; import { OrderLineDiscountContextConsumerProps } from "./OrderLineDiscountProvider"; diff --git a/src/products/components/OrderDiscountProviders/utils.ts b/src/products/components/OrderDiscountProviders/utils.ts index fc8c5a106..a862f39ea 100644 --- a/src/products/components/OrderDiscountProviders/utils.ts +++ b/src/products/components/OrderDiscountProviders/utils.ts @@ -1,5 +1,5 @@ -import { OrderDetailsQuery, OrderDiscountType } from "@saleor/graphql"; -import { OrderDiscountCommonInput } from "@saleor/orders/components/OrderDiscountCommonModal/types"; +import { OrderDetailsQuery, OrderDiscountType } from "@dashboard/graphql"; +import { OrderDiscountCommonInput } from "@dashboard/orders/components/OrderDiscountCommonModal/types"; import { useState } from "react"; import { OrderLineDiscountData } from "./types"; diff --git a/src/products/components/ProductCategoryAndCollectionsForm/ProductCategoryAndCollectionsForm.tsx b/src/products/components/ProductCategoryAndCollectionsForm/ProductCategoryAndCollectionsForm.tsx index 17e2a52e9..3dd2bf87b 100644 --- a/src/products/components/ProductCategoryAndCollectionsForm/ProductCategoryAndCollectionsForm.tsx +++ b/src/products/components/ProductCategoryAndCollectionsForm/ProductCategoryAndCollectionsForm.tsx @@ -1,8 +1,8 @@ +import FormSpacer from "@dashboard/components/FormSpacer"; +import MultiSelectField from "@dashboard/components/MultiSelectField"; +import PageHeader from "@dashboard/components/PageHeader"; +import SingleSelectField from "@dashboard/components/SingleSelectField"; import { Card, CardContent } from "@material-ui/core"; -import FormSpacer from "@saleor/components/FormSpacer"; -import MultiSelectField from "@saleor/components/MultiSelectField"; -import PageHeader from "@saleor/components/PageHeader"; -import SingleSelectField from "@saleor/components/SingleSelectField"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/products/components/ProductCreatePage/ProductCreatePage.stories.tsx b/src/products/components/ProductCreatePage/ProductCreatePage.stories.tsx index 6286e3a8e..04258827e 100644 --- a/src/products/components/ProductCreatePage/ProductCreatePage.stories.tsx +++ b/src/products/components/ProductCreatePage/ProductCreatePage.stories.tsx @@ -1,11 +1,14 @@ -import { channelsList } from "@saleor/channels/fixtures"; -import { createChannelsData } from "@saleor/channels/utils"; -import { fetchMoreProps } from "@saleor/fixtures"; -import { ProductErrorCode } from "@saleor/graphql"; -import { productTypes, productTypeSearch } from "@saleor/productTypes/fixtures"; -import Decorator from "@saleor/storybook/Decorator"; -import { taxClasses } from "@saleor/taxes/fixtures"; -import { warehouseList } from "@saleor/warehouses/fixtures"; +import { channelsList } from "@dashboard/channels/fixtures"; +import { createChannelsData } from "@dashboard/channels/utils"; +import { fetchMoreProps } from "@dashboard/fixtures"; +import { ProductErrorCode } from "@dashboard/graphql"; +import { + productTypes, + productTypeSearch, +} from "@dashboard/productTypes/fixtures"; +import Decorator from "@dashboard/storybook/Decorator"; +import { taxClasses } from "@dashboard/taxes/fixtures"; +import { warehouseList } from "@dashboard/warehouses/fixtures"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/products/components/ProductCreatePage/ProductCreatePage.tsx b/src/products/components/ProductCreatePage/ProductCreatePage.tsx index 6010e6428..36294cfd5 100644 --- a/src/products/components/ProductCreatePage/ProductCreatePage.tsx +++ b/src/products/components/ProductCreatePage/ProductCreatePage.tsx @@ -1,21 +1,21 @@ import { getReferenceAttributeEntityTypeFromAttribute, mergeAttributeValues, -} from "@saleor/attributes/utils/data"; -import CannotDefineChannelsAvailabilityCard from "@saleor/channels/components/CannotDefineChannelsAvailabilityCard/CannotDefineChannelsAvailabilityCard"; -import { ChannelData } from "@saleor/channels/utils"; -import AssignAttributeValueDialog from "@saleor/components/AssignAttributeValueDialog"; -import Attributes, { AttributeInput } from "@saleor/components/Attributes"; -import { Backlink } from "@saleor/components/Backlink"; -import CardSpacer from "@saleor/components/CardSpacer"; -import ChannelsAvailabilityCard from "@saleor/components/ChannelsAvailabilityCard"; -import Container from "@saleor/components/Container"; -import Grid from "@saleor/components/Grid"; -import Metadata from "@saleor/components/Metadata"; -import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; -import SeoForm from "@saleor/components/SeoForm"; +} from "@dashboard/attributes/utils/data"; +import CannotDefineChannelsAvailabilityCard from "@dashboard/channels/components/CannotDefineChannelsAvailabilityCard/CannotDefineChannelsAvailabilityCard"; +import { ChannelData } from "@dashboard/channels/utils"; +import AssignAttributeValueDialog from "@dashboard/components/AssignAttributeValueDialog"; +import Attributes, { AttributeInput } from "@dashboard/components/Attributes"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import ChannelsAvailabilityCard from "@dashboard/components/ChannelsAvailabilityCard"; +import Container from "@dashboard/components/Container"; +import Grid from "@dashboard/components/Grid"; +import Metadata from "@dashboard/components/Metadata"; +import { MultiAutocompleteChoiceType } from "@dashboard/components/MultiAutocompleteSelectField"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; +import SeoForm from "@dashboard/components/SeoForm"; import { PermissionEnum, ProductChannelListingErrorFragment, @@ -29,17 +29,17 @@ import { SearchProductTypesQuery, SearchWarehousesQuery, TaxClassBaseFragment, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useStateFromProps from "@saleor/hooks/useStateFromProps"; -import { sectionNames } from "@saleor/intl"; -import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import ProductVariantPrice from "@saleor/products/components/ProductVariantPrice"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useStateFromProps from "@dashboard/hooks/useStateFromProps"; +import { sectionNames } from "@dashboard/intl"; +import ProductVariantPrice from "@dashboard/products/components/ProductVariantPrice"; import { ProductCreateUrlQueryParams, productListUrl, -} from "@saleor/products/urls"; -import { getChoices } from "@saleor/products/utils/data"; +} from "@dashboard/products/urls"; +import { getChoices } from "@dashboard/products/utils/data"; +import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/products/components/ProductCreatePage/form.tsx b/src/products/components/ProductCreatePage/form.tsx index c56aaa4be..a7a624d68 100644 --- a/src/products/components/ProductCreatePage/form.tsx +++ b/src/products/components/ProductCreatePage/form.tsx @@ -1,11 +1,10 @@ -import { OutputData } from "@editorjs/editorjs"; import { getAttributesDisplayData, getRichTextAttributesFromMap, getRichTextDataFromAttributes, mergeAttributes, RichTextProps, -} from "@saleor/attributes/utils/data"; +} from "@dashboard/attributes/utils/data"; import { createAttributeChangeHandler, createAttributeFileChangeHandler, @@ -14,16 +13,16 @@ import { createAttributeValueReorderHandler, createFetchMoreReferencesHandler, createFetchReferencesHandler, -} from "@saleor/attributes/utils/handlers"; -import { ChannelData, ChannelPriceArgs } from "@saleor/channels/utils"; +} from "@dashboard/attributes/utils/handlers"; +import { ChannelData, ChannelPriceArgs } from "@dashboard/channels/utils"; import { AttributeInput, AttributeInputData, -} from "@saleor/components/Attributes"; -import { useExitFormDialog } from "@saleor/components/Form/useExitFormDialog"; -import { MetadataFormData } from "@saleor/components/Metadata"; -import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField"; -import { SingleAutocompleteChoiceType } from "@saleor/components/SingleAutocompleteSelectField"; +} from "@dashboard/components/Attributes"; +import { useExitFormDialog } from "@dashboard/components/Form/useExitFormDialog"; +import { MetadataFormData } from "@dashboard/components/Metadata"; +import { MultiAutocompleteChoiceType } from "@dashboard/components/MultiAutocompleteSelectField"; +import { SingleAutocompleteChoiceType } from "@dashboard/components/SingleAutocompleteSelectField"; import { ProductErrorWithAttributesFragment, ProductTypeQuery, @@ -31,41 +30,42 @@ import { SearchProductsQuery, SearchProductTypesQuery, SearchWarehousesQuery, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import useForm, { CommonUseFormResultWithHandlers, FormChange, FormErrors, SubmitPromise, -} from "@saleor/hooks/useForm"; +} from "@dashboard/hooks/useForm"; import useFormset, { FormsetChange, FormsetData, -} from "@saleor/hooks/useFormset"; -import useHandleFormSubmit from "@saleor/hooks/useHandleFormSubmit"; -import { errorMessages } from "@saleor/intl"; +} from "@dashboard/hooks/useFormset"; +import useHandleFormSubmit from "@dashboard/hooks/useHandleFormSubmit"; +import { errorMessages } from "@dashboard/intl"; import { getAttributeInputFromProductType, ProductType, -} from "@saleor/products/utils/data"; +} from "@dashboard/products/utils/data"; import { createChannelsChangeHandler, createChannelsPriceChangeHandler, createProductTypeSelectHandler, -} from "@saleor/products/utils/handlers"; +} from "@dashboard/products/utils/handlers"; import { validateCostPrice, validatePrice, validateProductCreateData, -} from "@saleor/products/utils/validation"; -import { PRODUCT_CREATE_FORM_ID } from "@saleor/products/views/ProductCreate/consts"; -import { FetchMoreProps, RelayToFlat, ReorderEvent } from "@saleor/types"; -import createMultiAutocompleteSelectHandler from "@saleor/utils/handlers/multiAutocompleteSelectChangeHandler"; -import createSingleAutocompleteSelectHandler from "@saleor/utils/handlers/singleAutocompleteSelectChangeHandler"; -import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger"; -import { RichTextContext } from "@saleor/utils/richText/context"; -import { useMultipleRichText } from "@saleor/utils/richText/useMultipleRichText"; -import useRichText from "@saleor/utils/richText/useRichText"; +} from "@dashboard/products/utils/validation"; +import { PRODUCT_CREATE_FORM_ID } from "@dashboard/products/views/ProductCreate/consts"; +import { FetchMoreProps, RelayToFlat, ReorderEvent } from "@dashboard/types"; +import createMultiAutocompleteSelectHandler from "@dashboard/utils/handlers/multiAutocompleteSelectChangeHandler"; +import createSingleAutocompleteSelectHandler from "@dashboard/utils/handlers/singleAutocompleteSelectChangeHandler"; +import useMetadataChangeTrigger from "@dashboard/utils/metadata/useMetadataChangeTrigger"; +import { RichTextContext } from "@dashboard/utils/richText/context"; +import { useMultipleRichText } from "@dashboard/utils/richText/useMultipleRichText"; +import useRichText from "@dashboard/utils/richText/useRichText"; +import { OutputData } from "@editorjs/editorjs"; import React, { useEffect, useState } from "react"; import { useIntl } from "react-intl"; diff --git a/src/products/components/ProductDetailsForm/ProductDetailsForm.tsx b/src/products/components/ProductDetailsForm/ProductDetailsForm.tsx index be5bd159f..23a1b85bb 100644 --- a/src/products/components/ProductDetailsForm/ProductDetailsForm.tsx +++ b/src/products/components/ProductDetailsForm/ProductDetailsForm.tsx @@ -1,15 +1,15 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import Grid from "@dashboard/components/Grid"; +import Hr from "@dashboard/components/Hr"; +import RichTextEditor from "@dashboard/components/RichTextEditor"; +import { RichTextEditorLoading } from "@dashboard/components/RichTextEditor/RichTextEditorLoading"; +import { ProductErrorFragment } from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; +import { getFormErrors, getProductErrorMessage } from "@dashboard/utils/errors"; +import { useRichTextContext } from "@dashboard/utils/richText/context"; import { OutputData } from "@editorjs/editorjs"; import { Card, CardContent, TextField } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import FormSpacer from "@saleor/components/FormSpacer"; -import Grid from "@saleor/components/Grid"; -import Hr from "@saleor/components/Hr"; -import RichTextEditor from "@saleor/components/RichTextEditor"; -import { RichTextEditorLoading } from "@saleor/components/RichTextEditor/RichTextEditorLoading"; -import { ProductErrorFragment } from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; -import { getFormErrors, getProductErrorMessage } from "@saleor/utils/errors"; -import { useRichTextContext } from "@saleor/utils/richText/context"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/products/components/ProductExportDialog/ExportDialogSettings.tsx b/src/products/components/ProductExportDialog/ExportDialogSettings.tsx index 662d4c006..f243c1ce4 100644 --- a/src/products/components/ProductExportDialog/ExportDialogSettings.tsx +++ b/src/products/components/ProductExportDialog/ExportDialogSettings.tsx @@ -1,17 +1,17 @@ -import Hr from "@saleor/components/Hr"; +import Hr from "@dashboard/components/Hr"; import RadioGroupField, { RadioGroupFieldChoice, -} from "@saleor/components/RadioGroupField"; +} from "@dashboard/components/RadioGroupField"; import { ExportErrorFragment, ExportProductsInput, ExportScope, FileTypesEnum, -} from "@saleor/graphql"; -import { ChangeEvent } from "@saleor/hooks/useForm"; +} from "@dashboard/graphql"; +import { ChangeEvent } from "@dashboard/hooks/useForm"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getExportErrorMessage from "@dashboard/utils/errors/export"; import { makeStyles } from "@saleor/macaw-ui"; -import { getFormErrors } from "@saleor/utils/errors"; -import getExportErrorMessage from "@saleor/utils/errors/export"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/products/components/ProductExportDialog/ProductExportDialog.tsx b/src/products/components/ProductExportDialog/ProductExportDialog.tsx index 315a71bea..ce0e5acf5 100644 --- a/src/products/components/ProductExportDialog/ProductExportDialog.tsx +++ b/src/products/components/ProductExportDialog/ProductExportDialog.tsx @@ -1,3 +1,23 @@ +import { Button } from "@dashboard/components/Button"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import makeCreatorSteps, { Step } from "@dashboard/components/CreatorSteps"; +import { MultiAutocompleteChoiceType } from "@dashboard/components/MultiAutocompleteSelectField"; +import { + ChannelFragment, + ExportErrorFragment, + ExportProductsInput, + SearchAttributesQuery, + WarehouseFragment, +} from "@dashboard/graphql"; +import useForm, { FormChange } from "@dashboard/hooks/useForm"; +import useModalDialogErrors from "@dashboard/hooks/useModalDialogErrors"; +import useModalDialogOpen from "@dashboard/hooks/useModalDialogOpen"; +import useWizard from "@dashboard/hooks/useWizard"; +import { buttonMessages } from "@dashboard/intl"; +import { DialogProps, FetchMoreProps, RelayToFlat } from "@dashboard/types"; +import getExportErrorMessage from "@dashboard/utils/errors/export"; +import { toggle } from "@dashboard/utils/lists"; +import { mapNodeToChoice } from "@dashboard/utils/maps"; import { Dialog, DialogActions, @@ -5,27 +25,7 @@ import { DialogTitle, Typography, } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import makeCreatorSteps, { Step } from "@saleor/components/CreatorSteps"; -import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField"; -import { - ChannelFragment, - ExportErrorFragment, - ExportProductsInput, - SearchAttributesQuery, - WarehouseFragment, -} from "@saleor/graphql"; -import useForm, { FormChange } from "@saleor/hooks/useForm"; -import useModalDialogErrors from "@saleor/hooks/useModalDialogErrors"; -import useModalDialogOpen from "@saleor/hooks/useModalDialogOpen"; -import useWizard from "@saleor/hooks/useWizard"; -import { buttonMessages } from "@saleor/intl"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { DialogProps, FetchMoreProps, RelayToFlat } from "@saleor/types"; -import getExportErrorMessage from "@saleor/utils/errors/export"; -import { toggle } from "@saleor/utils/lists"; -import { mapNodeToChoice } from "@saleor/utils/maps"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/products/components/ProductExportDialog/ProductExportDialogInfo.tsx b/src/products/components/ProductExportDialog/ProductExportDialogInfo.tsx index 1916867b1..fe68960a5 100644 --- a/src/products/components/ProductExportDialog/ProductExportDialogInfo.tsx +++ b/src/products/components/ProductExportDialog/ProductExportDialogInfo.tsx @@ -1,3 +1,21 @@ +import Accordion, { AccordionProps } from "@dashboard/components/Accordion"; +import { useChannelsSearch } from "@dashboard/components/ChannelsAvailabilityDialog/utils"; +import ChannelsAvailabilityDialogChannelsList from "@dashboard/components/ChannelsAvailabilityDialogChannelsList"; +import ChannelsAvailabilityDialogContentWrapper from "@dashboard/components/ChannelsAvailabilityDialogWrapper"; +import Checkbox from "@dashboard/components/Checkbox"; +import Chip from "@dashboard/components/Chip"; +import Hr from "@dashboard/components/Hr"; +import { MultiAutocompleteChoiceType } from "@dashboard/components/MultiAutocompleteSelectField"; +import { + ChannelFragment, + ExportProductsInput, + ProductFieldEnum, +} from "@dashboard/graphql"; +import { ChangeEvent, FormChange } from "@dashboard/hooks/useForm"; +import useSearchQuery from "@dashboard/hooks/useSearchQuery"; +import { sectionNames } from "@dashboard/intl"; +import { FetchMoreProps } from "@dashboard/types"; +import { toggle } from "@dashboard/utils/lists"; import { Button, CircularProgress, @@ -5,25 +23,7 @@ import { TextField, Typography, } from "@material-ui/core"; -import Accordion, { AccordionProps } from "@saleor/components/Accordion"; -import { useChannelsSearch } from "@saleor/components/ChannelsAvailabilityDialog/utils"; -import ChannelsAvailabilityDialogChannelsList from "@saleor/components/ChannelsAvailabilityDialogChannelsList"; -import ChannelsAvailabilityDialogContentWrapper from "@saleor/components/ChannelsAvailabilityDialogWrapper"; -import Checkbox from "@saleor/components/Checkbox"; -import Chip from "@saleor/components/Chip"; -import Hr from "@saleor/components/Hr"; -import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField"; -import { - ChannelFragment, - ExportProductsInput, - ProductFieldEnum, -} from "@saleor/graphql"; -import { ChangeEvent, FormChange } from "@saleor/hooks/useForm"; -import useSearchQuery from "@saleor/hooks/useSearchQuery"; -import { sectionNames } from "@saleor/intl"; import { makeStyles } from "@saleor/macaw-ui"; -import { FetchMoreProps } from "@saleor/types"; -import { toggle } from "@saleor/utils/lists"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/products/components/ProductExportDialog/messages.ts b/src/products/components/ProductExportDialog/messages.ts index b716cf848..45494edcb 100644 --- a/src/products/components/ProductExportDialog/messages.ts +++ b/src/products/components/ProductExportDialog/messages.ts @@ -1,4 +1,4 @@ -import { ProductFieldEnum } from "@saleor/graphql"; +import { ProductFieldEnum } from "@dashboard/graphql"; import { defineMessages, useIntl } from "react-intl"; export const productExportDialogMessages = defineMessages({ diff --git a/src/products/components/ProductExportDialog/types.ts b/src/products/components/ProductExportDialog/types.ts index 65c28a3e4..a7ec5fa1e 100644 --- a/src/products/components/ProductExportDialog/types.ts +++ b/src/products/components/ProductExportDialog/types.ts @@ -1,4 +1,4 @@ -import { ExportScope, FileTypesEnum } from "@saleor/graphql"; +import { ExportScope, FileTypesEnum } from "@dashboard/graphql"; export interface ExportSettingsInput { scope: ExportScope; diff --git a/src/products/components/ProductExternalMediaDialog/ProductExternalMediaDialog.tsx b/src/products/components/ProductExternalMediaDialog/ProductExternalMediaDialog.tsx index 5debc59ec..b6820e00b 100644 --- a/src/products/components/ProductExternalMediaDialog/ProductExternalMediaDialog.tsx +++ b/src/products/components/ProductExternalMediaDialog/ProductExternalMediaDialog.tsx @@ -1,3 +1,9 @@ +import BackButton from "@dashboard/components/BackButton"; +import { Button } from "@dashboard/components/Button"; +import Form from "@dashboard/components/Form"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import { ProductFragment } from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; import { Dialog, DialogActions, @@ -6,12 +12,6 @@ import { TextField, Typography, } from "@material-ui/core"; -import BackButton from "@saleor/components/BackButton"; -import { Button } from "@saleor/components/Button"; -import Form from "@saleor/components/Form"; -import FormSpacer from "@saleor/components/FormSpacer"; -import { ProductFragment } from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; import React from "react"; import { defineMessages, FormattedMessage, useIntl } from "react-intl"; diff --git a/src/products/components/ProductList/ProductList.tsx b/src/products/components/ProductList/ProductList.tsx index bc24a8276..acd7c20fa 100644 --- a/src/products/components/ProductList/ProductList.tsx +++ b/src/products/components/ProductList/ProductList.tsx @@ -1,43 +1,43 @@ -import { TableBody, TableCell, TableFooter } from "@material-ui/core"; -import { ChannelsAvailabilityDropdown } from "@saleor/components/ChannelsAvailabilityDropdown"; +import { ChannelsAvailabilityDropdown } from "@dashboard/components/ChannelsAvailabilityDropdown"; import { getChannelAvailabilityColor, getChannelAvailabilityLabel, -} from "@saleor/components/ChannelsAvailabilityDropdown/utils"; -import Checkbox from "@saleor/components/Checkbox"; -import Date from "@saleor/components/Date"; -import MoneyRange from "@saleor/components/MoneyRange"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableCellAvatar from "@saleor/components/TableCellAvatar"; -import { AVATAR_MARGIN } from "@saleor/components/TableCellAvatar/Avatar"; -import TableCellHeader from "@saleor/components/TableCellHeader"; -import TableHead from "@saleor/components/TableHead"; -import { TablePaginationWithContext } from "@saleor/components/TablePagination"; -import TableRowLink from "@saleor/components/TableRowLink"; -import TooltipTableCellHeader from "@saleor/components/TooltipTableCellHeader"; -import { commonTooltipMessages } from "@saleor/components/TooltipTableCellHeader/messages"; -import { ProductListColumns } from "@saleor/config"; -import { GridAttributesQuery, ProductListQuery } from "@saleor/graphql"; -import { makeStyles, Pill } from "@saleor/macaw-ui"; -import { maybe, renderCollection } from "@saleor/misc"; +} from "@dashboard/components/ChannelsAvailabilityDropdown/utils"; +import Checkbox from "@dashboard/components/Checkbox"; +import Date from "@dashboard/components/Date"; +import MoneyRange from "@dashboard/components/MoneyRange"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableCellAvatar from "@dashboard/components/TableCellAvatar"; +import { AVATAR_MARGIN } from "@dashboard/components/TableCellAvatar/Avatar"; +import TableCellHeader from "@dashboard/components/TableCellHeader"; +import TableHead from "@dashboard/components/TableHead"; +import { TablePaginationWithContext } from "@dashboard/components/TablePagination"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import TooltipTableCellHeader from "@dashboard/components/TooltipTableCellHeader"; +import { commonTooltipMessages } from "@dashboard/components/TooltipTableCellHeader/messages"; +import { ProductListColumns } from "@dashboard/config"; +import { GridAttributesQuery, ProductListQuery } from "@dashboard/graphql"; +import { maybe, renderCollection } from "@dashboard/misc"; import { getAttributeIdFromColumnValue, isAttributeColumnValue, -} from "@saleor/products/components/ProductListPage/utils"; -import { ProductListUrlSortField, productUrl } from "@saleor/products/urls"; -import { canBeSorted } from "@saleor/products/views/ProductList/sort"; +} from "@dashboard/products/components/ProductListPage/utils"; +import { ProductListUrlSortField, productUrl } from "@dashboard/products/urls"; +import { canBeSorted } from "@dashboard/products/views/ProductList/sort"; import { ChannelProps, ListActions, ListProps, RelayToFlat, SortPage, -} from "@saleor/types"; +} from "@dashboard/types"; import TDisplayColumn, { DisplayColumnProps, -} from "@saleor/utils/columns/DisplayColumn"; -import { getArrowDirection } from "@saleor/utils/sort"; +} from "@dashboard/utils/columns/DisplayColumn"; +import { getArrowDirection } from "@dashboard/utils/sort"; +import { TableBody, TableCell, TableFooter } from "@material-ui/core"; +import { makeStyles, Pill } from "@saleor/macaw-ui"; import clsx from "clsx"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/products/components/ProductList/ProductListAttribute.tsx b/src/products/components/ProductList/ProductListAttribute.tsx index 61028757d..356e9759c 100644 --- a/src/products/components/ProductList/ProductListAttribute.tsx +++ b/src/products/components/ProductList/ProductListAttribute.tsx @@ -1,6 +1,6 @@ -import Date, { DateTime } from "@saleor/components/Date"; -import Skeleton from "@saleor/components/Skeleton"; -import { ProductListAttributeFragment } from "@saleor/graphql"; +import Date, { DateTime } from "@dashboard/components/Date"; +import Skeleton from "@dashboard/components/Skeleton"; +import { ProductListAttributeFragment } from "@dashboard/graphql"; import React from "react"; import { getAttributeIdFromColumnValue } from "../ProductListPage/utils"; diff --git a/src/products/components/ProductListPage/ProductListPage.stories.tsx b/src/products/components/ProductListPage/ProductListPage.stories.tsx index b6618b58d..23e170920 100644 --- a/src/products/components/ProductListPage/ProductListPage.stories.tsx +++ b/src/products/components/ProductListPage/ProductListPage.stories.tsx @@ -1,5 +1,5 @@ import placeholderImage from "@assets/images/placeholder255x255.png"; -import { defaultListSettings } from "@saleor/config"; +import { defaultListSettings } from "@dashboard/config"; import { fetchMoreProps, filterPageProps, @@ -8,14 +8,14 @@ import { listActionsProps, pageListProps, sortPageProps, -} from "@saleor/fixtures"; -import { products as productListFixture } from "@saleor/products/fixtures"; -import { ProductListUrlSortField } from "@saleor/products/urls"; -import { productListFilterOpts } from "@saleor/products/views/ProductList/fixtures"; -import { attributes } from "@saleor/productTypes/fixtures"; -import Decorator from "@saleor/storybook/Decorator"; -import { PaginatorContextDecorator } from "@saleor/storybook/PaginatorContextDecorator"; -import { ListViews } from "@saleor/types"; +} from "@dashboard/fixtures"; +import { products as productListFixture } from "@dashboard/products/fixtures"; +import { ProductListUrlSortField } from "@dashboard/products/urls"; +import { productListFilterOpts } from "@dashboard/products/views/ProductList/fixtures"; +import { attributes } from "@dashboard/productTypes/fixtures"; +import Decorator from "@dashboard/storybook/Decorator"; +import { PaginatorContextDecorator } from "@dashboard/storybook/PaginatorContextDecorator"; +import { ListViews } from "@dashboard/types"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/products/components/ProductListPage/ProductListPage.tsx b/src/products/components/ProductListPage/ProductListPage.tsx index 7c62b1f43..8e7201774 100644 --- a/src/products/components/ProductListPage/ProductListPage.tsx +++ b/src/products/components/ProductListPage/ProductListPage.tsx @@ -1,28 +1,26 @@ -import { Card } from "@material-ui/core"; import { extensionMountPoints, mapToMenuItems, mapToMenuItemsForProductOverviewActions, useExtensions, -} from "@saleor/apps/useExtensions"; -import { ButtonWithSelect } from "@saleor/components/ButtonWithSelect"; -import CardMenu from "@saleor/components/CardMenu"; -import ColumnPicker from "@saleor/components/ColumnPicker"; -import Container from "@saleor/components/Container"; -import { getByName } from "@saleor/components/Filter/utils"; -import FilterBar from "@saleor/components/FilterBar"; -import LimitReachedAlert from "@saleor/components/LimitReachedAlert"; -import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField"; -import PageHeader from "@saleor/components/PageHeader"; -import { ProductListColumns } from "@saleor/config"; +} from "@dashboard/apps/useExtensions"; +import { ButtonWithSelect } from "@dashboard/components/ButtonWithSelect"; +import CardMenu from "@dashboard/components/CardMenu"; +import ColumnPicker from "@dashboard/components/ColumnPicker"; +import Container from "@dashboard/components/Container"; +import { getByName } from "@dashboard/components/Filter/utils"; +import FilterBar from "@dashboard/components/FilterBar"; +import LimitReachedAlert from "@dashboard/components/LimitReachedAlert"; +import { MultiAutocompleteChoiceType } from "@dashboard/components/MultiAutocompleteSelectField"; +import PageHeader from "@dashboard/components/PageHeader"; +import { ProductListColumns } from "@dashboard/config"; import { GridAttributesQuery, ProductListQuery, RefreshLimitsQuery, SearchAvailableInGridAttributesQuery, -} from "@saleor/graphql"; -import { sectionNames } from "@saleor/intl"; -import { makeStyles } from "@saleor/macaw-ui"; +} from "@dashboard/graphql"; +import { sectionNames } from "@dashboard/intl"; import { ChannelProps, FetchMoreProps, @@ -31,8 +29,10 @@ import { PageListProps, RelayToFlat, SortPage, -} from "@saleor/types"; -import { hasLimits, isLimitReached } from "@saleor/utils/limits"; +} from "@dashboard/types"; +import { hasLimits, isLimitReached } from "@dashboard/utils/limits"; +import { Card } from "@material-ui/core"; +import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/products/components/ProductListPage/filters.ts b/src/products/components/ProductListPage/filters.ts index cd1a5606d..32418c571 100644 --- a/src/products/components/ProductListPage/filters.ts +++ b/src/products/components/ProductListPage/filters.ts @@ -1,14 +1,14 @@ -import { IFilter } from "@saleor/components/Filter"; -import { SingleAutocompleteChoiceType } from "@saleor/components/SingleAutocompleteSelectField"; -import { AttributeInputTypeEnum, StockAvailability } from "@saleor/graphql"; -import { commonMessages, sectionNames } from "@saleor/intl"; -import { ProductListUrlFiltersAsDictWithMultipleValues } from "@saleor/products/urls"; +import { IFilter } from "@dashboard/components/Filter"; +import { SingleAutocompleteChoiceType } from "@dashboard/components/SingleAutocompleteSelectField"; +import { AttributeInputTypeEnum, StockAvailability } from "@dashboard/graphql"; +import { commonMessages, sectionNames } from "@dashboard/intl"; +import { ProductListUrlFiltersAsDictWithMultipleValues } from "@dashboard/products/urls"; import { AutocompleteFilterOpts, FilterOpts, KeyValue, MinMax, -} from "@saleor/types"; +} from "@dashboard/types"; import { createAutocompleteField, createBooleanField, @@ -18,7 +18,7 @@ import { createNumberField, createOptionsField, createPriceField, -} from "@saleor/utils/filters/fields"; +} from "@dashboard/utils/filters/fields"; import { defineMessages, IntlShape } from "react-intl"; export const ProductFilterKeys = { diff --git a/src/products/components/ProductMedia/ProductMedia.tsx b/src/products/components/ProductMedia/ProductMedia.tsx index 42f347459..d4cae1bf3 100644 --- a/src/products/components/ProductMedia/ProductMedia.tsx +++ b/src/products/components/ProductMedia/ProductMedia.tsx @@ -1,13 +1,13 @@ +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import ImageUpload from "@dashboard/components/ImageUpload"; +import MediaTile from "@dashboard/components/MediaTile"; +import { ProductMediaFragment, ProductMediaType } from "@dashboard/graphql"; +import { ProductMediaPopper } from "@dashboard/products/components/ProductMediaPopper/ProductMediaPopper"; +import { ReorderAction } from "@dashboard/types"; +import createMultiFileUploadHandler from "@dashboard/utils/handlers/multiFileUploadHandler"; import { Card, CardContent } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import ImageUpload from "@saleor/components/ImageUpload"; -import MediaTile from "@saleor/components/MediaTile"; -import { ProductMediaFragment, ProductMediaType } from "@saleor/graphql"; import { makeStyles } from "@saleor/macaw-ui"; -import { ProductMediaPopper } from "@saleor/products/components/ProductMediaPopper/ProductMediaPopper"; -import { ReorderAction } from "@saleor/types"; -import createMultiFileUploadHandler from "@saleor/utils/handlers/multiFileUploadHandler"; import clsx from "clsx"; import React from "react"; import { defineMessages, useIntl } from "react-intl"; diff --git a/src/products/components/ProductMediaNavigation/ProductMediaNavigation.tsx b/src/products/components/ProductMediaNavigation/ProductMediaNavigation.tsx index e796bdd5a..18def68c6 100644 --- a/src/products/components/ProductMediaNavigation/ProductMediaNavigation.tsx +++ b/src/products/components/ProductMediaNavigation/ProductMediaNavigation.tsx @@ -1,6 +1,6 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import Skeleton from "@dashboard/components/Skeleton"; import { Card, CardContent } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import Skeleton from "@saleor/components/Skeleton"; import { makeStyles } from "@saleor/macaw-ui"; import clsx from "clsx"; import React from "react"; diff --git a/src/products/components/ProductMediaPage/ProductMediaPage.stories.tsx b/src/products/components/ProductMediaPage/ProductMediaPage.stories.tsx index a7a3f25f4..c6518011e 100644 --- a/src/products/components/ProductMediaPage/ProductMediaPage.stories.tsx +++ b/src/products/components/ProductMediaPage/ProductMediaPage.stories.tsx @@ -1,6 +1,6 @@ import placeholder from "@assets/images/placeholder1080x1080.png"; -import { ProductMediaType } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; +import { ProductMediaType } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/products/components/ProductMediaPage/ProductMediaPage.tsx b/src/products/components/ProductMediaPage/ProductMediaPage.tsx index 7a6c3c1b7..eb3294c9d 100644 --- a/src/products/components/ProductMediaPage/ProductMediaPage.tsx +++ b/src/products/components/ProductMediaPage/ProductMediaPage.tsx @@ -1,17 +1,17 @@ +import { Backlink } from "@dashboard/components/Backlink"; +import CardTitle from "@dashboard/components/CardTitle"; +import Container from "@dashboard/components/Container"; +import Form from "@dashboard/components/Form"; +import Grid from "@dashboard/components/Grid"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; +import Skeleton from "@dashboard/components/Skeleton"; +import { ProductMediaType } from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { commonMessages } from "@dashboard/intl"; +import { productUrl } from "@dashboard/products/urls"; import { Card, CardContent, TextField } from "@material-ui/core"; -import { Backlink } from "@saleor/components/Backlink"; -import CardTitle from "@saleor/components/CardTitle"; -import Container from "@saleor/components/Container"; -import Form from "@saleor/components/Form"; -import Grid from "@saleor/components/Grid"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; -import Skeleton from "@saleor/components/Skeleton"; -import { ProductMediaType } from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { commonMessages } from "@saleor/intl"; import { ConfirmButtonTransitionState, makeStyles } from "@saleor/macaw-ui"; -import { productUrl } from "@saleor/products/urls"; import React from "react"; import { defineMessages, useIntl } from "react-intl"; diff --git a/src/products/components/ProductOrganization/ProductOrganization.tsx b/src/products/components/ProductOrganization/ProductOrganization.tsx index 8bb0bf488..dbbb9e2cf 100644 --- a/src/products/components/ProductOrganization/ProductOrganization.tsx +++ b/src/products/components/ProductOrganization/ProductOrganization.tsx @@ -1,27 +1,27 @@ -import { Card, CardContent, Typography } from "@material-ui/core"; -import CardSpacer from "@saleor/components/CardSpacer"; -import CardTitle from "@saleor/components/CardTitle"; -import { FormSpacer } from "@saleor/components/FormSpacer"; -import Hr from "@saleor/components/Hr"; -import Link from "@saleor/components/Link"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import CardTitle from "@dashboard/components/CardTitle"; +import { FormSpacer } from "@dashboard/components/FormSpacer"; +import Hr from "@dashboard/components/Hr"; +import Link from "@dashboard/components/Link"; import MultiAutocompleteSelectField, { MultiAutocompleteChoiceType, -} from "@saleor/components/MultiAutocompleteSelectField"; +} from "@dashboard/components/MultiAutocompleteSelectField"; import SingleAutocompleteSelectField, { SingleAutocompleteChoiceType, -} from "@saleor/components/SingleAutocompleteSelectField"; +} from "@dashboard/components/SingleAutocompleteSelectField"; import { ProductChannelListingErrorFragment, ProductErrorCode, ProductErrorFragment, -} from "@saleor/graphql"; -import { ChangeEvent } from "@saleor/hooks/useForm"; -import { commonMessages } from "@saleor/intl"; +} from "@dashboard/graphql"; +import { ChangeEvent } from "@dashboard/hooks/useForm"; +import { commonMessages } from "@dashboard/intl"; +import { maybe } from "@dashboard/misc"; +import { productTypeUrl } from "@dashboard/productTypes/urls"; +import { FetchMoreProps } from "@dashboard/types"; +import { getFormErrors, getProductErrorMessage } from "@dashboard/utils/errors"; +import { Card, CardContent, Typography } from "@material-ui/core"; import { makeStyles } from "@saleor/macaw-ui"; -import { maybe } from "@saleor/misc"; -import { productTypeUrl } from "@saleor/productTypes/urls"; -import { FetchMoreProps } from "@saleor/types"; -import { getFormErrors, getProductErrorMessage } from "@saleor/utils/errors"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/products/components/ProductShipping/ProductShipping.tsx b/src/products/components/ProductShipping/ProductShipping.tsx index be53369bb..abc09329b 100644 --- a/src/products/components/ProductShipping/ProductShipping.tsx +++ b/src/products/components/ProductShipping/ProductShipping.tsx @@ -1,14 +1,14 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import Grid from "@dashboard/components/Grid"; +import { ProductErrorFragment } from "@dashboard/graphql"; +import { getFormErrors, getProductErrorMessage } from "@dashboard/utils/errors"; +import createNonNegativeValueChangeHandler from "@dashboard/utils/handlers/nonNegativeValueChangeHandler"; import { Card, CardContent, InputAdornment, TextField, } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import Grid from "@saleor/components/Grid"; -import { ProductErrorFragment } from "@saleor/graphql"; -import { getFormErrors, getProductErrorMessage } from "@saleor/utils/errors"; -import createNonNegativeValueChangeHandler from "@saleor/utils/handlers/nonNegativeValueChangeHandler"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/products/components/ProductStocks/CardAddItemsFooter.tsx b/src/products/components/ProductStocks/CardAddItemsFooter.tsx index 2e4a3c9d5..06b3a7c37 100644 --- a/src/products/components/ProductStocks/CardAddItemsFooter.tsx +++ b/src/products/components/ProductStocks/CardAddItemsFooter.tsx @@ -1,5 +1,5 @@ +import Link from "@dashboard/components/Link"; import AddIcon from "@material-ui/icons/Add"; -import Link from "@saleor/components/Link"; import { IconButton, makeStyles } from "@saleor/macaw-ui"; import React, { MutableRefObject } from "react"; diff --git a/src/products/components/ProductStocks/ProductStocks.tsx b/src/products/components/ProductStocks/ProductStocks.tsx index 5e2a97321..a1f87e6ce 100644 --- a/src/products/components/ProductStocks/ProductStocks.tsx +++ b/src/products/components/ProductStocks/ProductStocks.tsx @@ -1,3 +1,22 @@ +import { + ChannelData, + ChannelPriceAndPreorderArgs, +} from "@dashboard/channels/utils"; +import CardTitle from "@dashboard/components/CardTitle"; +import ControlledCheckbox from "@dashboard/components/ControlledCheckbox"; +import { DateTimeTimezoneField } from "@dashboard/components/DateTimeTimezoneField"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import Hr from "@dashboard/components/Hr"; +import Link from "@dashboard/components/Link"; +import PreviewPill from "@dashboard/components/PreviewPill"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { ProductErrorFragment, WarehouseFragment } from "@dashboard/graphql"; +import { FormChange, FormErrors } from "@dashboard/hooks/useForm"; +import { FormsetAtomicData, FormsetChange } from "@dashboard/hooks/useFormset"; +import { sectionNames } from "@dashboard/intl"; +import { renderCollection } from "@dashboard/misc"; +import { getFormErrors, getProductErrorMessage } from "@dashboard/utils/errors"; +import createNonNegativeValueChangeHandler from "@dashboard/utils/handlers/nonNegativeValueChangeHandler"; import { Card, CardContent, @@ -13,26 +32,7 @@ import { TextField, Typography, } from "@material-ui/core"; -import { - ChannelData, - ChannelPriceAndPreorderArgs, -} from "@saleor/channels/utils"; -import CardTitle from "@saleor/components/CardTitle"; -import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; -import { DateTimeTimezoneField } from "@saleor/components/DateTimeTimezoneField"; -import FormSpacer from "@saleor/components/FormSpacer"; -import Hr from "@saleor/components/Hr"; -import Link from "@saleor/components/Link"; -import PreviewPill from "@saleor/components/PreviewPill"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { ProductErrorFragment, WarehouseFragment } from "@saleor/graphql"; -import { FormChange, FormErrors } from "@saleor/hooks/useForm"; -import { FormsetAtomicData, FormsetChange } from "@saleor/hooks/useFormset"; -import { sectionNames } from "@saleor/intl"; import { Button, DeleteIcon, IconButton, PlusIcon } from "@saleor/macaw-ui"; -import { renderCollection } from "@saleor/misc"; -import { getFormErrors, getProductErrorMessage } from "@saleor/utils/errors"; -import createNonNegativeValueChangeHandler from "@saleor/utils/handlers/nonNegativeValueChangeHandler"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/products/components/ProductTaxes/ProductTaxes.tsx b/src/products/components/ProductTaxes/ProductTaxes.tsx index 0140f760b..39a7c3994 100644 --- a/src/products/components/ProductTaxes/ProductTaxes.tsx +++ b/src/products/components/ProductTaxes/ProductTaxes.tsx @@ -1,11 +1,11 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import SingleAutocompleteSelectField from "@dashboard/components/SingleAutocompleteSelectField"; +import { TaxClassBaseFragment } from "@dashboard/graphql"; +import { sectionNames } from "@dashboard/intl"; +import { taxesMessages } from "@dashboard/taxes/messages"; +import { FetchMoreProps } from "@dashboard/types"; import { Card, CardContent } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import SingleAutocompleteSelectField from "@saleor/components/SingleAutocompleteSelectField"; -import { TaxClassBaseFragment } from "@saleor/graphql"; -import { sectionNames } from "@saleor/intl"; import { makeStyles } from "@saleor/macaw-ui"; -import { taxesMessages } from "@saleor/taxes/messages"; -import { FetchMoreProps } from "@saleor/types"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/products/components/ProductTypePickerDialog/ProductTypePickerDialog.tsx b/src/products/components/ProductTypePickerDialog/ProductTypePickerDialog.tsx index 51dce95a2..56d853263 100644 --- a/src/products/components/ProductTypePickerDialog/ProductTypePickerDialog.tsx +++ b/src/products/components/ProductTypePickerDialog/ProductTypePickerDialog.tsx @@ -1,11 +1,11 @@ -import ActionDialog from "@saleor/components/ActionDialog"; +import ActionDialog from "@dashboard/components/ActionDialog"; import SingleAutocompleteSelectField, { SingleAutocompleteChoiceType, -} from "@saleor/components/SingleAutocompleteSelectField"; -import useModalDialogOpen from "@saleor/hooks/useModalDialogOpen"; -import useStateFromProps from "@saleor/hooks/useStateFromProps"; +} from "@dashboard/components/SingleAutocompleteSelectField"; +import useModalDialogOpen from "@dashboard/hooks/useModalDialogOpen"; +import useStateFromProps from "@dashboard/hooks/useStateFromProps"; +import { FetchMoreProps } from "@dashboard/types"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { FetchMoreProps } from "@saleor/types"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/products/components/ProductUpdatePage/ProductChannelsListingsDialog.tsx b/src/products/components/ProductUpdatePage/ProductChannelsListingsDialog.tsx index e0dd4529e..c3daa2850 100644 --- a/src/products/components/ProductUpdatePage/ProductChannelsListingsDialog.tsx +++ b/src/products/components/ProductUpdatePage/ProductChannelsListingsDialog.tsx @@ -1,9 +1,9 @@ -import ChannelsAvailabilityDialog from "@saleor/components/ChannelsAvailabilityDialog"; -import { ChannelFragment } from "@saleor/graphql"; -import useStateFromProps from "@saleor/hooks/useStateFromProps"; -import { DialogProps } from "@saleor/types"; -import { arrayDiff } from "@saleor/utils/arrays"; -import { toggle } from "@saleor/utils/lists"; +import ChannelsAvailabilityDialog from "@dashboard/components/ChannelsAvailabilityDialog"; +import { ChannelFragment } from "@dashboard/graphql"; +import useStateFromProps from "@dashboard/hooks/useStateFromProps"; +import { DialogProps } from "@dashboard/types"; +import { arrayDiff } from "@dashboard/utils/arrays"; +import { toggle } from "@dashboard/utils/lists"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/products/components/ProductUpdatePage/ProductUpdatePage.stories.tsx b/src/products/components/ProductUpdatePage/ProductUpdatePage.stories.tsx index 7be8fa56c..b9b3be5ab 100644 --- a/src/products/components/ProductUpdatePage/ProductUpdatePage.stories.tsx +++ b/src/products/components/ProductUpdatePage/ProductUpdatePage.stories.tsx @@ -1,11 +1,11 @@ import placeholderImage from "@assets/images/placeholder255x255.png"; -import { channelsList } from "@saleor/channels/fixtures"; -import { collections } from "@saleor/collections/fixtures"; -import { fetchMoreProps, limits, limitsReached } from "@saleor/fixtures"; -import { ProductErrorCode } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; -import { taxClasses } from "@saleor/taxes/fixtures"; -import { warehouseList } from "@saleor/warehouses/fixtures"; +import { channelsList } from "@dashboard/channels/fixtures"; +import { collections } from "@dashboard/collections/fixtures"; +import { fetchMoreProps, limits, limitsReached } from "@dashboard/fixtures"; +import { ProductErrorCode } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; +import { taxClasses } from "@dashboard/taxes/fixtures"; +import { warehouseList } from "@dashboard/warehouses/fixtures"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/products/components/ProductUpdatePage/ProductUpdatePage.test.tsx b/src/products/components/ProductUpdatePage/ProductUpdatePage.test.tsx index 46b899c7c..258e6aafe 100644 --- a/src/products/components/ProductUpdatePage/ProductUpdatePage.test.tsx +++ b/src/products/components/ProductUpdatePage/ProductUpdatePage.test.tsx @@ -1,11 +1,11 @@ import placeholderImage from "@assets/images/placeholder255x255.png"; -import { channelsList } from "@saleor/channels/fixtures"; -import { collections } from "@saleor/collections/fixtures"; -import { fetchMoreProps, limits } from "@saleor/fixtures"; -import * as _useNavigator from "@saleor/hooks/useNavigator"; -import { product as productFixture } from "@saleor/products/fixtures"; -import { taxClasses } from "@saleor/taxes/fixtures"; -import { warehouseList } from "@saleor/warehouses/fixtures"; +import { channelsList } from "@dashboard/channels/fixtures"; +import { collections } from "@dashboard/collections/fixtures"; +import { fetchMoreProps, limits } from "@dashboard/fixtures"; +import * as _useNavigator from "@dashboard/hooks/useNavigator"; +import { product as productFixture } from "@dashboard/products/fixtures"; +import { taxClasses } from "@dashboard/taxes/fixtures"; +import { warehouseList } from "@dashboard/warehouses/fixtures"; import Wrapper from "@test/wrapper"; import { fireEvent, render, screen, waitFor } from "@testing-library/react"; import userEvent from "@testing-library/user-event"; @@ -18,8 +18,8 @@ const product = productFixture(placeholderImage); const onSubmit = jest.fn(); const useNavigator = jest.spyOn(_useNavigator, "default"); -jest.mock("@saleor/components/RichTextEditor/RichTextEditor"); -jest.mock("@saleor/utils/richText/useRichText"); +jest.mock("@dashboard/components/RichTextEditor/RichTextEditor"); +jest.mock("@dashboard/utils/richText/useRichText"); /** * Mocking glide library. We do want to test only if page renders, grid itself has dedicated tests. */ diff --git a/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx b/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx index fb0c1060e..e9c3b1c18 100644 --- a/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx +++ b/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx @@ -2,25 +2,25 @@ import { extensionMountPoints, mapToMenuItemsForProductDetails, useExtensions, -} from "@saleor/apps/useExtensions"; +} from "@dashboard/apps/useExtensions"; import { getReferenceAttributeEntityTypeFromAttribute, mergeAttributeValues, -} from "@saleor/attributes/utils/data"; -import { ChannelData } from "@saleor/channels/utils"; -import AssignAttributeValueDialog from "@saleor/components/AssignAttributeValueDialog"; -import Attributes, { AttributeInput } from "@saleor/components/Attributes"; -import { Backlink } from "@saleor/components/Backlink"; -import CardMenu from "@saleor/components/CardMenu"; -import CardSpacer from "@saleor/components/CardSpacer"; -import ChannelsAvailabilityCard from "@saleor/components/ChannelsAvailabilityCard"; -import Container from "@saleor/components/Container"; -import Grid from "@saleor/components/Grid"; -import Metadata from "@saleor/components/Metadata/Metadata"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; -import SeoForm from "@saleor/components/SeoForm"; -import { Choice } from "@saleor/components/SingleSelectField"; +} from "@dashboard/attributes/utils/data"; +import { ChannelData } from "@dashboard/channels/utils"; +import AssignAttributeValueDialog from "@dashboard/components/AssignAttributeValueDialog"; +import Attributes, { AttributeInput } from "@dashboard/components/Attributes"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardMenu from "@dashboard/components/CardMenu"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import ChannelsAvailabilityCard from "@dashboard/components/ChannelsAvailabilityCard"; +import Container from "@dashboard/components/Container"; +import Grid from "@dashboard/components/Grid"; +import Metadata from "@dashboard/components/Metadata/Metadata"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; +import SeoForm from "@dashboard/components/SeoForm"; +import { Choice } from "@dashboard/components/SingleSelectField"; import { ChannelFragment, PermissionEnum, @@ -37,18 +37,18 @@ import { SearchProductsQuery, TaxClassBaseFragment, WarehouseFragment, -} from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useStateFromProps from "@saleor/hooks/useStateFromProps"; -import { sectionNames } from "@saleor/intl"; +} from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useStateFromProps from "@dashboard/hooks/useStateFromProps"; +import { sectionNames } from "@dashboard/intl"; +import { maybe } from "@dashboard/misc"; +import ProductExternalMediaDialog from "@dashboard/products/components/ProductExternalMediaDialog"; +import { productImageUrl, productListUrl } from "@dashboard/products/urls"; +import { ProductVariantListError } from "@dashboard/products/views/ProductUpdate/handlers/errors"; +import { UseProductUpdateHandlerError } from "@dashboard/products/views/ProductUpdate/handlers/useProductUpdateHandler"; +import { FetchMoreProps, RelayToFlat } from "@dashboard/types"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { maybe } from "@saleor/misc"; -import ProductExternalMediaDialog from "@saleor/products/components/ProductExternalMediaDialog"; -import { productImageUrl, productListUrl } from "@saleor/products/urls"; -import { ProductVariantListError } from "@saleor/products/views/ProductUpdate/handlers/errors"; -import { UseProductUpdateHandlerError } from "@saleor/products/views/ProductUpdate/handlers/useProductUpdateHandler"; -import { FetchMoreProps, RelayToFlat } from "@saleor/types"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/products/components/ProductUpdatePage/form.tsx b/src/products/components/ProductUpdatePage/form.tsx index f876df089..5e815a73d 100644 --- a/src/products/components/ProductUpdatePage/form.tsx +++ b/src/products/components/ProductUpdatePage/form.tsx @@ -3,7 +3,7 @@ import { getRichTextAttributesFromMap, getRichTextDataFromAttributes, mergeAttributes, -} from "@saleor/attributes/utils/data"; +} from "@dashboard/attributes/utils/data"; import { createAttributeChangeHandler, createAttributeFileChangeHandler, @@ -12,30 +12,30 @@ import { createAttributeValueReorderHandler, createFetchMoreReferencesHandler, createFetchReferencesHandler, -} from "@saleor/attributes/utils/handlers"; +} from "@dashboard/attributes/utils/handlers"; import { DatagridChangeOpts, DatagridChangeStateContext, useDatagridChangeState, -} from "@saleor/components/Datagrid/useDatagridChange"; -import { useExitFormDialog } from "@saleor/components/Form/useExitFormDialog"; -import { ProductFragment } from "@saleor/graphql"; -import useForm from "@saleor/hooks/useForm"; -import useFormset from "@saleor/hooks/useFormset"; -import useHandleFormSubmit from "@saleor/hooks/useHandleFormSubmit"; -import useLocale from "@saleor/hooks/useLocale"; +} from "@dashboard/components/Datagrid/useDatagridChange"; +import { useExitFormDialog } from "@dashboard/components/Form/useExitFormDialog"; +import { ProductFragment } from "@dashboard/graphql"; +import useForm from "@dashboard/hooks/useForm"; +import useFormset from "@dashboard/hooks/useFormset"; +import useHandleFormSubmit from "@dashboard/hooks/useHandleFormSubmit"; +import useLocale from "@dashboard/hooks/useLocale"; import { getAttributeInputFromProduct, getProductUpdatePageFormData, -} from "@saleor/products/utils/data"; -import { PRODUCT_UPDATE_FORM_ID } from "@saleor/products/views/ProductUpdate/consts"; -import createMultiAutocompleteSelectHandler from "@saleor/utils/handlers/multiAutocompleteSelectChangeHandler"; -import createSingleAutocompleteSelectHandler from "@saleor/utils/handlers/singleAutocompleteSelectChangeHandler"; -import getMetadata from "@saleor/utils/metadata/getMetadata"; -import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger"; -import { RichTextContext } from "@saleor/utils/richText/context"; -import { useMultipleRichText } from "@saleor/utils/richText/useMultipleRichText"; -import useRichText from "@saleor/utils/richText/useRichText"; +} from "@dashboard/products/utils/data"; +import { PRODUCT_UPDATE_FORM_ID } from "@dashboard/products/views/ProductUpdate/consts"; +import createMultiAutocompleteSelectHandler from "@dashboard/utils/handlers/multiAutocompleteSelectChangeHandler"; +import createSingleAutocompleteSelectHandler from "@dashboard/utils/handlers/singleAutocompleteSelectChangeHandler"; +import getMetadata from "@dashboard/utils/metadata/getMetadata"; +import useMetadataChangeTrigger from "@dashboard/utils/metadata/useMetadataChangeTrigger"; +import { RichTextContext } from "@dashboard/utils/richText/context"; +import { useMultipleRichText } from "@dashboard/utils/richText/useMultipleRichText"; +import useRichText from "@dashboard/utils/richText/useRichText"; import React, { useCallback, useEffect, useMemo, useRef } from "react"; import { useProductChannelListingsForm } from "./formChannels"; diff --git a/src/products/components/ProductUpdatePage/formChannels.ts b/src/products/components/ProductUpdatePage/formChannels.ts index 88b7a0e1c..2477425b8 100644 --- a/src/products/components/ProductUpdatePage/formChannels.ts +++ b/src/products/components/ProductUpdatePage/formChannels.ts @@ -1,10 +1,10 @@ -import { ChannelOpts } from "@saleor/components/ChannelsAvailabilityCard/types"; +import { ChannelOpts } from "@dashboard/components/ChannelsAvailabilityCard/types"; import { ProductChannelListingAddInput, ProductChannelListingUpdateInput, ProductFragment, -} from "@saleor/graphql"; -import useStateFromProps from "@saleor/hooks/useStateFromProps"; +} from "@dashboard/graphql"; +import useStateFromProps from "@dashboard/hooks/useStateFromProps"; import uniq from "lodash/uniq"; import uniqBy from "lodash/uniqBy"; import { useCallback, useRef } from "react"; diff --git a/src/products/components/ProductUpdatePage/types.ts b/src/products/components/ProductUpdatePage/types.ts index fb83d7592..ae2add376 100644 --- a/src/products/components/ProductUpdatePage/types.ts +++ b/src/products/components/ProductUpdatePage/types.ts @@ -1,14 +1,13 @@ -import { OutputData } from "@editorjs/editorjs"; -import { RichTextProps } from "@saleor/attributes/utils/data"; -import { AttributeInput } from "@saleor/components/Attributes"; -import { ChannelOpts } from "@saleor/components/ChannelsAvailabilityCard/types"; +import { RichTextProps } from "@dashboard/attributes/utils/data"; +import { AttributeInput } from "@dashboard/components/Attributes"; +import { ChannelOpts } from "@dashboard/components/ChannelsAvailabilityCard/types"; import { DatagridChangeOpts, UseDatagridChangeState, -} from "@saleor/components/Datagrid/useDatagridChange"; -import { MetadataFormData } from "@saleor/components/Metadata"; -import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField"; -import { SingleAutocompleteChoiceType } from "@saleor/components/SingleAutocompleteSelectField"; +} from "@dashboard/components/Datagrid/useDatagridChange"; +import { MetadataFormData } from "@dashboard/components/Metadata"; +import { MultiAutocompleteChoiceType } from "@dashboard/components/MultiAutocompleteSelectField"; +import { SingleAutocompleteChoiceType } from "@dashboard/components/SingleAutocompleteSelectField"; import { MetadataErrorFragment, ProductChannelListingUpdateInput, @@ -16,20 +15,21 @@ import { SearchPagesQuery, SearchProductsQuery, SearchWarehousesQuery, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import { CommonUseFormResultWithHandlers, FormChange, FormErrors, SubmitPromise, -} from "@saleor/hooks/useForm"; +} from "@dashboard/hooks/useForm"; import { FormsetAtomicData, FormsetChange, FormsetData, -} from "@saleor/hooks/useFormset"; -import { UseProductUpdateHandlerError } from "@saleor/products/views/ProductUpdate/handlers/useProductUpdateHandler"; -import { FetchMoreProps, RelayToFlat, ReorderEvent } from "@saleor/types"; +} from "@dashboard/hooks/useFormset"; +import { UseProductUpdateHandlerError } from "@dashboard/products/views/ProductUpdate/handlers/useProductUpdateHandler"; +import { FetchMoreProps, RelayToFlat, ReorderEvent } from "@dashboard/types"; +import { OutputData } from "@editorjs/editorjs"; import { ProductChannelsListingDialogSubmit } from "./ProductChannelsListingsDialog"; diff --git a/src/products/components/ProductUpdatePage/utils.test.ts b/src/products/components/ProductUpdatePage/utils.test.ts index 9a1bc5609..9486e55fb 100644 --- a/src/products/components/ProductUpdatePage/utils.test.ts +++ b/src/products/components/ProductUpdatePage/utils.test.ts @@ -1,4 +1,4 @@ -import { Locale } from "@saleor/components/Locale"; +import { Locale } from "@dashboard/components/Locale"; import { parseCurrency } from "./utils"; diff --git a/src/products/components/ProductUpdatePage/utils.ts b/src/products/components/ProductUpdatePage/utils.ts index 918d68e9a..6388d8769 100644 --- a/src/products/components/ProductUpdatePage/utils.ts +++ b/src/products/components/ProductUpdatePage/utils.ts @@ -1,9 +1,9 @@ import { DatagridChange, DatagridChangeOpts, -} from "@saleor/components/Datagrid/useDatagridChange"; -import { Locale } from "@saleor/components/Locale"; -import { ProductFragment } from "@saleor/graphql"; +} from "@dashboard/components/Datagrid/useDatagridChange"; +import { Locale } from "@dashboard/components/Locale"; +import { ProductFragment } from "@dashboard/graphql"; const getFractionDigits = (locale: Locale, currency: string) => { try { diff --git a/src/products/components/ProductVariantAttributes/ProductVariantAttributes.tsx b/src/products/components/ProductVariantAttributes/ProductVariantAttributes.tsx index a90ae4a6a..5d67c77e0 100644 --- a/src/products/components/ProductVariantAttributes/ProductVariantAttributes.tsx +++ b/src/products/components/ProductVariantAttributes/ProductVariantAttributes.tsx @@ -1,18 +1,18 @@ -import { Card, CardContent, Typography } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import FormSpacer from "@saleor/components/FormSpacer"; -import Grid from "@saleor/components/Grid"; +import CardTitle from "@dashboard/components/CardTitle"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import Grid from "@dashboard/components/Grid"; import SingleAutocompleteSelectField, { SingleAutocompleteChoiceType, -} from "@saleor/components/SingleAutocompleteSelectField"; -import Skeleton from "@saleor/components/Skeleton"; +} from "@dashboard/components/SingleAutocompleteSelectField"; +import Skeleton from "@dashboard/components/Skeleton"; import { ProductErrorWithAttributesFragment, ProductVariantFragment, -} from "@saleor/graphql"; -import { FormsetAtomicData, FormsetChange } from "@saleor/hooks/useFormset"; -import { commonMessages } from "@saleor/intl"; -import { getProductVariantAttributeErrorMessage } from "@saleor/utils/errors/product"; +} from "@dashboard/graphql"; +import { FormsetAtomicData, FormsetChange } from "@dashboard/hooks/useFormset"; +import { commonMessages } from "@dashboard/intl"; +import { getProductVariantAttributeErrorMessage } from "@dashboard/utils/errors/product"; +import { Card, CardContent, Typography } from "@material-ui/core"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/products/components/ProductVariantChannels/ChannelsAvailabilityCard/CardSkeleton.tsx b/src/products/components/ProductVariantChannels/ChannelsAvailabilityCard/CardSkeleton.tsx index 374ec5c51..5e53fd386 100644 --- a/src/products/components/ProductVariantChannels/ChannelsAvailabilityCard/CardSkeleton.tsx +++ b/src/products/components/ProductVariantChannels/ChannelsAvailabilityCard/CardSkeleton.tsx @@ -1,5 +1,5 @@ +import Skeleton from "@dashboard/components/Skeleton"; import { CardContent } from "@material-ui/core"; -import Skeleton from "@saleor/components/Skeleton"; import React from "react"; import CardContainer from "./VariantDetailsChannelsAvailabilityCardContainer"; diff --git a/src/products/components/ProductVariantChannels/ChannelsAvailabilityCard/ChannelsListItem.tsx b/src/products/components/ProductVariantChannels/ChannelsAvailabilityCard/ChannelsListItem.tsx index d5f1e84d3..81f05f930 100644 --- a/src/products/components/ProductVariantChannels/ChannelsAvailabilityCard/ChannelsListItem.tsx +++ b/src/products/components/ProductVariantChannels/ChannelsAvailabilityCard/ChannelsListItem.tsx @@ -1,5 +1,5 @@ +import useDateLocalize from "@dashboard/hooks/useDateLocalize"; import { CardContent, Divider, Typography } from "@material-ui/core"; -import useDateLocalize from "@saleor/hooks/useDateLocalize"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/products/components/ProductVariantChannels/ChannelsAvailabilityCard/CreateVariantTitle.tsx b/src/products/components/ProductVariantChannels/ChannelsAvailabilityCard/CreateVariantTitle.tsx index 70bf6c57a..b3c159839 100644 --- a/src/products/components/ProductVariantChannels/ChannelsAvailabilityCard/CreateVariantTitle.tsx +++ b/src/products/components/ProductVariantChannels/ChannelsAvailabilityCard/CreateVariantTitle.tsx @@ -1,5 +1,5 @@ -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/products/components/ProductVariantChannels/ChannelsAvailabilityCard/VariantDetailsChannelsAvailabilityCardContainer.tsx b/src/products/components/ProductVariantChannels/ChannelsAvailabilityCard/VariantDetailsChannelsAvailabilityCardContainer.tsx index 3775d763e..4923a84bb 100644 --- a/src/products/components/ProductVariantChannels/ChannelsAvailabilityCard/VariantDetailsChannelsAvailabilityCardContainer.tsx +++ b/src/products/components/ProductVariantChannels/ChannelsAvailabilityCard/VariantDetailsChannelsAvailabilityCardContainer.tsx @@ -1,6 +1,6 @@ +import CardSpacer from "@dashboard/components/CardSpacer"; +import CardTitle from "@dashboard/components/CardTitle"; import { Card } from "@material-ui/core"; -import CardSpacer from "@saleor/components/CardSpacer"; -import CardTitle from "@saleor/components/CardTitle"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/products/components/ProductVariantChannels/ChannelsAvailabilityCard/availabilityCount.ts b/src/products/components/ProductVariantChannels/ChannelsAvailabilityCard/availabilityCount.ts index 1a9738b64..4d28d2dd4 100644 --- a/src/products/components/ProductVariantChannels/ChannelsAvailabilityCard/availabilityCount.ts +++ b/src/products/components/ProductVariantChannels/ChannelsAvailabilityCard/availabilityCount.ts @@ -1,7 +1,7 @@ import { ProductVariantCreateDataQuery, ProductVariantFragment, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; export const getAvailabilityCountForVariant = ( item: ProductVariantFragment, diff --git a/src/products/components/ProductVariantChannels/VariantChannelsDialog/index.tsx b/src/products/components/ProductVariantChannels/VariantChannelsDialog/index.tsx index 75aec4a3b..1681e2378 100644 --- a/src/products/components/ProductVariantChannels/VariantChannelsDialog/index.tsx +++ b/src/products/components/ProductVariantChannels/VariantChannelsDialog/index.tsx @@ -1,11 +1,11 @@ import { ChannelPriceAndPreorderData, IChannelPriceAndPreorderArgs, -} from "@saleor/channels/utils"; -import ChannelsAvailabilityDialog from "@saleor/components/ChannelsAvailabilityDialog"; -import { FormsetData } from "@saleor/hooks/useFormset"; -import useModalDialogOpen from "@saleor/hooks/useModalDialogOpen"; -import { toggle } from "@saleor/utils/lists"; +} from "@dashboard/channels/utils"; +import ChannelsAvailabilityDialog from "@dashboard/components/ChannelsAvailabilityDialog"; +import { FormsetData } from "@dashboard/hooks/useFormset"; +import useModalDialogOpen from "@dashboard/hooks/useModalDialogOpen"; +import { toggle } from "@dashboard/utils/lists"; import React, { useState } from "react"; import { ProductChannelListing } from "../types"; diff --git a/src/products/components/ProductVariantChannels/formOpretations.ts b/src/products/components/ProductVariantChannels/formOpretations.ts index e90b3e91d..ec1725986 100644 --- a/src/products/components/ProductVariantChannels/formOpretations.ts +++ b/src/products/components/ProductVariantChannels/formOpretations.ts @@ -1,11 +1,11 @@ -import { ChannelPriceAndPreorderData } from "@saleor/channels/utils"; -import { ProductVariantCreateDataQuery } from "@saleor/graphql"; -import { UseFormsetOutput } from "@saleor/hooks/useFormset"; -import { getChannelsInput } from "@saleor/products/utils/handlers"; +import { ChannelPriceAndPreorderData } from "@dashboard/channels/utils"; +import { ProductVariantCreateDataQuery } from "@dashboard/graphql"; +import { UseFormsetOutput } from "@dashboard/hooks/useFormset"; +import { getChannelsInput } from "@dashboard/products/utils/handlers"; import { validateCostPrice, validatePrice, -} from "@saleor/products/utils/validation"; +} from "@dashboard/products/utils/validation"; import { VariantChannelListing } from "./types"; diff --git a/src/products/components/ProductVariantChannels/types.ts b/src/products/components/ProductVariantChannels/types.ts index 3a907ec98..cfcf9b633 100644 --- a/src/products/components/ProductVariantChannels/types.ts +++ b/src/products/components/ProductVariantChannels/types.ts @@ -1,7 +1,7 @@ import { ProductVariantCreateDataQuery, ProductVariantFragment, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; export type Product = ProductVariantCreateDataQuery["product"]; export type Variant = ProductVariantFragment; diff --git a/src/products/components/ProductVariantCheckoutSettings/ProductVariantCheckoutSettings.tsx b/src/products/components/ProductVariantCheckoutSettings/ProductVariantCheckoutSettings.tsx index 84fa5e6eb..f67930339 100644 --- a/src/products/components/ProductVariantCheckoutSettings/ProductVariantCheckoutSettings.tsx +++ b/src/products/components/ProductVariantCheckoutSettings/ProductVariantCheckoutSettings.tsx @@ -1,9 +1,9 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import PreviewPill from "@dashboard/components/PreviewPill"; +import { ProductErrorFragment } from "@dashboard/graphql"; +import { FormChange } from "@dashboard/hooks/useForm"; +import { getFormErrors } from "@dashboard/utils/errors"; import { Card, CardContent, TextField } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import PreviewPill from "@saleor/components/PreviewPill"; -import { ProductErrorFragment } from "@saleor/graphql"; -import { FormChange } from "@saleor/hooks/useForm"; -import { getFormErrors } from "@saleor/utils/errors"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/products/components/ProductVariantCreatePage/ProductVariantCreatePage.stories.tsx b/src/products/components/ProductVariantCreatePage/ProductVariantCreatePage.stories.tsx index 8d7f05728..0cf69ae3d 100644 --- a/src/products/components/ProductVariantCreatePage/ProductVariantCreatePage.stories.tsx +++ b/src/products/components/ProductVariantCreatePage/ProductVariantCreatePage.stories.tsx @@ -1,7 +1,7 @@ import placeholderImage from "@assets/images/placeholder255x255.png"; -import { ProductErrorCode } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; -import { warehouseList } from "@saleor/warehouses/fixtures"; +import { ProductErrorCode } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; +import { warehouseList } from "@dashboard/warehouses/fixtures"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/products/components/ProductVariantCreatePage/ProductVariantCreatePage.tsx b/src/products/components/ProductVariantCreatePage/ProductVariantCreatePage.tsx index db753b43f..38c54adbd 100644 --- a/src/products/components/ProductVariantCreatePage/ProductVariantCreatePage.tsx +++ b/src/products/components/ProductVariantCreatePage/ProductVariantCreatePage.tsx @@ -1,19 +1,19 @@ import { getReferenceAttributeEntityTypeFromAttribute, mergeAttributeValues, -} from "@saleor/attributes/utils/data"; -import AssignAttributeValueDialog from "@saleor/components/AssignAttributeValueDialog"; +} from "@dashboard/attributes/utils/data"; +import AssignAttributeValueDialog from "@dashboard/components/AssignAttributeValueDialog"; import Attributes, { AttributeInput, VariantAttributeScope, -} from "@saleor/components/Attributes"; -import { Backlink } from "@saleor/components/Backlink"; -import CardSpacer from "@saleor/components/CardSpacer"; -import Container from "@saleor/components/Container"; -import Grid from "@saleor/components/Grid"; -import Metadata from "@saleor/components/Metadata"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; +} from "@dashboard/components/Attributes"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import Container from "@dashboard/components/Container"; +import Grid from "@dashboard/components/Grid"; +import Metadata from "@dashboard/components/Metadata"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; import { ProductErrorWithAttributesFragment, ProductVariantCreateDataQuery, @@ -21,13 +21,13 @@ import { SearchPagesQuery, SearchProductsQuery, SearchWarehousesQuery, -} from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; +} from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { ProductDetailsChannelsAvailabilityCard } from "@dashboard/products/components/ProductVariantChannels/ChannelsAvailabilityCard"; +import { productUrl } from "@dashboard/products/urls"; +import { FetchMoreProps, RelayToFlat, ReorderAction } from "@dashboard/types"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { ProductDetailsChannelsAvailabilityCard } from "@saleor/products/components/ProductVariantChannels/ChannelsAvailabilityCard"; -import { productUrl } from "@saleor/products/urls"; -import { FetchMoreProps, RelayToFlat, ReorderAction } from "@saleor/types"; import React from "react"; import { defineMessages, useIntl } from "react-intl"; diff --git a/src/products/components/ProductVariantCreatePage/form.tsx b/src/products/components/ProductVariantCreatePage/form.tsx index cfe6e3cc2..cfa696ab2 100644 --- a/src/products/components/ProductVariantCreatePage/form.tsx +++ b/src/products/components/ProductVariantCreatePage/form.tsx @@ -4,7 +4,7 @@ import { getRichTextDataFromAttributes, mergeAttributes, RichTextProps, -} from "@saleor/attributes/utils/data"; +} from "@dashboard/attributes/utils/data"; import { createAttributeFileChangeHandler, createAttributeMultiChangeHandler, @@ -12,42 +12,42 @@ import { createAttributeValueReorderHandler, createFetchMoreReferencesHandler, createFetchReferencesHandler, -} from "@saleor/attributes/utils/handlers"; +} from "@dashboard/attributes/utils/handlers"; import { ChannelPriceAndPreorderData, IChannelPriceAndPreorderArgs, -} from "@saleor/channels/utils"; -import { AttributeInput } from "@saleor/components/Attributes"; -import { useExitFormDialog } from "@saleor/components/Form/useExitFormDialog"; -import { MetadataFormData } from "@saleor/components/Metadata"; +} from "@dashboard/channels/utils"; +import { AttributeInput } from "@dashboard/components/Attributes"; +import { useExitFormDialog } from "@dashboard/components/Form/useExitFormDialog"; +import { MetadataFormData } from "@dashboard/components/Metadata"; import { ProductErrorWithAttributesFragment, ProductVariantCreateDataQuery, SearchPagesQuery, SearchProductsQuery, SearchWarehousesQuery, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import useForm, { CommonUseFormResultWithHandlers, FormChange, FormErrors, SubmitPromise, -} from "@saleor/hooks/useForm"; +} from "@dashboard/hooks/useForm"; import useFormset, { FormsetChange, FormsetData, -} from "@saleor/hooks/useFormset"; -import useHandleFormSubmit from "@saleor/hooks/useHandleFormSubmit"; -import { errorMessages } from "@saleor/intl"; -import { getVariantAttributeInputFromProduct } from "@saleor/products/utils/data"; +} from "@dashboard/hooks/useFormset"; +import useHandleFormSubmit from "@dashboard/hooks/useHandleFormSubmit"; +import { errorMessages } from "@dashboard/intl"; +import { getVariantAttributeInputFromProduct } from "@dashboard/products/utils/data"; import { createPreorderEndDateChangeHandler, getChannelsInput, -} from "@saleor/products/utils/handlers"; -import { validateVariantData } from "@saleor/products/utils/validation"; -import { FetchMoreProps, RelayToFlat, ReorderEvent } from "@saleor/types"; -import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger"; -import { useMultipleRichText } from "@saleor/utils/richText/useMultipleRichText"; +} from "@dashboard/products/utils/handlers"; +import { validateVariantData } from "@dashboard/products/utils/validation"; +import { FetchMoreProps, RelayToFlat, ReorderEvent } from "@dashboard/types"; +import useMetadataChangeTrigger from "@dashboard/utils/metadata/useMetadataChangeTrigger"; +import { useMultipleRichText } from "@dashboard/utils/richText/useMultipleRichText"; import React, { useEffect, useState } from "react"; import { useIntl } from "react-intl"; diff --git a/src/products/components/ProductVariantDeleteDialog/ProductVariantDeleteDialog.tsx b/src/products/components/ProductVariantDeleteDialog/ProductVariantDeleteDialog.tsx index 277a01911..4300a1407 100644 --- a/src/products/components/ProductVariantDeleteDialog/ProductVariantDeleteDialog.tsx +++ b/src/products/components/ProductVariantDeleteDialog/ProductVariantDeleteDialog.tsx @@ -1,3 +1,5 @@ +import BackButton from "@dashboard/components/BackButton"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; import { Dialog, DialogActions, @@ -5,8 +7,6 @@ import { DialogContentText, DialogTitle, } from "@material-ui/core"; -import BackButton from "@saleor/components/BackButton"; -import ConfirmButton from "@saleor/components/ConfirmButton"; import { ConfirmButtonTransitionState, makeStyles } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/products/components/ProductVariantEndPreorderDialog/ProductVariantEndPreorderDialog.tsx b/src/products/components/ProductVariantEndPreorderDialog/ProductVariantEndPreorderDialog.tsx index 80b41673a..8cdc2933b 100644 --- a/src/products/components/ProductVariantEndPreorderDialog/ProductVariantEndPreorderDialog.tsx +++ b/src/products/components/ProductVariantEndPreorderDialog/ProductVariantEndPreorderDialog.tsx @@ -1,5 +1,5 @@ +import ActionDialog from "@dashboard/components/ActionDialog"; import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/products/components/ProductVariantImageSelectDialog/ProductVariantMediaSelectDialog.tsx b/src/products/components/ProductVariantImageSelectDialog/ProductVariantMediaSelectDialog.tsx index e2263d871..c555e6499 100644 --- a/src/products/components/ProductVariantImageSelectDialog/ProductVariantMediaSelectDialog.tsx +++ b/src/products/components/ProductVariantImageSelectDialog/ProductVariantMediaSelectDialog.tsx @@ -1,14 +1,14 @@ +import BackButton from "@dashboard/components/BackButton"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import { ProductMediaFragment } from "@dashboard/graphql"; +import useModalDialogOpen from "@dashboard/hooks/useModalDialogOpen"; +import { buttonMessages } from "@dashboard/intl"; import { Dialog, DialogActions, DialogContent, DialogTitle, } from "@material-ui/core"; -import BackButton from "@saleor/components/BackButton"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import { ProductMediaFragment } from "@saleor/graphql"; -import useModalDialogOpen from "@saleor/hooks/useModalDialogOpen"; -import { buttonMessages } from "@saleor/intl"; import clsx from "clsx"; import React, { useState } from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/products/components/ProductVariantMedia/ProductVariantMedia.tsx b/src/products/components/ProductVariantMedia/ProductVariantMedia.tsx index 229bcf87e..2e0954afd 100644 --- a/src/products/components/ProductVariantMedia/ProductVariantMedia.tsx +++ b/src/products/components/ProductVariantMedia/ProductVariantMedia.tsx @@ -1,8 +1,8 @@ +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import Skeleton from "@dashboard/components/Skeleton"; +import { ProductMediaFragment } from "@dashboard/graphql"; import { Card, CardContent, Typography } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import Skeleton from "@saleor/components/Skeleton"; -import { ProductMediaFragment } from "@saleor/graphql"; import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; import { defineMessages, useIntl } from "react-intl"; diff --git a/src/products/components/ProductVariantName/ProductVariantName.tsx b/src/products/components/ProductVariantName/ProductVariantName.tsx index 6778dc8b4..1cc4938c7 100644 --- a/src/products/components/ProductVariantName/ProductVariantName.tsx +++ b/src/products/components/ProductVariantName/ProductVariantName.tsx @@ -1,9 +1,9 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import { ProductErrorFragment } from "@dashboard/graphql"; +import { FormChange } from "@dashboard/hooks/useForm"; +import { commonMessages } from "@dashboard/intl"; +import { getFormErrors, getProductErrorMessage } from "@dashboard/utils/errors"; import { Card, CardContent, TextField } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import { ProductErrorFragment } from "@saleor/graphql"; -import { FormChange } from "@saleor/hooks/useForm"; -import { commonMessages } from "@saleor/intl"; -import { getFormErrors, getProductErrorMessage } from "@saleor/utils/errors"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/products/components/ProductVariantNavigation/ProductVariantNavigation.tsx b/src/products/components/ProductVariantNavigation/ProductVariantNavigation.tsx index ee31833bf..67d7a43fc 100644 --- a/src/products/components/ProductVariantNavigation/ProductVariantNavigation.tsx +++ b/src/products/components/ProductVariantNavigation/ProductVariantNavigation.tsx @@ -1,24 +1,24 @@ -import { Card, TableCell } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; import { SortableTableBody, SortableTableRow, -} from "@saleor/components/SortableTable"; -import TableCellAvatar from "@saleor/components/TableCellAvatar"; -import TableRowLink from "@saleor/components/TableRowLink"; +} from "@dashboard/components/SortableTable"; +import TableCellAvatar from "@dashboard/components/TableCellAvatar"; +import TableRowLink from "@dashboard/components/TableRowLink"; import { ProductVariantCreateDataQuery, ProductVariantDetailsQuery, -} from "@saleor/graphql"; -import { sectionNames } from "@saleor/intl"; +} from "@dashboard/graphql"; +import { sectionNames } from "@dashboard/intl"; import { productVariantAddUrl, productVariantEditUrl, -} from "@saleor/products/urls"; -import { ReorderAction } from "@saleor/types"; +} from "@dashboard/products/urls"; +import { ReorderAction } from "@dashboard/types"; +import { Card, TableCell } from "@material-ui/core"; import clsx from "clsx"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/products/components/ProductVariantPage/ProductVariantPage.tsx b/src/products/components/ProductVariantPage/ProductVariantPage.tsx index ed02fcf14..d23c4caad 100644 --- a/src/products/components/ProductVariantPage/ProductVariantPage.tsx +++ b/src/products/components/ProductVariantPage/ProductVariantPage.tsx @@ -1,21 +1,21 @@ import { getReferenceAttributeEntityTypeFromAttribute, mergeAttributeValues, -} from "@saleor/attributes/utils/data"; -import { ChannelPriceData } from "@saleor/channels/utils"; -import AssignAttributeValueDialog from "@saleor/components/AssignAttributeValueDialog"; +} from "@dashboard/attributes/utils/data"; +import { ChannelPriceData } from "@dashboard/channels/utils"; +import AssignAttributeValueDialog from "@dashboard/components/AssignAttributeValueDialog"; import Attributes, { AttributeInput, VariantAttributeScope, -} from "@saleor/components/Attributes"; -import { Backlink } from "@saleor/components/Backlink"; -import CardSpacer from "@saleor/components/CardSpacer"; -import Container from "@saleor/components/Container"; -import Grid from "@saleor/components/Grid"; -import { MetadataFormData } from "@saleor/components/Metadata"; -import Metadata from "@saleor/components/Metadata/Metadata"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; +} from "@dashboard/components/Attributes"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import Container from "@dashboard/components/Container"; +import Grid from "@dashboard/components/Grid"; +import { MetadataFormData } from "@dashboard/components/Metadata"; +import Metadata from "@dashboard/components/Metadata/Metadata"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; import { ProductChannelListingErrorFragment, ProductErrorWithAttributesFragment, @@ -24,13 +24,13 @@ import { SearchPagesQuery, SearchProductsQuery, WarehouseFragment, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { VariantDetailsChannelsAvailabilityCard } from "@dashboard/products/components/ProductVariantChannels/ChannelsAvailabilityCard"; +import { productUrl } from "@dashboard/products/urls"; +import { getSelectedMedia } from "@dashboard/products/utils/data"; +import { FetchMoreProps, RelayToFlat, ReorderAction } from "@dashboard/types"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { VariantDetailsChannelsAvailabilityCard } from "@saleor/products/components/ProductVariantChannels/ChannelsAvailabilityCard"; -import { productUrl } from "@saleor/products/urls"; -import { getSelectedMedia } from "@saleor/products/utils/data"; -import { FetchMoreProps, RelayToFlat, ReorderAction } from "@saleor/types"; import React from "react"; import { defineMessages, useIntl } from "react-intl"; diff --git a/src/products/components/ProductVariantPage/ProductVarinatPage.stories.tsx b/src/products/components/ProductVariantPage/ProductVarinatPage.stories.tsx index ec7751af6..bb38a9071 100644 --- a/src/products/components/ProductVariantPage/ProductVarinatPage.stories.tsx +++ b/src/products/components/ProductVariantPage/ProductVarinatPage.stories.tsx @@ -1,8 +1,8 @@ import placeholderImage from "@assets/images/placeholder60x60.png"; -import { createVariantChannels } from "@saleor/channels/utils"; -import { ProductErrorCode } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; -import { warehouseList } from "@saleor/warehouses/fixtures"; +import { createVariantChannels } from "@dashboard/channels/utils"; +import { ProductErrorCode } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; +import { warehouseList } from "@dashboard/warehouses/fixtures"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/products/components/ProductVariantPage/form.tsx b/src/products/components/ProductVariantPage/form.tsx index 09d54235f..125f157fa 100644 --- a/src/products/components/ProductVariantPage/form.tsx +++ b/src/products/components/ProductVariantPage/form.tsx @@ -4,7 +4,7 @@ import { getRichTextDataFromAttributes, mergeAttributes, RichTextProps, -} from "@saleor/attributes/utils/data"; +} from "@dashboard/attributes/utils/data"; import { createAttributeFileChangeHandler, createAttributeMultiChangeHandler, @@ -12,53 +12,53 @@ import { createAttributeValueReorderHandler, createFetchMoreReferencesHandler, createFetchReferencesHandler, -} from "@saleor/attributes/utils/handlers"; +} from "@dashboard/attributes/utils/handlers"; import { ChannelPriceAndPreorderData, IChannelPriceAndPreorderArgs, -} from "@saleor/channels/utils"; -import { AttributeInput } from "@saleor/components/Attributes"; -import { useExitFormDialog } from "@saleor/components/Form/useExitFormDialog"; -import { MetadataFormData } from "@saleor/components/Metadata"; +} from "@dashboard/channels/utils"; +import { AttributeInput } from "@dashboard/components/Attributes"; +import { useExitFormDialog } from "@dashboard/components/Form/useExitFormDialog"; +import { MetadataFormData } from "@dashboard/components/Metadata"; import { ProductErrorWithAttributesFragment, ProductVariantFragment, SearchPagesQuery, SearchProductsQuery, SearchWarehousesQuery, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import useForm, { CommonUseFormResultWithHandlers, FormChange, FormErrors, SubmitPromise, -} from "@saleor/hooks/useForm"; +} from "@dashboard/hooks/useForm"; import useFormset, { FormsetChange, FormsetData, -} from "@saleor/hooks/useFormset"; -import useHandleFormSubmit from "@saleor/hooks/useHandleFormSubmit"; -import { errorMessages } from "@saleor/intl"; +} from "@dashboard/hooks/useFormset"; +import useHandleFormSubmit from "@dashboard/hooks/useHandleFormSubmit"; +import { errorMessages } from "@dashboard/intl"; import { getAttributeInputFromVariant, getStockInputFromVariant, -} from "@saleor/products/utils/data"; +} from "@dashboard/products/utils/data"; import { createMediaChangeHandler, createPreorderEndDateChangeHandler, getChannelsInput, -} from "@saleor/products/utils/handlers"; +} from "@dashboard/products/utils/handlers"; import { validateCostPrice, validatePrice, validateVariantData, -} from "@saleor/products/utils/validation"; -import { FetchMoreProps, RelayToFlat, ReorderEvent } from "@saleor/types"; -import { arrayDiff } from "@saleor/utils/arrays"; -import { mapMetadataItemToInput } from "@saleor/utils/maps"; -import getMetadata from "@saleor/utils/metadata/getMetadata"; -import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger"; -import { useMultipleRichText } from "@saleor/utils/richText/useMultipleRichText"; +} from "@dashboard/products/utils/validation"; +import { FetchMoreProps, RelayToFlat, ReorderEvent } from "@dashboard/types"; +import { arrayDiff } from "@dashboard/utils/arrays"; +import { mapMetadataItemToInput } from "@dashboard/utils/maps"; +import getMetadata from "@dashboard/utils/metadata/getMetadata"; +import useMetadataChangeTrigger from "@dashboard/utils/metadata/useMetadataChangeTrigger"; +import { useMultipleRichText } from "@dashboard/utils/richText/useMultipleRichText"; import React, { useEffect, useState } from "react"; import { useIntl } from "react-intl"; diff --git a/src/products/components/ProductVariantPrice/ProductVariantPrice.tsx b/src/products/components/ProductVariantPrice/ProductVariantPrice.tsx index 31a7c76a9..9cd9356fb 100644 --- a/src/products/components/ProductVariantPrice/ProductVariantPrice.tsx +++ b/src/products/components/ProductVariantPrice/ProductVariantPrice.tsx @@ -1,3 +1,20 @@ +import { + ChannelData, + ChannelPriceAndPreorderArgs, + ChannelPriceArgs, +} from "@dashboard/channels/utils"; +import CardTitle from "@dashboard/components/CardTitle"; +import PriceField from "@dashboard/components/PriceField"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { ProductChannelListingErrorFragment } from "@dashboard/graphql"; +import { renderCollection } from "@dashboard/misc"; +import { + getFormChannelError, + getFormChannelErrors, +} from "@dashboard/utils/errors"; +import getProductErrorMessage from "@dashboard/utils/errors/product"; import { Card, CardContent, @@ -6,24 +23,7 @@ import { TableHead, Typography, } from "@material-ui/core"; -import { - ChannelData, - ChannelPriceAndPreorderArgs, - ChannelPriceArgs, -} from "@saleor/channels/utils"; -import CardTitle from "@saleor/components/CardTitle"; -import PriceField from "@saleor/components/PriceField"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { ProductChannelListingErrorFragment } from "@saleor/graphql"; import { makeStyles } from "@saleor/macaw-ui"; -import { renderCollection } from "@saleor/misc"; -import { - getFormChannelError, - getFormChannelErrors, -} from "@saleor/utils/errors"; -import getProductErrorMessage from "@saleor/utils/errors/product"; import React from "react"; import { FormattedMessage, MessageDescriptor, useIntl } from "react-intl"; diff --git a/src/products/components/ProductVariantSetDefault/ProductVariantSetDefault.tsx b/src/products/components/ProductVariantSetDefault/ProductVariantSetDefault.tsx index 5f8ff29fc..dbea909c2 100644 --- a/src/products/components/ProductVariantSetDefault/ProductVariantSetDefault.tsx +++ b/src/products/components/ProductVariantSetDefault/ProductVariantSetDefault.tsx @@ -1,4 +1,4 @@ -import CardMenu from "@saleor/components/CardMenu"; +import CardMenu from "@dashboard/components/CardMenu"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/products/components/ProductVariants/ProductVariants.tsx b/src/products/components/ProductVariants/ProductVariants.tsx index 3b286f8a4..3c3ad971d 100644 --- a/src/products/components/ProductVariants/ProductVariants.tsx +++ b/src/products/components/ProductVariants/ProductVariants.tsx @@ -1,22 +1,22 @@ -import { Item } from "@glideapps/glide-data-grid"; -import { ChannelData } from "@saleor/channels/utils"; +import { ChannelData } from "@dashboard/channels/utils"; import Datagrid, { GetCellContentOpts, -} from "@saleor/components/Datagrid/Datagrid"; -import { DatagridChangeOpts } from "@saleor/components/Datagrid/useDatagridChange"; -import { Choice } from "@saleor/components/SingleSelectField"; +} from "@dashboard/components/Datagrid/Datagrid"; +import { DatagridChangeOpts } from "@dashboard/components/Datagrid/useDatagridChange"; +import { Choice } from "@dashboard/components/SingleSelectField"; import { AttributeInputTypeEnum, ProductDetailsVariantFragment, ProductFragment, RefreshLimitsQuery, WarehouseFragment, -} from "@saleor/graphql"; -import EditIcon from "@saleor/icons/Edit"; -import { buttonMessages } from "@saleor/intl"; +} from "@dashboard/graphql"; +import EditIcon from "@dashboard/icons/Edit"; +import { buttonMessages } from "@dashboard/intl"; +import { ProductVariantListError } from "@dashboard/products/views/ProductUpdate/handlers/errors"; +import { Item } from "@glideapps/glide-data-grid"; import { Button } from "@saleor/macaw-ui"; -import { ProductVariantListError } from "@saleor/products/views/ProductUpdate/handlers/errors"; -// import { isLimitReached } from "@saleor/utils/limits"; +// import { isLimitReached } from "@dashboard/utils/limits"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/products/components/ProductVariants/datagrid/getVariantChannelsInputs.ts b/src/products/components/ProductVariants/datagrid/getVariantChannelsInputs.ts index bf14d4cb3..c2418985b 100644 --- a/src/products/components/ProductVariants/datagrid/getVariantChannelsInputs.ts +++ b/src/products/components/ProductVariants/datagrid/getVariantChannelsInputs.ts @@ -1,7 +1,7 @@ import { DatagridChange, DatagridChangeOpts, -} from "@saleor/components/Datagrid/useDatagridChange"; +} from "@dashboard/components/Datagrid/useDatagridChange"; import { getColumnChannel, getColumnChannelAvailability } from "./columnData"; diff --git a/src/products/components/ProductVariants/utils.tsx b/src/products/components/ProductVariants/utils.tsx index f738bc5b9..222efe70f 100644 --- a/src/products/components/ProductVariants/utils.tsx +++ b/src/products/components/ProductVariants/utils.tsx @@ -1,20 +1,19 @@ -import { GridCell } from "@glideapps/glide-data-grid"; -import { ChannelData } from "@saleor/channels/utils"; +import { ChannelData } from "@dashboard/channels/utils"; import { booleanCell, dropdownCell, moneyCell, numberCell, textCell, -} from "@saleor/components/Datagrid/cells"; -import { emptyDropdownCellValue } from "@saleor/components/Datagrid/DropdownCell"; -import { numberCellEmptyValue } from "@saleor/components/Datagrid/NumberCell"; -import { AvailableColumn } from "@saleor/components/Datagrid/types"; +} from "@dashboard/components/Datagrid/cells"; +import { emptyDropdownCellValue } from "@dashboard/components/Datagrid/DropdownCell"; +import { numberCellEmptyValue } from "@dashboard/components/Datagrid/NumberCell"; +import { AvailableColumn } from "@dashboard/components/Datagrid/types"; import { DatagridChange, DatagridChangeOpts, -} from "@saleor/components/Datagrid/useDatagridChange"; -import { Choice } from "@saleor/components/SingleSelectField"; +} from "@dashboard/components/Datagrid/useDatagridChange"; +import { Choice } from "@dashboard/components/SingleSelectField"; import { ProductDetailsVariantFragment, ProductFragment, @@ -22,9 +21,10 @@ import { VariantDatagridStockUpdateMutationVariables, VariantDatagridUpdateMutationVariables, WarehouseFragment, -} from "@saleor/graphql"; -import { ProductVariantListError } from "@saleor/products/views/ProductUpdate/handlers/errors"; -import { mapNodeToChoice } from "@saleor/utils/maps"; +} from "@dashboard/graphql"; +import { ProductVariantListError } from "@dashboard/products/views/ProductUpdate/handlers/errors"; +import { mapNodeToChoice } from "@dashboard/utils/maps"; +import { GridCell } from "@glideapps/glide-data-grid"; import { MutableRefObject } from "react"; import { IntlShape } from "react-intl"; diff --git a/src/products/fixtures.ts b/src/products/fixtures.ts index a0f3d74d0..9d0fcc70d 100644 --- a/src/products/fixtures.ts +++ b/src/products/fixtures.ts @@ -1,4 +1,4 @@ -import { channelsList } from "@saleor/channels/fixtures"; +import { channelsList } from "@dashboard/channels/fixtures"; import { AttributeInputTypeEnum, ProductFragment, @@ -7,9 +7,9 @@ import { ProductVariantCreateDataQuery, ProductVariantFragment, WeightUnitsEnum, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; +import { RelayToFlat } from "@dashboard/types"; import { ProductType } from "@saleor/sdk/dist/apollo/types"; -import { RelayToFlat } from "@saleor/types"; import * as richTextEditorFixtures from "../components/RichTextEditor/fixtures.json"; diff --git a/src/products/index.tsx b/src/products/index.tsx index b51d321d7..c72eac52d 100644 --- a/src/products/index.tsx +++ b/src/products/index.tsx @@ -1,6 +1,6 @@ -import { sectionNames } from "@saleor/intl"; -import { asSortParams } from "@saleor/utils/sort"; -import { getArrayQueryParam } from "@saleor/utils/urls"; +import { sectionNames } from "@dashboard/intl"; +import { asSortParams } from "@dashboard/utils/sort"; +import { getArrayQueryParam } from "@dashboard/utils/urls"; import { parse as parseQs } from "qs"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/products/urls.ts b/src/products/urls.ts index 3678000f7..ea974cb58 100644 --- a/src/products/urls.ts +++ b/src/products/urls.ts @@ -1,4 +1,4 @@ -import { ChannelsAction } from "@saleor/channels/urls"; +import { ChannelsAction } from "@dashboard/channels/urls"; import urlJoin from "url-join"; import { diff --git a/src/products/utils/data.ts b/src/products/utils/data.ts index 4125b21b2..5f9db0059 100644 --- a/src/products/utils/data.ts +++ b/src/products/utils/data.ts @@ -2,12 +2,12 @@ import { getDefaultAttributeValues, getSelectedAttributeValues, mergeChoicesWithValues, -} from "@saleor/attributes/utils/data"; +} from "@dashboard/attributes/utils/data"; import { AttributeInput, VariantAttributeScope, -} from "@saleor/components/Attributes"; -import { SingleAutocompleteChoiceType } from "@saleor/components/SingleAutocompleteSelectField"; +} from "@dashboard/components/Attributes"; +import { SingleAutocompleteChoiceType } from "@dashboard/components/SingleAutocompleteSelectField"; import { ProductDetailsVariantFragment, ProductFragment, @@ -18,10 +18,10 @@ import { SelectedVariantAttributeFragment, StockInput, VariantAttributeFragment, -} from "@saleor/graphql"; -import { FormsetAtomicData } from "@saleor/hooks/useFormset"; -import { maybe } from "@saleor/misc"; -import { mapEdgesToItems, mapMetadataItemToInput } from "@saleor/utils/maps"; +} from "@dashboard/graphql"; +import { FormsetAtomicData } from "@dashboard/hooks/useFormset"; +import { maybe } from "@dashboard/misc"; +import { mapEdgesToItems, mapMetadataItemToInput } from "@dashboard/utils/maps"; import moment from "moment"; import { ProductStockInput } from "../components/ProductStocks"; diff --git a/src/products/utils/handlers.test.ts b/src/products/utils/handlers.test.ts index db0144617..6dc722b18 100644 --- a/src/products/utils/handlers.test.ts +++ b/src/products/utils/handlers.test.ts @@ -1,4 +1,4 @@ -import { ProductMediaType } from "@saleor/graphql"; +import { ProductMediaType } from "@dashboard/graphql"; import { handleAssignMedia } from "./handlers"; diff --git a/src/products/utils/handlers.ts b/src/products/utils/handlers.ts index be0b86ffc..b46778654 100644 --- a/src/products/utils/handlers.ts +++ b/src/products/utils/handlers.ts @@ -4,7 +4,7 @@ import { ChannelPriceAndPreorderData, ChannelPriceArgs, ChannelPriceData, -} from "@saleor/channels/utils"; +} from "@dashboard/channels/utils"; import { ProductChannelListingAddInput, ProductVariantFragment, @@ -12,8 +12,8 @@ import { VariantMediaAssignMutationVariables, VariantMediaUnassignMutation, VariantMediaUnassignMutationVariables, -} from "@saleor/graphql"; -import { FormChange, UseFormResult } from "@saleor/hooks/useForm"; +} from "@dashboard/graphql"; +import { FormChange, UseFormResult } from "@dashboard/hooks/useForm"; import { diff } from "fast-array-diff"; import moment from "moment"; diff --git a/src/products/utils/validation.ts b/src/products/utils/validation.ts index 5f4c42dfa..53420a3b1 100644 --- a/src/products/utils/validation.ts +++ b/src/products/utils/validation.ts @@ -1,7 +1,7 @@ import { ProductErrorCode, ProductErrorWithAttributesFragment, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import { ProductCreateData } from "../components/ProductCreatePage"; import { ProductVariantCreateData } from "../components/ProductVariantCreatePage/form"; diff --git a/src/products/views/ProductCreate/ProductCreate.tsx b/src/products/views/ProductCreate/ProductCreate.tsx index 881a7b821..196fb156a 100644 --- a/src/products/views/ProductCreate/ProductCreate.tsx +++ b/src/products/views/ProductCreate/ProductCreate.tsx @@ -1,12 +1,15 @@ -import { ChannelData, createSortedChannelsData } from "@saleor/channels/utils"; -import useAppChannel from "@saleor/components/AppLayout/AppChannelContext"; -import { AttributeInput } from "@saleor/components/Attributes"; -import ChannelsAvailabilityDialog from "@saleor/components/ChannelsAvailabilityDialog"; -import { WindowTitle } from "@saleor/components/WindowTitle"; +import { + ChannelData, + createSortedChannelsData, +} from "@dashboard/channels/utils"; +import useAppChannel from "@dashboard/components/AppLayout/AppChannelContext"; +import { AttributeInput } from "@dashboard/components/Attributes"; +import ChannelsAvailabilityDialog from "@dashboard/components/ChannelsAvailabilityDialog"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; import { DEFAULT_INITIAL_SEARCH_DATA, VALUES_PAGINATE_BY, -} from "@saleor/config"; +} from "@dashboard/config"; import { ProductChannelListingErrorFragment, ProductErrorWithAttributesFragment, @@ -20,33 +23,33 @@ import { useUpdatePrivateMetadataMutation, useVariantCreateMutation, useWarehouseListQuery, -} from "@saleor/graphql"; -import useChannels from "@saleor/hooks/useChannels"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import useShop from "@saleor/hooks/useShop"; -import { getMutationErrors } from "@saleor/misc"; +} from "@dashboard/graphql"; +import useChannels from "@dashboard/hooks/useChannels"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import useShop from "@dashboard/hooks/useShop"; +import { getMutationErrors } from "@dashboard/misc"; import ProductCreatePage, { ProductCreateData, -} from "@saleor/products/components/ProductCreatePage"; +} from "@dashboard/products/components/ProductCreatePage"; import { productAddUrl, ProductCreateUrlDialog, ProductCreateUrlQueryParams, productUrl, -} from "@saleor/products/urls"; -import useCategorySearch from "@saleor/searches/useCategorySearch"; -import useCollectionSearch from "@saleor/searches/useCollectionSearch"; -import usePageSearch from "@saleor/searches/usePageSearch"; -import useProductSearch from "@saleor/searches/useProductSearch"; -import useProductTypeSearch from "@saleor/searches/useProductTypeSearch"; -import { useTaxClassFetchMore } from "@saleor/taxes/utils/useTaxClassFetchMore"; -import { getProductErrorMessage } from "@saleor/utils/errors"; -import useAttributeValueSearchHandler from "@saleor/utils/handlers/attributeValueSearchHandler"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createMetadataCreateHandler from "@saleor/utils/handlers/metadataCreateHandler"; -import { mapEdgesToItems } from "@saleor/utils/maps"; -import { warehouseAddPath } from "@saleor/warehouses/urls"; +} from "@dashboard/products/urls"; +import useCategorySearch from "@dashboard/searches/useCategorySearch"; +import useCollectionSearch from "@dashboard/searches/useCollectionSearch"; +import usePageSearch from "@dashboard/searches/usePageSearch"; +import useProductSearch from "@dashboard/searches/useProductSearch"; +import useProductTypeSearch from "@dashboard/searches/useProductTypeSearch"; +import { useTaxClassFetchMore } from "@dashboard/taxes/utils/useTaxClassFetchMore"; +import { getProductErrorMessage } from "@dashboard/utils/errors"; +import useAttributeValueSearchHandler from "@dashboard/utils/handlers/attributeValueSearchHandler"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createMetadataCreateHandler from "@dashboard/utils/handlers/metadataCreateHandler"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; +import { warehouseAddPath } from "@dashboard/warehouses/urls"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/products/views/ProductCreate/handlers.ts b/src/products/views/ProductCreate/handlers.ts index 85e57a639..bc0aba78d 100644 --- a/src/products/views/ProductCreate/handlers.ts +++ b/src/products/views/ProductCreate/handlers.ts @@ -2,12 +2,12 @@ import { FetchResult } from "@apollo/client"; import { getAttributesAfterFileAttributesUpdate, mergeFileUploadErrors, -} from "@saleor/attributes/utils/data"; +} from "@dashboard/attributes/utils/data"; import { handleUploadMultipleFiles, prepareAttributesInput, -} from "@saleor/attributes/utils/handlers"; -import { ChannelData } from "@saleor/channels/utils"; +} from "@dashboard/attributes/utils/handlers"; +import { ChannelData } from "@dashboard/channels/utils"; import { AttributeErrorFragment, FileUploadMutation, @@ -26,11 +26,11 @@ import { UploadErrorFragment, VariantCreateMutation, VariantCreateMutationVariables, -} from "@saleor/graphql"; -import { weight } from "@saleor/misc"; -import { ProductCreateData } from "@saleor/products/components/ProductCreatePage/form"; -import { getAvailabilityVariables } from "@saleor/products/utils/handlers"; -import { getParsedDataForJsonStringField } from "@saleor/utils/richText/misc"; +} from "@dashboard/graphql"; +import { weight } from "@dashboard/misc"; +import { ProductCreateData } from "@dashboard/products/components/ProductCreatePage/form"; +import { getAvailabilityVariables } from "@dashboard/products/utils/handlers"; +import { getParsedDataForJsonStringField } from "@dashboard/utils/richText/misc"; const getChannelsVariables = (productId: string, channels: ChannelData[]) => ({ variables: { diff --git a/src/products/views/ProductImage.tsx b/src/products/views/ProductImage.tsx index 0a68514c8..b59498741 100644 --- a/src/products/views/ProductImage.tsx +++ b/src/products/views/ProductImage.tsx @@ -1,14 +1,14 @@ -import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; -import NotFoundPage from "@saleor/components/NotFoundPage"; +import ActionDialog from "@dashboard/components/ActionDialog"; +import NotFoundPage from "@dashboard/components/NotFoundPage"; import { useProductMediaByIdQuery, useProductMediaDeleteMutation, useProductMediaUpdateMutation, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { commonMessages } from "@saleor/intl"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { commonMessages } from "@dashboard/intl"; +import { DialogContentText } from "@material-ui/core"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/products/views/ProductList/ProductList.tsx b/src/products/views/ProductList/ProductList.tsx index 44b66d2b2..489042fe0 100644 --- a/src/products/views/ProductList/ProductList.tsx +++ b/src/products/views/ProductList/ProductList.tsx @@ -1,19 +1,18 @@ -import { DialogContentText } from "@material-ui/core"; -import { filterable } from "@saleor/attributes/utils/data"; -import ActionDialog from "@saleor/components/ActionDialog"; -import useAppChannel from "@saleor/components/AppLayout/AppChannelContext"; -import DeleteFilterTabDialog from "@saleor/components/DeleteFilterTabDialog"; +import { filterable } from "@dashboard/attributes/utils/data"; +import ActionDialog from "@dashboard/components/ActionDialog"; +import useAppChannel from "@dashboard/components/AppLayout/AppChannelContext"; +import DeleteFilterTabDialog from "@dashboard/components/DeleteFilterTabDialog"; import SaveFilterTabDialog, { SaveFilterTabDialogFormData, -} from "@saleor/components/SaveFilterTabDialog"; -import { useShopLimitsQuery } from "@saleor/components/Shop/queries"; +} from "@dashboard/components/SaveFilterTabDialog"; +import { useShopLimitsQuery } from "@dashboard/components/Shop/queries"; import { DEFAULT_INITIAL_PAGINATION_DATA, DEFAULT_INITIAL_SEARCH_DATA, defaultListSettings, ProductListColumns, -} from "@saleor/config"; -import { Task } from "@saleor/containers/BackgroundTasks/types"; +} from "@dashboard/config"; +import { Task } from "@dashboard/containers/BackgroundTasks/types"; import { ProductListQueryVariables, useGridAttributesQuery, @@ -26,44 +25,45 @@ import { useProductExportMutation, useProductListQuery, useWarehouseListQuery, -} from "@saleor/graphql"; -import useBackgroundTask from "@saleor/hooks/useBackgroundTask"; -import useBulkActions from "@saleor/hooks/useBulkActions"; -import useListSettings from "@saleor/hooks/useListSettings"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; +} from "@dashboard/graphql"; +import useBackgroundTask from "@dashboard/hooks/useBackgroundTask"; +import useBulkActions from "@dashboard/hooks/useBulkActions"; +import useListSettings from "@dashboard/hooks/useListSettings"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { usePaginationReset } from "@dashboard/hooks/usePaginationReset"; import usePaginator, { createPaginationState, PaginatorContext, -} from "@saleor/hooks/usePaginator"; -import { commonMessages } from "@saleor/intl"; -import { DeleteIcon, IconButton } from "@saleor/macaw-ui"; -import { maybe } from "@saleor/misc"; -import ProductExportDialog from "@saleor/products/components/ProductExportDialog"; +} from "@dashboard/hooks/usePaginator"; +import { commonMessages } from "@dashboard/intl"; +import { maybe } from "@dashboard/misc"; +import ProductExportDialog from "@dashboard/products/components/ProductExportDialog"; import { getAttributeIdFromColumnValue, isAttributeColumnValue, -} from "@saleor/products/components/ProductListPage/utils"; -import ProductTypePickerDialog from "@saleor/products/components/ProductTypePickerDialog"; +} from "@dashboard/products/components/ProductListPage/utils"; +import ProductTypePickerDialog from "@dashboard/products/components/ProductTypePickerDialog"; import { productAddUrl, productListUrl, ProductListUrlDialog, ProductListUrlQueryParams, ProductListUrlSortField, -} from "@saleor/products/urls"; -import useAttributeSearch from "@saleor/searches/useAttributeSearch"; -import useAttributeValueSearch from "@saleor/searches/useAttributeValueSearch"; -import useAvailableInGridAttributesSearch from "@saleor/searches/useAvailableInGridAttributesSearch"; -import useCategorySearch from "@saleor/searches/useCategorySearch"; -import useCollectionSearch from "@saleor/searches/useCollectionSearch"; -import useProductTypeSearch from "@saleor/searches/useProductTypeSearch"; -import { ListViews } from "@saleor/types"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createFilterHandlers from "@saleor/utils/handlers/filterHandlers"; -import { mapEdgesToItems, mapNodeToChoice } from "@saleor/utils/maps"; -import { getSortUrlVariables } from "@saleor/utils/sort"; +} from "@dashboard/products/urls"; +import useAttributeSearch from "@dashboard/searches/useAttributeSearch"; +import useAttributeValueSearch from "@dashboard/searches/useAttributeValueSearch"; +import useAvailableInGridAttributesSearch from "@dashboard/searches/useAvailableInGridAttributesSearch"; +import useCategorySearch from "@dashboard/searches/useCategorySearch"; +import useCollectionSearch from "@dashboard/searches/useCollectionSearch"; +import useProductTypeSearch from "@dashboard/searches/useProductTypeSearch"; +import { ListViews } from "@dashboard/types"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createFilterHandlers from "@dashboard/utils/handlers/filterHandlers"; +import { mapEdgesToItems, mapNodeToChoice } from "@dashboard/utils/maps"; +import { getSortUrlVariables } from "@dashboard/utils/sort"; +import { DialogContentText } from "@material-ui/core"; +import { DeleteIcon, IconButton } from "@saleor/macaw-ui"; import React, { useState } from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/products/views/ProductList/filters.test.ts b/src/products/views/ProductList/filters.test.ts index 0c1c081ff..fa3accec5 100644 --- a/src/products/views/ProductList/filters.test.ts +++ b/src/products/views/ProductList/filters.test.ts @@ -1,8 +1,8 @@ -import { AttributeInputTypeEnum, StockAvailability } from "@saleor/graphql"; -import { createFilterStructure } from "@saleor/products/components/ProductListPage"; -import { ProductListUrlFilters } from "@saleor/products/urls"; -import { getFilterQueryParams } from "@saleor/utils/filters"; -import { stringifyQs } from "@saleor/utils/urls"; +import { AttributeInputTypeEnum, StockAvailability } from "@dashboard/graphql"; +import { createFilterStructure } from "@dashboard/products/components/ProductListPage"; +import { ProductListUrlFilters } from "@dashboard/products/urls"; +import { getFilterQueryParams } from "@dashboard/utils/filters"; +import { stringifyQs } from "@dashboard/utils/urls"; import { getExistingKeys, setFilterOptsStatus } from "@test/filters"; import { config } from "@test/intl"; import { createIntl } from "react-intl"; diff --git a/src/products/views/ProductList/filters.ts b/src/products/views/ProductList/filters.ts index d9994ef50..3277e9a23 100644 --- a/src/products/views/ProductList/filters.ts +++ b/src/products/views/ProductList/filters.ts @@ -1,4 +1,4 @@ -import { SingleAutocompleteChoiceType } from "@saleor/components/SingleAutocompleteSelectField"; +import { SingleAutocompleteChoiceType } from "@dashboard/components/SingleAutocompleteSelectField"; import { AttributeFragment, AttributeInputTypeEnum, @@ -16,19 +16,19 @@ import { SearchProductTypesQuery, SearchProductTypesQueryVariables, StockAvailability, -} from "@saleor/graphql"; -import { UseSearchResult } from "@saleor/hooks/makeSearch"; -import { findValueInEnum, maybe } from "@saleor/misc"; +} from "@dashboard/graphql"; +import { UseSearchResult } from "@dashboard/hooks/makeSearch"; +import { findValueInEnum, maybe } from "@dashboard/misc"; import { ProductFilterKeys, ProductListFilterOpts, -} from "@saleor/products/components/ProductListPage"; -import { RelayToFlat } from "@saleor/types"; +} from "@dashboard/products/components/ProductListPage"; +import { RelayToFlat } from "@dashboard/types"; import { mapEdgesToItems, mapNodeToChoice, mapSlugNodeToChoice, -} from "@saleor/utils/maps"; +} from "@dashboard/utils/maps"; import { FilterElement, diff --git a/src/products/views/ProductList/fixtures.ts b/src/products/views/ProductList/fixtures.ts index 45dd738c9..1d0f04e41 100644 --- a/src/products/views/ProductList/fixtures.ts +++ b/src/products/views/ProductList/fixtures.ts @@ -1,11 +1,11 @@ -import { attributes } from "@saleor/attributes/fixtures"; -import { categories } from "@saleor/categories/fixtures"; -import { collections } from "@saleor/collections/fixtures"; -import { fetchMoreProps, searchPageProps } from "@saleor/fixtures"; -import { StockAvailability } from "@saleor/graphql"; -import { ProductListFilterOpts } from "@saleor/products/components/ProductListPage"; -import { productTypes } from "@saleor/productTypes/fixtures"; -import { mapEdgesToItems, mapSlugNodeToChoice } from "@saleor/utils/maps"; +import { attributes } from "@dashboard/attributes/fixtures"; +import { categories } from "@dashboard/categories/fixtures"; +import { collections } from "@dashboard/collections/fixtures"; +import { fetchMoreProps, searchPageProps } from "@dashboard/fixtures"; +import { StockAvailability } from "@dashboard/graphql"; +import { ProductListFilterOpts } from "@dashboard/products/components/ProductListPage"; +import { productTypes } from "@dashboard/productTypes/fixtures"; +import { mapEdgesToItems, mapSlugNodeToChoice } from "@dashboard/utils/maps"; export const productListFilterOpts: ProductListFilterOpts = { attributes: attributes.map(attr => ({ diff --git a/src/products/views/ProductList/sort.ts b/src/products/views/ProductList/sort.ts index 613742827..0fbe42cec 100644 --- a/src/products/views/ProductList/sort.ts +++ b/src/products/views/ProductList/sort.ts @@ -1,9 +1,9 @@ -import { ProductOrder, ProductOrderField } from "@saleor/graphql"; +import { ProductOrder, ProductOrderField } from "@dashboard/graphql"; import { ProductListUrlQueryParams, ProductListUrlSortField, -} from "@saleor/products/urls"; -import { getOrderDirection } from "@saleor/utils/sort"; +} from "@dashboard/products/urls"; +import { getOrderDirection } from "@dashboard/utils/sort"; export const DEFAULT_SORT_KEY = ProductListUrlSortField.name; diff --git a/src/products/views/ProductList/utils.ts b/src/products/views/ProductList/utils.ts index 3c1072c90..8221c3458 100644 --- a/src/products/views/ProductList/utils.ts +++ b/src/products/views/ProductList/utils.ts @@ -1,5 +1,5 @@ -import { ProductTypeKindEnum } from "@saleor/graphql"; -import { isInEnum } from "@saleor/misc"; +import { ProductTypeKindEnum } from "@dashboard/graphql"; +import { isInEnum } from "@dashboard/misc"; import { IntlShape } from "react-intl"; import { productKindMessages as messages } from "./messages"; diff --git a/src/products/views/ProductUpdate/ProductUpdate.tsx b/src/products/views/ProductUpdate/ProductUpdate.tsx index af5f5b391..b163d6885 100644 --- a/src/products/views/ProductUpdate/ProductUpdate.tsx +++ b/src/products/views/ProductUpdate/ProductUpdate.tsx @@ -1,15 +1,14 @@ import placeholderImg from "@assets/images/placeholder255x255.png"; -import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; -import useAppChannel from "@saleor/components/AppLayout/AppChannelContext"; -import { AttributeInput } from "@saleor/components/Attributes"; -import NotFoundPage from "@saleor/components/NotFoundPage"; -import { useShopLimitsQuery } from "@saleor/components/Shop/queries"; -import { WindowTitle } from "@saleor/components/WindowTitle"; +import ActionDialog from "@dashboard/components/ActionDialog"; +import useAppChannel from "@dashboard/components/AppLayout/AppChannelContext"; +import { AttributeInput } from "@dashboard/components/Attributes"; +import NotFoundPage from "@dashboard/components/NotFoundPage"; +import { useShopLimitsQuery } from "@dashboard/components/Shop/queries"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; import { DEFAULT_INITIAL_SEARCH_DATA, VALUES_PAGINATE_BY, -} from "@saleor/config"; +} from "@dashboard/config"; import { ProductMediaCreateMutationVariables, useProductDeleteMutation, @@ -18,21 +17,22 @@ import { useProductMediaDeleteMutation, useProductMediaReorderMutation, useWarehouseListQuery, -} from "@saleor/graphql"; -import { getSearchFetchMoreProps } from "@saleor/hooks/makeTopLevelSearch/utils"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { commonMessages, errorMessages } from "@saleor/intl"; -import { useSearchAttributeValuesSuggestions } from "@saleor/searches/useAttributeValueSearch"; -import useCategorySearch from "@saleor/searches/useCategorySearch"; -import useCollectionSearch from "@saleor/searches/useCollectionSearch"; -import usePageSearch from "@saleor/searches/usePageSearch"; -import useProductSearch from "@saleor/searches/useProductSearch"; -import { useTaxClassFetchMore } from "@saleor/taxes/utils/useTaxClassFetchMore"; -import { getProductErrorMessage } from "@saleor/utils/errors"; -import useAttributeValueSearchHandler from "@saleor/utils/handlers/attributeValueSearchHandler"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/graphql"; +import { getSearchFetchMoreProps } from "@dashboard/hooks/makeTopLevelSearch/utils"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { commonMessages, errorMessages } from "@dashboard/intl"; +import { useSearchAttributeValuesSuggestions } from "@dashboard/searches/useAttributeValueSearch"; +import useCategorySearch from "@dashboard/searches/useCategorySearch"; +import useCollectionSearch from "@dashboard/searches/useCollectionSearch"; +import usePageSearch from "@dashboard/searches/usePageSearch"; +import useProductSearch from "@dashboard/searches/useProductSearch"; +import { useTaxClassFetchMore } from "@dashboard/taxes/utils/useTaxClassFetchMore"; +import { getProductErrorMessage } from "@dashboard/utils/errors"; +import useAttributeValueSearchHandler from "@dashboard/utils/handlers/attributeValueSearchHandler"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; +import { DialogContentText } from "@material-ui/core"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/products/views/ProductUpdate/handlers/errors.ts b/src/products/views/ProductUpdate/handlers/errors.ts index 1cd7950c1..f5377981a 100644 --- a/src/products/views/ProductUpdate/handlers/errors.ts +++ b/src/products/views/ProductUpdate/handlers/errors.ts @@ -10,8 +10,8 @@ import { VariantDatagridStockUpdateMutationVariables, VariantDatagridUpdateMutation, VariantDatagridUpdateMutationVariables, -} from "@saleor/graphql"; -import { hasMutationErrors } from "@saleor/misc"; +} from "@dashboard/graphql"; +import { hasMutationErrors } from "@dashboard/misc"; export type ProductVariantListError = | { diff --git a/src/products/views/ProductUpdate/handlers/index.ts b/src/products/views/ProductUpdate/handlers/index.ts index 3c8ce1eb1..765e4e6e4 100644 --- a/src/products/views/ProductUpdate/handlers/index.ts +++ b/src/products/views/ProductUpdate/handlers/index.ts @@ -4,9 +4,9 @@ import { ProductMediaCreateMutationVariables, ProductMediaReorderMutationVariables, ProductVariantReorderMutationFn, -} from "@saleor/graphql"; -import { ReorderEvent } from "@saleor/types"; -import { move } from "@saleor/utils/lists"; +} from "@dashboard/graphql"; +import { ReorderEvent } from "@dashboard/types"; +import { move } from "@dashboard/utils/lists"; import { arrayMove } from "react-sortable-hoc"; export function createImageUploadHandler( diff --git a/src/products/views/ProductUpdate/handlers/useProductUpdateHandler.ts b/src/products/views/ProductUpdate/handlers/useProductUpdateHandler.ts index fd65fcc8e..f8a833185 100644 --- a/src/products/views/ProductUpdate/handlers/useProductUpdateHandler.ts +++ b/src/products/views/ProductUpdate/handlers/useProductUpdateHandler.ts @@ -2,11 +2,11 @@ import { FetchResult } from "@apollo/client"; import { mergeAttributeValueDeleteErrors, mergeFileUploadErrors, -} from "@saleor/attributes/utils/data"; +} from "@dashboard/attributes/utils/data"; import { handleDeleteMultipleAttributeValues, handleUploadMultipleFiles, -} from "@saleor/attributes/utils/handlers"; +} from "@dashboard/attributes/utils/handlers"; import { AttributeErrorFragment, BulkProductErrorFragment, @@ -27,20 +27,20 @@ import { useVariantDatagridChannelListingUpdateMutation, useVariantDatagridStockUpdateMutation, useVariantDatagridUpdateMutation, -} from "@saleor/graphql"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { commonMessages } from "@saleor/intl"; -import { ProductUpdateSubmitData } from "@saleor/products/components/ProductUpdatePage/types"; -import { getVariantChannelsInputs } from "@saleor/products/components/ProductVariants/datagrid/getVariantChannelsInputs"; +} from "@dashboard/graphql"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { commonMessages } from "@dashboard/intl"; +import { ProductUpdateSubmitData } from "@dashboard/products/components/ProductUpdatePage/types"; +import { getVariantChannelsInputs } from "@dashboard/products/components/ProductVariants/datagrid/getVariantChannelsInputs"; import { getStockInputs, getStocks, getVariantChannels, getVariantInput, getVariantInputs, -} from "@saleor/products/components/ProductVariants/utils"; -import { getProductErrorMessage } from "@saleor/utils/errors"; -import createMetadataUpdateHandler from "@saleor/utils/handlers/metadataUpdateHandler"; +} from "@dashboard/products/components/ProductVariants/utils"; +import { getProductErrorMessage } from "@dashboard/utils/errors"; +import createMetadataUpdateHandler from "@dashboard/utils/handlers/metadataUpdateHandler"; import { useState } from "react"; import { useIntl } from "react-intl"; diff --git a/src/products/views/ProductUpdate/handlers/utils.test.ts b/src/products/views/ProductUpdate/handlers/utils.test.ts index 5ae4950f7..945cc6946 100644 --- a/src/products/views/ProductUpdate/handlers/utils.test.ts +++ b/src/products/views/ProductUpdate/handlers/utils.test.ts @@ -1,5 +1,5 @@ -import { ProductFragment } from "@saleor/graphql"; -import { ProductUpdateSubmitData } from "@saleor/products/components/ProductUpdatePage/types"; +import { ProductFragment } from "@dashboard/graphql"; +import { ProductUpdateSubmitData } from "@dashboard/products/components/ProductUpdatePage/types"; import { inferProductChannelsAfterUpdate } from "./utils"; diff --git a/src/products/views/ProductUpdate/handlers/utils.ts b/src/products/views/ProductUpdate/handlers/utils.ts index d5864671f..2d12e2c37 100644 --- a/src/products/views/ProductUpdate/handlers/utils.ts +++ b/src/products/views/ProductUpdate/handlers/utils.ts @@ -1,17 +1,17 @@ import { FetchResult } from "@apollo/client"; -import { getAttributesAfterFileAttributesUpdate } from "@saleor/attributes/utils/data"; -import { prepareAttributesInput } from "@saleor/attributes/utils/handlers"; -import { VALUES_PAGINATE_BY } from "@saleor/config"; +import { getAttributesAfterFileAttributesUpdate } from "@dashboard/attributes/utils/data"; +import { prepareAttributesInput } from "@dashboard/attributes/utils/handlers"; +import { VALUES_PAGINATE_BY } from "@dashboard/config"; import { FileUploadMutation, ProductChannelListingAddInput, ProductChannelListingUpdateMutationVariables, ProductFragment, -} from "@saleor/graphql"; -import { ProductUpdateSubmitData } from "@saleor/products/components/ProductUpdatePage/types"; -import { getColumnChannelAvailability } from "@saleor/products/components/ProductVariants/datagrid/columnData"; -import { getAttributeInputFromProduct } from "@saleor/products/utils/data"; -import { getParsedDataForJsonStringField } from "@saleor/utils/richText/misc"; +} from "@dashboard/graphql"; +import { ProductUpdateSubmitData } from "@dashboard/products/components/ProductUpdatePage/types"; +import { getColumnChannelAvailability } from "@dashboard/products/components/ProductVariants/datagrid/columnData"; +import { getAttributeInputFromProduct } from "@dashboard/products/utils/data"; +import { getParsedDataForJsonStringField } from "@dashboard/utils/richText/misc"; import pick from "lodash/pick"; import uniq from "lodash/uniq"; diff --git a/src/products/views/ProductVariant/ProductVariant.tsx b/src/products/views/ProductVariant/ProductVariant.tsx index 3c982a326..8c6540dea 100644 --- a/src/products/views/ProductVariant/ProductVariant.tsx +++ b/src/products/views/ProductVariant/ProductVariant.tsx @@ -3,17 +3,17 @@ import { getAttributesAfterFileAttributesUpdate, mergeAttributeValueDeleteErrors, mergeFileUploadErrors, -} from "@saleor/attributes/utils/data"; +} from "@dashboard/attributes/utils/data"; import { handleDeleteMultipleAttributeValues, handleUploadMultipleFiles, prepareAttributesInput, -} from "@saleor/attributes/utils/handlers"; -import { createVariantChannels } from "@saleor/channels/utils"; -import { AttributeInput } from "@saleor/components/Attributes"; -import NotFoundPage from "@saleor/components/NotFoundPage"; -import { WindowTitle } from "@saleor/components/WindowTitle"; -import { DEFAULT_INITIAL_SEARCH_DATA } from "@saleor/config"; +} from "@dashboard/attributes/utils/handlers"; +import { createVariantChannels } from "@dashboard/channels/utils"; +import { AttributeInput } from "@dashboard/components/Attributes"; +import NotFoundPage from "@dashboard/components/NotFoundPage"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; +import { DEFAULT_INITIAL_SEARCH_DATA } from "@dashboard/config"; import { ProductErrorWithAttributesFragment, useAttributeValueDeleteMutation, @@ -28,22 +28,22 @@ import { useVariantMediaUnassignMutation, useVariantUpdateMutation, useWarehouseListQuery, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import useOnSetDefaultVariant from "@saleor/hooks/useOnSetDefaultVariant"; -import useShop from "@saleor/hooks/useShop"; -import { commonMessages } from "@saleor/intl"; -import { weight } from "@saleor/misc"; -import { getAttributeInputFromVariant } from "@saleor/products/utils/data"; -import { handleAssignMedia } from "@saleor/products/utils/handlers"; -import usePageSearch from "@saleor/searches/usePageSearch"; -import useProductSearch from "@saleor/searches/useProductSearch"; -import useAttributeValueSearchHandler from "@saleor/utils/handlers/attributeValueSearchHandler"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createMetadataUpdateHandler from "@saleor/utils/handlers/metadataUpdateHandler"; -import { mapEdgesToItems } from "@saleor/utils/maps"; -import { warehouseAddPath } from "@saleor/warehouses/urls"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import useOnSetDefaultVariant from "@dashboard/hooks/useOnSetDefaultVariant"; +import useShop from "@dashboard/hooks/useShop"; +import { commonMessages } from "@dashboard/intl"; +import { weight } from "@dashboard/misc"; +import { getAttributeInputFromVariant } from "@dashboard/products/utils/data"; +import { handleAssignMedia } from "@dashboard/products/utils/handlers"; +import usePageSearch from "@dashboard/searches/usePageSearch"; +import useProductSearch from "@dashboard/searches/useProductSearch"; +import useAttributeValueSearchHandler from "@dashboard/utils/handlers/attributeValueSearchHandler"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createMetadataUpdateHandler from "@dashboard/utils/handlers/metadataUpdateHandler"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; +import { warehouseAddPath } from "@dashboard/warehouses/urls"; import React, { useEffect, useState } from "react"; import { useIntl } from "react-intl"; diff --git a/src/products/views/ProductVariant/useSubmitChannels.ts b/src/products/views/ProductVariant/useSubmitChannels.ts index 1e7789b28..cad9ac304 100644 --- a/src/products/views/ProductVariant/useSubmitChannels.ts +++ b/src/products/views/ProductVariant/useSubmitChannels.ts @@ -2,9 +2,9 @@ import { ProductVariantFragment, useProductChannelListingUpdateMutation, useProductVariantChannelListingUpdateMutation, -} from "@saleor/graphql"; -import { extractMutationErrors } from "@saleor/misc"; -import { ProductVariantUpdateSubmitData } from "@saleor/products/components/ProductVariantPage/form"; +} from "@dashboard/graphql"; +import { extractMutationErrors } from "@dashboard/misc"; +import { ProductVariantUpdateSubmitData } from "@dashboard/products/components/ProductVariantPage/form"; type Product = ProductVariantUpdateSubmitData; type Variant = ProductVariantFragment; diff --git a/src/products/views/ProductVariantCreate.tsx b/src/products/views/ProductVariantCreate.tsx index 6d1a8cd5e..6ff0512c9 100644 --- a/src/products/views/ProductVariantCreate.tsx +++ b/src/products/views/ProductVariantCreate.tsx @@ -1,12 +1,12 @@ -import { getAttributesAfterFileAttributesUpdate } from "@saleor/attributes/utils/data"; +import { getAttributesAfterFileAttributesUpdate } from "@dashboard/attributes/utils/data"; import { handleUploadMultipleFiles, prepareAttributesInput, -} from "@saleor/attributes/utils/handlers"; -import { AttributeInput } from "@saleor/components/Attributes"; -import NotFoundPage from "@saleor/components/NotFoundPage"; -import { WindowTitle } from "@saleor/components/WindowTitle"; -import { DEFAULT_INITIAL_SEARCH_DATA } from "@saleor/config"; +} from "@dashboard/attributes/utils/handlers"; +import { AttributeInput } from "@dashboard/components/Attributes"; +import NotFoundPage from "@dashboard/components/NotFoundPage"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; +import { DEFAULT_INITIAL_SEARCH_DATA } from "@dashboard/config"; import { useFileUploadMutation, useProductVariantChannelListingUpdateMutation, @@ -16,16 +16,16 @@ import { useUpdatePrivateMetadataMutation, useVariantCreateMutation, useWarehouseListQuery, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import useShop from "@saleor/hooks/useShop"; -import usePageSearch from "@saleor/searches/usePageSearch"; -import useProductSearch from "@saleor/searches/useProductSearch"; -import useAttributeValueSearchHandler from "@saleor/utils/handlers/attributeValueSearchHandler"; -import createMetadataCreateHandler from "@saleor/utils/handlers/metadataCreateHandler"; -import { mapEdgesToItems } from "@saleor/utils/maps"; -import { warehouseAddPath } from "@saleor/warehouses/urls"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import useShop from "@dashboard/hooks/useShop"; +import usePageSearch from "@dashboard/searches/usePageSearch"; +import useProductSearch from "@dashboard/searches/useProductSearch"; +import useAttributeValueSearchHandler from "@dashboard/utils/handlers/attributeValueSearchHandler"; +import createMetadataCreateHandler from "@dashboard/utils/handlers/metadataCreateHandler"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; +import { warehouseAddPath } from "@dashboard/warehouses/urls"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/searches/useAttributeSearch.ts b/src/searches/useAttributeSearch.ts index c81940f03..856c09656 100644 --- a/src/searches/useAttributeSearch.ts +++ b/src/searches/useAttributeSearch.ts @@ -3,8 +3,8 @@ import { SearchAttributesDocument, SearchAttributesQuery, SearchAttributesQueryVariables, -} from "@saleor/graphql"; -import makeTopLevelSearch from "@saleor/hooks/makeTopLevelSearch"; +} from "@dashboard/graphql"; +import makeTopLevelSearch from "@dashboard/hooks/makeTopLevelSearch"; export const searchAttributes = gql` query SearchAttributes($after: String, $first: Int!, $query: String!) { diff --git a/src/searches/useAttributeValueSearch.ts b/src/searches/useAttributeValueSearch.ts index 55ed56e66..c7d9a3f87 100644 --- a/src/searches/useAttributeValueSearch.ts +++ b/src/searches/useAttributeValueSearch.ts @@ -3,9 +3,9 @@ import { SearchAttributeValuesDocument, SearchAttributeValuesQuery, SearchAttributeValuesQueryVariables, -} from "@saleor/graphql"; -import makeSearch from "@saleor/hooks/makeSearch"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/graphql"; +import makeSearch from "@dashboard/hooks/makeSearch"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; export const searchAttributeValues = gql` query SearchAttributeValues( diff --git a/src/searches/useAvailableInGridAttributesSearch.ts b/src/searches/useAvailableInGridAttributesSearch.ts index 94ac74b9e..5bb45c5cc 100644 --- a/src/searches/useAvailableInGridAttributesSearch.ts +++ b/src/searches/useAvailableInGridAttributesSearch.ts @@ -3,8 +3,8 @@ import { SearchAvailableInGridAttributesDocument, SearchAvailableInGridAttributesQuery, SearchAvailableInGridAttributesQueryVariables, -} from "@saleor/graphql"; -import makeSearch from "@saleor/hooks/makeSearch"; +} from "@dashboard/graphql"; +import makeSearch from "@dashboard/hooks/makeSearch"; export const availableInGridAttributes = gql` query SearchAvailableInGridAttributes( diff --git a/src/searches/useAvailablePageAttributesSearch.ts b/src/searches/useAvailablePageAttributesSearch.ts index 2cf540d8d..d07b91546 100644 --- a/src/searches/useAvailablePageAttributesSearch.ts +++ b/src/searches/useAvailablePageAttributesSearch.ts @@ -3,8 +3,8 @@ import { SearchAvailablePageAttributesDocument, SearchAvailablePageAttributesQuery, SearchAvailablePageAttributesQueryVariables, -} from "@saleor/graphql"; -import makeSearch from "@saleor/hooks/makeSearch"; +} from "@dashboard/graphql"; +import makeSearch from "@dashboard/hooks/makeSearch"; export const searchPageAttributes = gql` query SearchAvailablePageAttributes( diff --git a/src/searches/useAvailableProductAttributeSearch.ts b/src/searches/useAvailableProductAttributeSearch.ts index 0f4288913..fb3625e28 100644 --- a/src/searches/useAvailableProductAttributeSearch.ts +++ b/src/searches/useAvailableProductAttributeSearch.ts @@ -3,8 +3,8 @@ import { SearchAvailableProductAttributesDocument, SearchAvailableProductAttributesQuery, SearchAvailableProductAttributesQueryVariables, -} from "@saleor/graphql"; -import makeSearch from "@saleor/hooks/makeSearch"; +} from "@dashboard/graphql"; +import makeSearch from "@dashboard/hooks/makeSearch"; export const searchProductAttributes = gql` query SearchAvailableProductAttributes( diff --git a/src/searches/useCategorySearch.ts b/src/searches/useCategorySearch.ts index 54cfbac71..08480701e 100644 --- a/src/searches/useCategorySearch.ts +++ b/src/searches/useCategorySearch.ts @@ -3,8 +3,8 @@ import { SearchCategoriesDocument, SearchCategoriesQuery, SearchCategoriesQueryVariables, -} from "@saleor/graphql"; -import makeTopLevelSearch from "@saleor/hooks/makeTopLevelSearch"; +} from "@dashboard/graphql"; +import makeTopLevelSearch from "@dashboard/hooks/makeTopLevelSearch"; export const searchCategories = gql` query SearchCategories($after: String, $first: Int!, $query: String!) { diff --git a/src/searches/useCollectionSearch.ts b/src/searches/useCollectionSearch.ts index af1309cf0..b788e2313 100644 --- a/src/searches/useCollectionSearch.ts +++ b/src/searches/useCollectionSearch.ts @@ -3,8 +3,8 @@ import { SearchCollectionsDocument, SearchCollectionsQuery, SearchCollectionsQueryVariables, -} from "@saleor/graphql"; -import makeTopLevelSearch from "@saleor/hooks/makeTopLevelSearch"; +} from "@dashboard/graphql"; +import makeTopLevelSearch from "@dashboard/hooks/makeTopLevelSearch"; export const searchCollections = gql` query SearchCollections($after: String, $first: Int!, $query: String!) { diff --git a/src/searches/useCustomerSearch.ts b/src/searches/useCustomerSearch.ts index dcaaaa5a4..71c74acf4 100644 --- a/src/searches/useCustomerSearch.ts +++ b/src/searches/useCustomerSearch.ts @@ -3,8 +3,8 @@ import { SearchCustomersDocument, SearchCustomersQuery, SearchCustomersQueryVariables, -} from "@saleor/graphql"; -import makeTopLevelSearch from "@saleor/hooks/makeTopLevelSearch"; +} from "@dashboard/graphql"; +import makeTopLevelSearch from "@dashboard/hooks/makeTopLevelSearch"; export const searchCustomers = gql` query SearchCustomers($after: String, $first: Int!, $query: String!) { diff --git a/src/searches/useGiftCardTagsSearch.ts b/src/searches/useGiftCardTagsSearch.ts index 168c140af..fbf7d4fff 100644 --- a/src/searches/useGiftCardTagsSearch.ts +++ b/src/searches/useGiftCardTagsSearch.ts @@ -3,8 +3,8 @@ import { SearchGiftCardTagsDocument, SearchGiftCardTagsQuery, SearchGiftCardTagsQueryVariables, -} from "@saleor/graphql"; -import makeTopLevelSearch from "@saleor/hooks/makeTopLevelSearch"; +} from "@dashboard/graphql"; +import makeTopLevelSearch from "@dashboard/hooks/makeTopLevelSearch"; export const searchGiftCardTags = gql` query SearchGiftCardTags( diff --git a/src/searches/useOrderVariantSearch.ts b/src/searches/useOrderVariantSearch.ts index 20544304b..3833553b9 100644 --- a/src/searches/useOrderVariantSearch.ts +++ b/src/searches/useOrderVariantSearch.ts @@ -3,8 +3,8 @@ import { SearchOrderVariantDocument, SearchOrderVariantQuery, SearchOrderVariantQueryVariables, -} from "@saleor/graphql"; -import makeTopLevelSearch from "@saleor/hooks/makeTopLevelSearch"; +} from "@dashboard/graphql"; +import makeTopLevelSearch from "@dashboard/hooks/makeTopLevelSearch"; export const searchOrderVariant = gql` query SearchOrderVariant( diff --git a/src/searches/usePageSearch.ts b/src/searches/usePageSearch.ts index ca16a8003..e33fb3c81 100644 --- a/src/searches/usePageSearch.ts +++ b/src/searches/usePageSearch.ts @@ -3,8 +3,8 @@ import { SearchPagesDocument, SearchPagesQuery, SearchPagesQueryVariables, -} from "@saleor/graphql"; -import makeTopLevelSearch from "@saleor/hooks/makeTopLevelSearch"; +} from "@dashboard/graphql"; +import makeTopLevelSearch from "@dashboard/hooks/makeTopLevelSearch"; export const searchPages = gql` query SearchPages($after: String, $first: Int!, $query: String!) { diff --git a/src/searches/usePageTypeSearch.ts b/src/searches/usePageTypeSearch.ts index 0753aa893..11c717444 100644 --- a/src/searches/usePageTypeSearch.ts +++ b/src/searches/usePageTypeSearch.ts @@ -3,8 +3,8 @@ import { SearchPageTypesDocument, SearchPageTypesQuery, SearchPageTypesQueryVariables, -} from "@saleor/graphql"; -import makeTopLevelSearch from "@saleor/hooks/makeTopLevelSearch"; +} from "@dashboard/graphql"; +import makeTopLevelSearch from "@dashboard/hooks/makeTopLevelSearch"; export const searchPageTypes = gql` query SearchPageTypes($after: String, $first: Int!, $query: String!) { diff --git a/src/searches/usePermissionGroupSearch.ts b/src/searches/usePermissionGroupSearch.ts index 1828cf953..815daad1d 100644 --- a/src/searches/usePermissionGroupSearch.ts +++ b/src/searches/usePermissionGroupSearch.ts @@ -3,8 +3,8 @@ import { SearchPermissionGroupsDocument, SearchPermissionGroupsQuery, SearchPermissionGroupsQueryVariables, -} from "@saleor/graphql"; -import makeTopLevelSearch from "@saleor/hooks/makeTopLevelSearch"; +} from "@dashboard/graphql"; +import makeTopLevelSearch from "@dashboard/hooks/makeTopLevelSearch"; export const searchPermissionGroups = gql` query SearchPermissionGroups($after: String, $first: Int!, $query: String!) { diff --git a/src/searches/useProductSearch.ts b/src/searches/useProductSearch.ts index 79652c2c7..6357371bd 100644 --- a/src/searches/useProductSearch.ts +++ b/src/searches/useProductSearch.ts @@ -3,8 +3,8 @@ import { SearchProductsDocument, SearchProductsQuery, SearchProductsQueryVariables, -} from "@saleor/graphql"; -import makeTopLevelSearch from "@saleor/hooks/makeTopLevelSearch"; +} from "@dashboard/graphql"; +import makeTopLevelSearch from "@dashboard/hooks/makeTopLevelSearch"; export const searchProducts = gql` query SearchProducts($after: String, $first: Int!, $query: String!) { diff --git a/src/searches/useProductTypeSearch.ts b/src/searches/useProductTypeSearch.ts index 9b74a2168..10b2ecd82 100644 --- a/src/searches/useProductTypeSearch.ts +++ b/src/searches/useProductTypeSearch.ts @@ -3,8 +3,8 @@ import { SearchProductTypesDocument, SearchProductTypesQuery, SearchProductTypesQueryVariables, -} from "@saleor/graphql"; -import makeTopLevelSearch from "@saleor/hooks/makeTopLevelSearch"; +} from "@dashboard/graphql"; +import makeTopLevelSearch from "@dashboard/hooks/makeTopLevelSearch"; export const searchProductTypes = gql` query SearchProductTypes($after: String, $first: Int!, $query: String!) { diff --git a/src/searches/useShippingZonesSearch.ts b/src/searches/useShippingZonesSearch.ts index 03cb3bf89..ff0684c9e 100644 --- a/src/searches/useShippingZonesSearch.ts +++ b/src/searches/useShippingZonesSearch.ts @@ -3,8 +3,8 @@ import { SearchShippingZonesDocument, SearchShippingZonesQuery, SearchShippingZonesQueryVariables, -} from "@saleor/graphql"; -import makeTopLevelSearch from "@saleor/hooks/makeTopLevelSearch"; +} from "@dashboard/graphql"; +import makeTopLevelSearch from "@dashboard/hooks/makeTopLevelSearch"; export const searchShippingZones = gql` query SearchShippingZones( diff --git a/src/searches/useStaffMemberSearch.ts b/src/searches/useStaffMemberSearch.ts index 7c9e7d289..398b5f69f 100644 --- a/src/searches/useStaffMemberSearch.ts +++ b/src/searches/useStaffMemberSearch.ts @@ -3,8 +3,8 @@ import { SearchStaffMembersDocument, SearchStaffMembersQuery, SearchStaffMembersQueryVariables, -} from "@saleor/graphql"; -import makeTopLevelSearch from "@saleor/hooks/makeTopLevelSearch"; +} from "@dashboard/graphql"; +import makeTopLevelSearch from "@dashboard/hooks/makeTopLevelSearch"; export const searchStaffMembers = gql` query SearchStaffMembers($after: String, $first: Int!, $query: String!) { diff --git a/src/searches/useWarehouseSearch.ts b/src/searches/useWarehouseSearch.ts index b7c9593b6..af9ab11f3 100644 --- a/src/searches/useWarehouseSearch.ts +++ b/src/searches/useWarehouseSearch.ts @@ -3,8 +3,8 @@ import { SearchWarehousesDocument, SearchWarehousesQuery, SearchWarehousesQueryVariables, -} from "@saleor/graphql"; -import makeTopLevelSearch from "@saleor/hooks/makeTopLevelSearch"; +} from "@dashboard/graphql"; +import makeTopLevelSearch from "@dashboard/hooks/makeTopLevelSearch"; export const searchWarehouses = gql` query SearchWarehouses($after: String, $first: Int!, $query: String!) { diff --git a/src/shipping/components/DeleteShippingRateDialog/DeleteShippingRateDialog.tsx b/src/shipping/components/DeleteShippingRateDialog/DeleteShippingRateDialog.tsx index c30bac90f..050405485 100644 --- a/src/shipping/components/DeleteShippingRateDialog/DeleteShippingRateDialog.tsx +++ b/src/shipping/components/DeleteShippingRateDialog/DeleteShippingRateDialog.tsx @@ -1,7 +1,7 @@ +import ActionDialog from "@dashboard/components/ActionDialog"; +import { getStringOrPlaceholder } from "@dashboard/misc"; import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { getStringOrPlaceholder } from "@saleor/misc"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/shipping/components/OrderValue/OrderValue.tsx b/src/shipping/components/OrderValue/OrderValue.tsx index e2c33fb4c..87f174fea 100644 --- a/src/shipping/components/OrderValue/OrderValue.tsx +++ b/src/shipping/components/OrderValue/OrderValue.tsx @@ -1,19 +1,19 @@ -import { Card, TableBody, TableCell, Typography } from "@material-ui/core"; -import VerticalSpacer from "@saleor/apps/components/VerticalSpacer"; -import { ChannelShippingData } from "@saleor/channels/utils"; -import CardTitle from "@saleor/components/CardTitle"; -import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; -import PriceField from "@saleor/components/PriceField"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import TableHead from "@saleor/components/TableHead"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { ShippingChannelsErrorFragment } from "@saleor/graphql"; -import { ChangeEvent } from "@saleor/hooks/useForm"; +import VerticalSpacer from "@dashboard/apps/components/VerticalSpacer"; +import { ChannelShippingData } from "@dashboard/channels/utils"; +import CardTitle from "@dashboard/components/CardTitle"; +import ControlledCheckbox from "@dashboard/components/ControlledCheckbox"; +import PriceField from "@dashboard/components/PriceField"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import TableHead from "@dashboard/components/TableHead"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { ShippingChannelsErrorFragment } from "@dashboard/graphql"; +import { ChangeEvent } from "@dashboard/hooks/useForm"; import { getFormChannelError, getFormChannelErrors, -} from "@saleor/utils/errors"; -import getShippingErrorMessage from "@saleor/utils/errors/shipping"; +} from "@dashboard/utils/errors"; +import getShippingErrorMessage from "@dashboard/utils/errors/shipping"; +import { Card, TableBody, TableCell, Typography } from "@material-ui/core"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/shipping/components/OrderWeight/OrderWeight.tsx b/src/shipping/components/OrderWeight/OrderWeight.tsx index 3bacd26b0..93b8e4363 100644 --- a/src/shipping/components/OrderWeight/OrderWeight.tsx +++ b/src/shipping/components/OrderWeight/OrderWeight.tsx @@ -1,3 +1,11 @@ +import VerticalSpacer from "@dashboard/apps/components/VerticalSpacer"; +import CardTitle from "@dashboard/components/CardTitle"; +import ControlledCheckbox from "@dashboard/components/ControlledCheckbox"; +import { ShippingErrorFragment } from "@dashboard/graphql"; +import { ChangeEvent } from "@dashboard/hooks/useForm"; +import useShop from "@dashboard/hooks/useShop"; +import { getShippingWeightRateErrorMessage } from "@dashboard/shipping/errors"; +import { getFormErrors } from "@dashboard/utils/errors"; import { Card, CardContent, @@ -5,14 +13,6 @@ import { TextField, Typography, } from "@material-ui/core"; -import VerticalSpacer from "@saleor/apps/components/VerticalSpacer"; -import CardTitle from "@saleor/components/CardTitle"; -import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; -import { ShippingErrorFragment } from "@saleor/graphql"; -import { ChangeEvent } from "@saleor/hooks/useForm"; -import useShop from "@saleor/hooks/useShop"; -import { getShippingWeightRateErrorMessage } from "@saleor/shipping/errors"; -import { getFormErrors } from "@saleor/utils/errors"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/shipping/components/PricingCard/PricingCard.tsx b/src/shipping/components/PricingCard/PricingCard.tsx index dd3b3ff22..57d074bfa 100644 --- a/src/shipping/components/PricingCard/PricingCard.tsx +++ b/src/shipping/components/PricingCard/PricingCard.tsx @@ -1,3 +1,15 @@ +import { ChannelShippingData } from "@dashboard/channels/utils"; +import CardTitle from "@dashboard/components/CardTitle"; +import PriceField from "@dashboard/components/PriceField"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import TableHead from "@dashboard/components/TableHead"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { ShippingChannelsErrorFragment } from "@dashboard/graphql"; +import { + getFormChannelError, + getFormChannelErrors, +} from "@dashboard/utils/errors"; +import getShippingErrorMessage from "@dashboard/utils/errors/shipping"; import { Card, CardContent, @@ -5,18 +17,6 @@ import { TableCell, Typography, } from "@material-ui/core"; -import { ChannelShippingData } from "@saleor/channels/utils"; -import CardTitle from "@saleor/components/CardTitle"; -import PriceField from "@saleor/components/PriceField"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import TableHead from "@saleor/components/TableHead"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { ShippingChannelsErrorFragment } from "@saleor/graphql"; -import { - getFormChannelError, - getFormChannelErrors, -} from "@saleor/utils/errors"; -import getShippingErrorMessage from "@saleor/utils/errors/shipping"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/shipping/components/ShippingMethodProducts/ShippingMethodProducts.tsx b/src/shipping/components/ShippingMethodProducts/ShippingMethodProducts.tsx index c823ecace..b2cd6cb77 100644 --- a/src/shipping/components/ShippingMethodProducts/ShippingMethodProducts.tsx +++ b/src/shipping/components/ShippingMethodProducts/ShippingMethodProducts.tsx @@ -1,3 +1,15 @@ +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import Checkbox from "@dashboard/components/Checkbox"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableCellAvatar from "@dashboard/components/TableCellAvatar"; +import TableHead from "@dashboard/components/TableHead"; +import { TablePaginationWithContext } from "@dashboard/components/TablePagination"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { ShippingZoneQuery } from "@dashboard/graphql"; +import { renderCollection } from "@dashboard/misc"; +import { ListActions, ListProps, RelayToFlat } from "@dashboard/types"; import { Card, TableBody, @@ -5,19 +17,7 @@ import { TableFooter, Typography, } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import Checkbox from "@saleor/components/Checkbox"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableCellAvatar from "@saleor/components/TableCellAvatar"; -import TableHead from "@saleor/components/TableHead"; -import { TablePaginationWithContext } from "@saleor/components/TablePagination"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { ShippingZoneQuery } from "@saleor/graphql"; import { DeleteIcon, IconButton, makeStyles } from "@saleor/macaw-ui"; -import { renderCollection } from "@saleor/misc"; -import { ListActions, ListProps, RelayToFlat } from "@saleor/types"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/shipping/components/ShippingMethodProductsAddDialog/ShippingMethodProductsAddDialog.tsx b/src/shipping/components/ShippingMethodProductsAddDialog/ShippingMethodProductsAddDialog.tsx index 19b95487f..ff274f202 100644 --- a/src/shipping/components/ShippingMethodProductsAddDialog/ShippingMethodProductsAddDialog.tsx +++ b/src/shipping/components/ShippingMethodProductsAddDialog/ShippingMethodProductsAddDialog.tsx @@ -1,4 +1,18 @@ import { FetchResult } from "@apollo/client"; +import BackButton from "@dashboard/components/BackButton"; +import Checkbox from "@dashboard/components/Checkbox"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableCellAvatar from "@dashboard/components/TableCellAvatar"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { + SearchProductsQuery, + ShippingPriceExcludeProductMutation, +} from "@dashboard/graphql"; +import useSearchQuery from "@dashboard/hooks/useSearchQuery"; +import { renderCollection } from "@dashboard/misc"; +import { FetchMoreProps, RelayToFlat } from "@dashboard/types"; import { CircularProgress, Dialog, @@ -9,21 +23,7 @@ import { TableCell, TextField, } from "@material-ui/core"; -import BackButton from "@saleor/components/BackButton"; -import Checkbox from "@saleor/components/Checkbox"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableCellAvatar from "@saleor/components/TableCellAvatar"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { - SearchProductsQuery, - ShippingPriceExcludeProductMutation, -} from "@saleor/graphql"; -import useSearchQuery from "@saleor/hooks/useSearchQuery"; import { ConfirmButtonTransitionState, makeStyles } from "@saleor/macaw-ui"; -import { renderCollection } from "@saleor/misc"; -import { FetchMoreProps, RelayToFlat } from "@saleor/types"; import React from "react"; import InfiniteScroll from "react-infinite-scroll-component"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/shipping/components/ShippingMethodTaxes/ShippingMethodTaxes.tsx b/src/shipping/components/ShippingMethodTaxes/ShippingMethodTaxes.tsx index 3f599a13a..3aaf00210 100644 --- a/src/shipping/components/ShippingMethodTaxes/ShippingMethodTaxes.tsx +++ b/src/shipping/components/ShippingMethodTaxes/ShippingMethodTaxes.tsx @@ -1,11 +1,11 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import SingleAutocompleteSelectField from "@dashboard/components/SingleAutocompleteSelectField"; +import { TaxClassBaseFragment } from "@dashboard/graphql"; +import { sectionNames } from "@dashboard/intl"; +import { taxesMessages } from "@dashboard/taxes/messages"; +import { FetchMoreProps } from "@dashboard/types"; import { Card, CardContent } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import SingleAutocompleteSelectField from "@saleor/components/SingleAutocompleteSelectField"; -import { TaxClassBaseFragment } from "@saleor/graphql"; -import { sectionNames } from "@saleor/intl"; import { makeStyles } from "@saleor/macaw-ui"; -import { taxesMessages } from "@saleor/taxes/messages"; -import { FetchMoreProps } from "@saleor/types"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/shipping/components/ShippingRateInfo/ShippingRateInfo.tsx b/src/shipping/components/ShippingRateInfo/ShippingRateInfo.tsx index 6c30f4816..899ea52b6 100644 --- a/src/shipping/components/ShippingRateInfo/ShippingRateInfo.tsx +++ b/src/shipping/components/ShippingRateInfo/ShippingRateInfo.tsx @@ -1,15 +1,15 @@ +import CardSpacer from "@dashboard/components/CardSpacer"; +import CardTitle from "@dashboard/components/CardTitle"; +import RichTextEditor from "@dashboard/components/RichTextEditor"; +import { RichTextEditorLoading } from "@dashboard/components/RichTextEditor/RichTextEditorLoading"; +import { ShippingErrorFragment } from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getShippingErrorMessage from "@dashboard/utils/errors/shipping"; +import { useRichTextContext } from "@dashboard/utils/richText/context"; import { OutputData } from "@editorjs/editorjs"; import { Card, CardContent, TextField } from "@material-ui/core"; -import CardSpacer from "@saleor/components/CardSpacer"; -import CardTitle from "@saleor/components/CardTitle"; -import RichTextEditor from "@saleor/components/RichTextEditor"; -import { RichTextEditorLoading } from "@saleor/components/RichTextEditor/RichTextEditorLoading"; -import { ShippingErrorFragment } from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; import { makeStyles } from "@saleor/macaw-ui"; -import { getFormErrors } from "@saleor/utils/errors"; -import getShippingErrorMessage from "@saleor/utils/errors/shipping"; -import { useRichTextContext } from "@saleor/utils/richText/context"; import React from "react"; import { defineMessages, useIntl } from "react-intl"; diff --git a/src/shipping/components/ShippingWeightUnitForm/ShippingWeightUnitForm.tsx b/src/shipping/components/ShippingWeightUnitForm/ShippingWeightUnitForm.tsx index 308a8aba6..c8cfb8ea4 100644 --- a/src/shipping/components/ShippingWeightUnitForm/ShippingWeightUnitForm.tsx +++ b/src/shipping/components/ShippingWeightUnitForm/ShippingWeightUnitForm.tsx @@ -1,11 +1,11 @@ +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import Form from "@dashboard/components/Form"; +import SingleSelectField from "@dashboard/components/SingleSelectField"; +import { WeightUnitsEnum } from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import { buttonMessages, sectionNames } from "@dashboard/intl"; import { Card, CardActions, CardContent } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import Form from "@saleor/components/Form"; -import SingleSelectField from "@saleor/components/SingleSelectField"; -import { WeightUnitsEnum } from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import { buttonMessages, sectionNames } from "@saleor/intl"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/shipping/components/ShippingZoneAddWarehouseDialog/ShippingZoneAddWarehouseDialog.tsx b/src/shipping/components/ShippingZoneAddWarehouseDialog/ShippingZoneAddWarehouseDialog.tsx index bd62a92bd..57d75b3bf 100644 --- a/src/shipping/components/ShippingZoneAddWarehouseDialog/ShippingZoneAddWarehouseDialog.tsx +++ b/src/shipping/components/ShippingZoneAddWarehouseDialog/ShippingZoneAddWarehouseDialog.tsx @@ -1,3 +1,23 @@ +import BackButton from "@dashboard/components/BackButton"; +import CompanyAddressForm from "@dashboard/components/CompanyAddressInput/CompanyAddressForm"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import Form from "@dashboard/components/Form"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import Hr from "@dashboard/components/Hr"; +import { AddressTypeInput } from "@dashboard/customers/types"; +import { + CountryWithCodeFragment, + WarehouseErrorFragment, +} from "@dashboard/graphql"; +import useAddressValidation from "@dashboard/hooks/useAddressValidation"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useModalDialogErrors from "@dashboard/hooks/useModalDialogErrors"; +import useModalDialogOpen from "@dashboard/hooks/useModalDialogOpen"; +import useStateFromProps from "@dashboard/hooks/useStateFromProps"; +import { buttonMessages } from "@dashboard/intl"; +import { DialogProps } from "@dashboard/types"; +import createSingleAutocompleteSelectHandler from "@dashboard/utils/handlers/singleAutocompleteSelectChangeHandler"; +import { mapCountriesToChoices } from "@dashboard/utils/maps"; import { Dialog, DialogActions, @@ -5,27 +25,7 @@ import { DialogTitle, TextField, } from "@material-ui/core"; -import BackButton from "@saleor/components/BackButton"; -import CompanyAddressForm from "@saleor/components/CompanyAddressInput/CompanyAddressForm"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import Form from "@saleor/components/Form"; -import FormSpacer from "@saleor/components/FormSpacer"; -import Hr from "@saleor/components/Hr"; -import { AddressTypeInput } from "@saleor/customers/types"; -import { - CountryWithCodeFragment, - WarehouseErrorFragment, -} from "@saleor/graphql"; -import useAddressValidation from "@saleor/hooks/useAddressValidation"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useModalDialogErrors from "@saleor/hooks/useModalDialogErrors"; -import useModalDialogOpen from "@saleor/hooks/useModalDialogOpen"; -import useStateFromProps from "@saleor/hooks/useStateFromProps"; -import { buttonMessages } from "@saleor/intl"; import { ConfirmButtonTransitionState, makeStyles } from "@saleor/macaw-ui"; -import { DialogProps } from "@saleor/types"; -import createSingleAutocompleteSelectHandler from "@saleor/utils/handlers/singleAutocompleteSelectChangeHandler"; -import { mapCountriesToChoices } from "@saleor/utils/maps"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/shipping/components/ShippingZoneCountriesAssignDialog/ShippingZoneCountriesAssignDialog.tsx b/src/shipping/components/ShippingZoneCountriesAssignDialog/ShippingZoneCountriesAssignDialog.tsx index 34d721a2c..5cee4ca33 100644 --- a/src/shipping/components/ShippingZoneCountriesAssignDialog/ShippingZoneCountriesAssignDialog.tsx +++ b/src/shipping/components/ShippingZoneCountriesAssignDialog/ShippingZoneCountriesAssignDialog.tsx @@ -1,3 +1,17 @@ +import BackButton from "@dashboard/components/BackButton"; +import Checkbox from "@dashboard/components/Checkbox"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import Form from "@dashboard/components/Form"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import Hr from "@dashboard/components/Hr"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { CountryWithCodeFragment } from "@dashboard/graphql"; +import { + getCountrySelectionMap, + isRestWorldCountriesSelected, +} from "@dashboard/shipping/handlers"; +import useScrollableDialogStyle from "@dashboard/styles/useScrollableDialogStyle"; import { Dialog, DialogActions, @@ -8,21 +22,7 @@ import { TextField, Typography, } from "@material-ui/core"; -import BackButton from "@saleor/components/BackButton"; -import Checkbox from "@saleor/components/Checkbox"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import Form from "@saleor/components/Form"; -import FormSpacer from "@saleor/components/FormSpacer"; -import Hr from "@saleor/components/Hr"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { CountryWithCodeFragment } from "@saleor/graphql"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { - getCountrySelectionMap, - isRestWorldCountriesSelected, -} from "@saleor/shipping/handlers"; -import useScrollableDialogStyle from "@saleor/styles/useScrollableDialogStyle"; import { filter } from "fuzzaldrin"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/shipping/components/ShippingZoneCountriesAssignDialog/handlers.ts b/src/shipping/components/ShippingZoneCountriesAssignDialog/handlers.ts index 7124700ca..b2db6f0db 100644 --- a/src/shipping/components/ShippingZoneCountriesAssignDialog/handlers.ts +++ b/src/shipping/components/ShippingZoneCountriesAssignDialog/handlers.ts @@ -1,4 +1,4 @@ -import { FormChange } from "@saleor/hooks/useForm"; +import { FormChange } from "@dashboard/hooks/useForm"; export function createCountryChangeHandler( selectedCountries: string[], diff --git a/src/shipping/components/ShippingZoneCreatePage/ShippingZoneCreatePage.stories.tsx b/src/shipping/components/ShippingZoneCreatePage/ShippingZoneCreatePage.stories.tsx index 1c1162b18..82c758a02 100644 --- a/src/shipping/components/ShippingZoneCreatePage/ShippingZoneCreatePage.stories.tsx +++ b/src/shipping/components/ShippingZoneCreatePage/ShippingZoneCreatePage.stories.tsx @@ -1,6 +1,6 @@ -import { ShippingErrorCode } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; -import { mapCountriesToCountriesCodes } from "@saleor/utils/maps"; +import { ShippingErrorCode } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; +import { mapCountriesToCountriesCodes } from "@dashboard/utils/maps"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/shipping/components/ShippingZoneCreatePage/ShippingZoneCreatePage.tsx b/src/shipping/components/ShippingZoneCreatePage/ShippingZoneCreatePage.tsx index 70aade781..a7dd0c31a 100644 --- a/src/shipping/components/ShippingZoneCreatePage/ShippingZoneCreatePage.tsx +++ b/src/shipping/components/ShippingZoneCreatePage/ShippingZoneCreatePage.tsx @@ -1,17 +1,17 @@ -import { Backlink } from "@saleor/components/Backlink"; -import CardSpacer from "@saleor/components/CardSpacer"; -import Container from "@saleor/components/Container"; -import CountryList from "@saleor/components/CountryList"; -import Form from "@saleor/components/Form"; -import Grid from "@saleor/components/Grid"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; -import { CountryFragment, ShippingErrorFragment } from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { sectionNames } from "@saleor/intl"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import Container from "@dashboard/components/Container"; +import CountryList from "@dashboard/components/CountryList"; +import Form from "@dashboard/components/Form"; +import Grid from "@dashboard/components/Grid"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; +import { CountryFragment, ShippingErrorFragment } from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { sectionNames } from "@dashboard/intl"; +import { shippingZonesListUrl } from "@dashboard/shipping/urls"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { shippingZonesListUrl } from "@saleor/shipping/urls"; import React from "react"; import { defineMessages, useIntl } from "react-intl"; diff --git a/src/shipping/components/ShippingZoneDetailsPage/ShippingZoneDetailsPage.stories.tsx b/src/shipping/components/ShippingZoneDetailsPage/ShippingZoneDetailsPage.stories.tsx index 7e0b2553a..461e2cba5 100644 --- a/src/shipping/components/ShippingZoneDetailsPage/ShippingZoneDetailsPage.stories.tsx +++ b/src/shipping/components/ShippingZoneDetailsPage/ShippingZoneDetailsPage.stories.tsx @@ -1,7 +1,7 @@ -import { fetchMoreProps, searchPageProps } from "@saleor/fixtures"; -import { ShippingErrorCode } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; -import { warehouseList } from "@saleor/warehouses/fixtures"; +import { fetchMoreProps, searchPageProps } from "@dashboard/fixtures"; +import { ShippingErrorCode } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; +import { warehouseList } from "@dashboard/warehouses/fixtures"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/shipping/components/ShippingZoneDetailsPage/ShippingZoneDetailsPage.tsx b/src/shipping/components/ShippingZoneDetailsPage/ShippingZoneDetailsPage.tsx index 7756aee28..07077e7aa 100644 --- a/src/shipping/components/ShippingZoneDetailsPage/ShippingZoneDetailsPage.tsx +++ b/src/shipping/components/ShippingZoneDetailsPage/ShippingZoneDetailsPage.tsx @@ -1,29 +1,29 @@ -import { Backlink } from "@saleor/components/Backlink"; -import CardSpacer from "@saleor/components/CardSpacer"; -import Container from "@saleor/components/Container"; -import CountryList from "@saleor/components/CountryList"; -import Form from "@saleor/components/Form"; -import Grid from "@saleor/components/Grid"; -import Metadata from "@saleor/components/Metadata/Metadata"; -import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; -import { SingleAutocompleteChoiceType } from "@saleor/components/SingleAutocompleteSelectField"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import Container from "@dashboard/components/Container"; +import CountryList from "@dashboard/components/CountryList"; +import Form from "@dashboard/components/Form"; +import Grid from "@dashboard/components/Grid"; +import Metadata from "@dashboard/components/Metadata/Metadata"; +import { MultiAutocompleteChoiceType } from "@dashboard/components/MultiAutocompleteSelectField"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; +import { SingleAutocompleteChoiceType } from "@dashboard/components/SingleAutocompleteSelectField"; import { ChannelFragment, ShippingErrorFragment, ShippingMethodTypeEnum, ShippingZoneDetailsFragment, ShippingZoneQuery, -} from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useStateFromProps from "@saleor/hooks/useStateFromProps"; +} from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useStateFromProps from "@dashboard/hooks/useStateFromProps"; +import { shippingZonesListUrl } from "@dashboard/shipping/urls"; +import createMultiAutocompleteSelectHandler from "@dashboard/utils/handlers/multiAutocompleteSelectChangeHandler"; +import { mapNodeToChoice } from "@dashboard/utils/maps"; +import useMetadataChangeTrigger from "@dashboard/utils/metadata/useMetadataChangeTrigger"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { shippingZonesListUrl } from "@saleor/shipping/urls"; -import createMultiAutocompleteSelectHandler from "@saleor/utils/handlers/multiAutocompleteSelectChangeHandler"; -import { mapNodeToChoice } from "@saleor/utils/maps"; -import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger"; import React from "react"; import { defineMessages, FormattedMessage, useIntl } from "react-intl"; diff --git a/src/shipping/components/ShippingZoneDetailsPage/types.ts b/src/shipping/components/ShippingZoneDetailsPage/types.ts index 9bbf022e2..c45910246 100644 --- a/src/shipping/components/ShippingZoneDetailsPage/types.ts +++ b/src/shipping/components/ShippingZoneDetailsPage/types.ts @@ -1,4 +1,4 @@ -import { MetadataFormData } from "@saleor/components/Metadata"; +import { MetadataFormData } from "@dashboard/components/Metadata"; export interface ShippingZoneUpdateFormData extends MetadataFormData { name: string; diff --git a/src/shipping/components/ShippingZoneDetailsPage/utils.ts b/src/shipping/components/ShippingZoneDetailsPage/utils.ts index a29998331..fb1c69690 100644 --- a/src/shipping/components/ShippingZoneDetailsPage/utils.ts +++ b/src/shipping/components/ShippingZoneDetailsPage/utils.ts @@ -1,5 +1,5 @@ -import { ShippingZoneQuery } from "@saleor/graphql"; -import { mapMetadataItemToInput } from "@saleor/utils/maps"; +import { ShippingZoneQuery } from "@dashboard/graphql"; +import { mapMetadataItemToInput } from "@dashboard/utils/maps"; import { ShippingZoneUpdateFormData } from "./types"; diff --git a/src/shipping/components/ShippingZoneInfo/ShippingZoneInfo.tsx b/src/shipping/components/ShippingZoneInfo/ShippingZoneInfo.tsx index 8c79f8120..4a43c0ddf 100644 --- a/src/shipping/components/ShippingZoneInfo/ShippingZoneInfo.tsx +++ b/src/shipping/components/ShippingZoneInfo/ShippingZoneInfo.tsx @@ -1,11 +1,11 @@ +import CardSpacer from "@dashboard/components/CardSpacer"; +import CardTitle from "@dashboard/components/CardTitle"; +import { ShippingErrorFragment } from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getShippingErrorMessage from "@dashboard/utils/errors/shipping"; import { Card, CardContent, TextField } from "@material-ui/core"; -import CardSpacer from "@saleor/components/CardSpacer"; -import CardTitle from "@saleor/components/CardTitle"; -import { ShippingErrorFragment } from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; import { makeStyles } from "@saleor/macaw-ui"; -import { getFormErrors } from "@saleor/utils/errors"; -import getShippingErrorMessage from "@saleor/utils/errors/shipping"; import React from "react"; import { defineMessages, FormattedMessage, useIntl } from "react-intl"; diff --git a/src/shipping/components/ShippingZonePostalCodeRangeDialog/ShippingZonePostalCodeRangeDialog.tsx b/src/shipping/components/ShippingZonePostalCodeRangeDialog/ShippingZonePostalCodeRangeDialog.tsx index f2100b75c..5b729ad06 100644 --- a/src/shipping/components/ShippingZonePostalCodeRangeDialog/ShippingZonePostalCodeRangeDialog.tsx +++ b/src/shipping/components/ShippingZonePostalCodeRangeDialog/ShippingZonePostalCodeRangeDialog.tsx @@ -1,3 +1,9 @@ +import BackButton from "@dashboard/components/BackButton"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import Form from "@dashboard/components/Form"; +import Grid from "@dashboard/components/Grid"; +import { commonMessages } from "@dashboard/intl"; +import { DialogProps, MinMax } from "@dashboard/types"; import { Dialog, DialogActions, @@ -6,13 +12,7 @@ import { TextField, Typography, } from "@material-ui/core"; -import BackButton from "@saleor/components/BackButton"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import Form from "@saleor/components/Form"; -import Grid from "@saleor/components/Grid"; -import { commonMessages } from "@saleor/intl"; import { ConfirmButtonTransitionState, makeStyles } from "@saleor/macaw-ui"; -import { DialogProps, MinMax } from "@saleor/types"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/shipping/components/ShippingZonePostalCodes/ShippingZonePostalCodes.tsx b/src/shipping/components/ShippingZonePostalCodes/ShippingZonePostalCodes.tsx index 1c691dba7..3794515fe 100644 --- a/src/shipping/components/ShippingZonePostalCodes/ShippingZonePostalCodes.tsx +++ b/src/shipping/components/ShippingZonePostalCodes/ShippingZonePostalCodes.tsx @@ -1,3 +1,15 @@ +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import RadioGroupField from "@dashboard/components/RadioGroupField"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { + PostalCodeRuleInclusionTypeEnum, + ShippingMethodTypeFragment, +} from "@dashboard/graphql"; +import ArrowDropdown from "@dashboard/icons/ArrowDropdown"; +import { renderCollection } from "@dashboard/misc"; import { Card, CardContent, @@ -6,19 +18,7 @@ import { TableHead, Typography, } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import RadioGroupField from "@saleor/components/RadioGroupField"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { - PostalCodeRuleInclusionTypeEnum, - ShippingMethodTypeFragment, -} from "@saleor/graphql"; -import ArrowDropdown from "@saleor/icons/ArrowDropdown"; import { DeleteIcon, IconButton, makeStyles } from "@saleor/macaw-ui"; -import { renderCollection } from "@saleor/misc"; import clsx from "clsx"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/shipping/components/ShippingZoneRates/ShippingZoneRates.tsx b/src/shipping/components/ShippingZoneRates/ShippingZoneRates.tsx index 8a8b3a025..cb3f08aa3 100644 --- a/src/shipping/components/ShippingZoneRates/ShippingZoneRates.tsx +++ b/src/shipping/components/ShippingZoneRates/ShippingZoneRates.tsx @@ -1,23 +1,23 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import IconButtonTableCell from "@dashboard/components/IconButtonTableCell"; +import Money from "@dashboard/components/Money"; +import MoneyRange from "@dashboard/components/MoneyRange"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import { TableButtonWrapper } from "@dashboard/components/TableButtonWrapper/TableButtonWrapper"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import WeightRange from "@dashboard/components/WeightRange"; +import { ShippingZoneDetailsFragment } from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { ChannelProps } from "@dashboard/types"; import { Card, TableBody, TableCell, TableHead } from "@material-ui/core"; import EditIcon from "@material-ui/icons/Edit"; -import CardTitle from "@saleor/components/CardTitle"; -import IconButtonTableCell from "@saleor/components/IconButtonTableCell"; -import Money from "@saleor/components/Money"; -import MoneyRange from "@saleor/components/MoneyRange"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import { TableButtonWrapper } from "@saleor/components/TableButtonWrapper/TableButtonWrapper"; -import TableRowLink from "@saleor/components/TableRowLink"; -import WeightRange from "@saleor/components/WeightRange"; -import { ShippingZoneDetailsFragment } from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; import { Button, DeleteIcon, ICONBUTTON_SIZE, makeStyles, } from "@saleor/macaw-ui"; -import { ChannelProps } from "@saleor/types"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/shipping/components/ShippingZoneRatesCreatePage/ShippingZoneRatesCreatePage.stories.tsx b/src/shipping/components/ShippingZoneRatesCreatePage/ShippingZoneRatesCreatePage.stories.tsx index e54c5a04f..fca70b4dd 100644 --- a/src/shipping/components/ShippingZoneRatesCreatePage/ShippingZoneRatesCreatePage.stories.tsx +++ b/src/shipping/components/ShippingZoneRatesCreatePage/ShippingZoneRatesCreatePage.stories.tsx @@ -1,9 +1,9 @@ import { PostalCodeRuleInclusionTypeEnum, ShippingMethodTypeEnum, -} from "@saleor/graphql"; -import Decorator from "@saleor/storybook//Decorator"; -import { taxClasses } from "@saleor/taxes/fixtures"; +} from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook//Decorator"; +import { taxClasses } from "@dashboard/taxes/fixtures"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/shipping/components/ShippingZoneRatesCreatePage/ShippingZoneRatesCreatePage.tsx b/src/shipping/components/ShippingZoneRatesCreatePage/ShippingZoneRatesCreatePage.tsx index 5a9f5e305..14927d0bf 100644 --- a/src/shipping/components/ShippingZoneRatesCreatePage/ShippingZoneRatesCreatePage.tsx +++ b/src/shipping/components/ShippingZoneRatesCreatePage/ShippingZoneRatesCreatePage.tsx @@ -1,12 +1,12 @@ -import { ChannelShippingData } from "@saleor/channels/utils"; -import { Backlink } from "@saleor/components/Backlink"; -import CardSpacer from "@saleor/components/CardSpacer"; -import ChannelsAvailabilityCard from "@saleor/components/ChannelsAvailabilityCard"; -import Container from "@saleor/components/Container"; -import { WithFormId } from "@saleor/components/Form"; -import Grid from "@saleor/components/Grid"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; +import { ChannelShippingData } from "@dashboard/channels/utils"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import ChannelsAvailabilityCard from "@dashboard/components/ChannelsAvailabilityCard"; +import Container from "@dashboard/components/Container"; +import { WithFormId } from "@dashboard/components/Form"; +import Grid from "@dashboard/components/Grid"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; import { PermissionEnum, PostalCodeRuleInclusionTypeEnum, @@ -15,21 +15,21 @@ import { ShippingMethodTypeEnum, ShippingMethodTypeFragment, TaxClassBaseFragment, -} from "@saleor/graphql"; -import useForm, { SubmitPromise } from "@saleor/hooks/useForm"; -import useHandleFormSubmit from "@saleor/hooks/useHandleFormSubmit"; -import useNavigator from "@saleor/hooks/useNavigator"; +} from "@dashboard/graphql"; +import useForm, { SubmitPromise } from "@dashboard/hooks/useForm"; +import useHandleFormSubmit from "@dashboard/hooks/useHandleFormSubmit"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { validatePrice } from "@dashboard/products/utils/validation"; +import { handleTaxClassChange } from "@dashboard/productTypes/handlers"; +import OrderValue from "@dashboard/shipping/components/OrderValue"; +import OrderWeight from "@dashboard/shipping/components/OrderWeight"; +import PricingCard from "@dashboard/shipping/components/PricingCard"; +import ShippingRateInfo from "@dashboard/shipping/components/ShippingRateInfo"; +import { createChannelsChangeHandler } from "@dashboard/shipping/handlers"; +import { FetchMoreProps } from "@dashboard/types"; +import { RichTextContext } from "@dashboard/utils/richText/context"; +import useRichText from "@dashboard/utils/richText/useRichText"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { validatePrice } from "@saleor/products/utils/validation"; -import { handleTaxClassChange } from "@saleor/productTypes/handlers"; -import OrderValue from "@saleor/shipping/components/OrderValue"; -import OrderWeight from "@saleor/shipping/components/OrderWeight"; -import PricingCard from "@saleor/shipping/components/PricingCard"; -import ShippingRateInfo from "@saleor/shipping/components/ShippingRateInfo"; -import { createChannelsChangeHandler } from "@saleor/shipping/handlers"; -import { FetchMoreProps } from "@saleor/types"; -import { RichTextContext } from "@saleor/utils/richText/context"; -import useRichText from "@saleor/utils/richText/useRichText"; import React, { FormEventHandler } from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/shipping/components/ShippingZoneRatesPage/ShippingZoneRatesPage.stories.tsx b/src/shipping/components/ShippingZoneRatesPage/ShippingZoneRatesPage.stories.tsx index 5534ff20a..b92f929bb 100644 --- a/src/shipping/components/ShippingZoneRatesPage/ShippingZoneRatesPage.stories.tsx +++ b/src/shipping/components/ShippingZoneRatesPage/ShippingZoneRatesPage.stories.tsx @@ -1,8 +1,8 @@ -import { ShippingMethodTypeEnum } from "@saleor/graphql"; -import { shippingZone } from "@saleor/shipping/fixtures"; -import Decorator from "@saleor/storybook//Decorator"; -import { PaginatorContextDecorator } from "@saleor/storybook/PaginatorContextDecorator"; -import { taxClasses } from "@saleor/taxes/fixtures"; +import { ShippingMethodTypeEnum } from "@dashboard/graphql"; +import { shippingZone } from "@dashboard/shipping/fixtures"; +import Decorator from "@dashboard/storybook//Decorator"; +import { PaginatorContextDecorator } from "@dashboard/storybook/PaginatorContextDecorator"; +import { taxClasses } from "@dashboard/taxes/fixtures"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/shipping/components/ShippingZoneRatesPage/ShippingZoneRatesPage.tsx b/src/shipping/components/ShippingZoneRatesPage/ShippingZoneRatesPage.tsx index 339d76d11..627970519 100644 --- a/src/shipping/components/ShippingZoneRatesPage/ShippingZoneRatesPage.tsx +++ b/src/shipping/components/ShippingZoneRatesPage/ShippingZoneRatesPage.tsx @@ -1,13 +1,13 @@ -import { ChannelShippingData } from "@saleor/channels/utils"; -import { Backlink } from "@saleor/components/Backlink"; -import CardSpacer from "@saleor/components/CardSpacer"; -import ChannelsAvailabilityCard from "@saleor/components/ChannelsAvailabilityCard"; -import Container from "@saleor/components/Container"; -import { WithFormId } from "@saleor/components/Form"; -import Grid from "@saleor/components/Grid"; -import Metadata from "@saleor/components/Metadata/Metadata"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; +import { ChannelShippingData } from "@dashboard/channels/utils"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import ChannelsAvailabilityCard from "@dashboard/components/ChannelsAvailabilityCard"; +import Container from "@dashboard/components/Container"; +import { WithFormId } from "@dashboard/components/Form"; +import Grid from "@dashboard/components/Grid"; +import Metadata from "@dashboard/components/Metadata/Metadata"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; import { PermissionEnum, PostalCodeRuleInclusionTypeEnum, @@ -17,25 +17,25 @@ import { ShippingMethodTypeFragment, ShippingZoneQuery, TaxClassBaseFragment, -} from "@saleor/graphql"; -import useForm, { SubmitPromise } from "@saleor/hooks/useForm"; -import useHandleFormSubmit from "@saleor/hooks/useHandleFormSubmit"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { useStateUpdate } from "@saleor/hooks/useStateUpdate"; +} from "@dashboard/graphql"; +import useForm, { SubmitPromise } from "@dashboard/hooks/useForm"; +import useHandleFormSubmit from "@dashboard/hooks/useHandleFormSubmit"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { useStateUpdate } from "@dashboard/hooks/useStateUpdate"; +import { validatePrice } from "@dashboard/products/utils/validation"; +import { handleTaxClassChange } from "@dashboard/productTypes/handlers"; +import OrderValue from "@dashboard/shipping/components/OrderValue"; +import OrderWeight from "@dashboard/shipping/components/OrderWeight"; +import PricingCard from "@dashboard/shipping/components/PricingCard"; +import ShippingMethodProducts from "@dashboard/shipping/components/ShippingMethodProducts"; +import ShippingRateInfo from "@dashboard/shipping/components/ShippingRateInfo"; +import { createChannelsChangeHandler } from "@dashboard/shipping/handlers"; +import { FetchMoreProps, ListActions, ListProps } from "@dashboard/types"; +import { mapEdgesToItems, mapMetadataItemToInput } from "@dashboard/utils/maps"; +import useMetadataChangeTrigger from "@dashboard/utils/metadata/useMetadataChangeTrigger"; +import { RichTextContext } from "@dashboard/utils/richText/context"; +import useRichText from "@dashboard/utils/richText/useRichText"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { validatePrice } from "@saleor/products/utils/validation"; -import { handleTaxClassChange } from "@saleor/productTypes/handlers"; -import OrderValue from "@saleor/shipping/components/OrderValue"; -import OrderWeight from "@saleor/shipping/components/OrderWeight"; -import PricingCard from "@saleor/shipping/components/PricingCard"; -import ShippingMethodProducts from "@saleor/shipping/components/ShippingMethodProducts"; -import ShippingRateInfo from "@saleor/shipping/components/ShippingRateInfo"; -import { createChannelsChangeHandler } from "@saleor/shipping/handlers"; -import { FetchMoreProps, ListActions, ListProps } from "@saleor/types"; -import { mapEdgesToItems, mapMetadataItemToInput } from "@saleor/utils/maps"; -import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger"; -import { RichTextContext } from "@saleor/utils/richText/context"; -import useRichText from "@saleor/utils/richText/useRichText"; import React, { FormEventHandler } from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/shipping/components/ShippingZoneRatesPage/types.ts b/src/shipping/components/ShippingZoneRatesPage/types.ts index fdfe96509..21487be74 100644 --- a/src/shipping/components/ShippingZoneRatesPage/types.ts +++ b/src/shipping/components/ShippingZoneRatesPage/types.ts @@ -1,7 +1,7 @@ +import { ChannelShippingData } from "@dashboard/channels/utils"; +import { MetadataFormData } from "@dashboard/components/Metadata"; +import { ShippingMethodTypeEnum } from "@dashboard/graphql"; import { OutputData } from "@editorjs/editorjs"; -import { ChannelShippingData } from "@saleor/channels/utils"; -import { MetadataFormData } from "@saleor/components/Metadata"; -import { ShippingMethodTypeEnum } from "@saleor/graphql"; export interface ShippingZoneRateCommonFormData { channelListings: ChannelShippingData[]; diff --git a/src/shipping/components/ShippingZoneSettingsCard/ChannelsSection.tsx b/src/shipping/components/ShippingZoneSettingsCard/ChannelsSection.tsx index fd56e31b1..33cf99d3b 100644 --- a/src/shipping/components/ShippingZoneSettingsCard/ChannelsSection.tsx +++ b/src/shipping/components/ShippingZoneSettingsCard/ChannelsSection.tsx @@ -1,11 +1,11 @@ -import CardSpacer from "@saleor/components/CardSpacer"; +import CardSpacer from "@dashboard/components/CardSpacer"; import MultiAutocompleteSelectField, { MultiAutocompleteChoiceType, -} from "@saleor/components/MultiAutocompleteSelectField"; -import { ChannelFragment } from "@saleor/graphql"; -import { useChannelsSearch } from "@saleor/hooks/useChannelsSearch"; -import { FormChange } from "@saleor/hooks/useForm"; -import { mapNodeToChoice } from "@saleor/utils/maps"; +} from "@dashboard/components/MultiAutocompleteSelectField"; +import { ChannelFragment } from "@dashboard/graphql"; +import { useChannelsSearch } from "@dashboard/hooks/useChannelsSearch"; +import { FormChange } from "@dashboard/hooks/useForm"; +import { mapNodeToChoice } from "@dashboard/utils/maps"; import React from "react"; import { defineMessages, FormattedMessage, useIntl } from "react-intl"; diff --git a/src/shipping/components/ShippingZoneSettingsCard/ShippingZoneSettingsCard.tsx b/src/shipping/components/ShippingZoneSettingsCard/ShippingZoneSettingsCard.tsx index 469c452ef..55a98adf8 100644 --- a/src/shipping/components/ShippingZoneSettingsCard/ShippingZoneSettingsCard.tsx +++ b/src/shipping/components/ShippingZoneSettingsCard/ShippingZoneSettingsCard.tsx @@ -1,8 +1,8 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import { MultiAutocompleteChoiceType } from "@dashboard/components/MultiAutocompleteSelectField"; +import { ChannelFragment } from "@dashboard/graphql"; +import { FormChange } from "@dashboard/hooks/useForm"; import { Card, CardContent, Divider } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField"; -import { ChannelFragment } from "@saleor/graphql"; -import { FormChange } from "@saleor/hooks/useForm"; import React from "react"; import { defineMessages, useIntl } from "react-intl"; diff --git a/src/shipping/components/ShippingZoneSettingsCard/WarehousesSection.tsx b/src/shipping/components/ShippingZoneSettingsCard/WarehousesSection.tsx index 5d00e8e67..39b270dc1 100644 --- a/src/shipping/components/ShippingZoneSettingsCard/WarehousesSection.tsx +++ b/src/shipping/components/ShippingZoneSettingsCard/WarehousesSection.tsx @@ -1,9 +1,9 @@ -import CardSpacer from "@saleor/components/CardSpacer"; +import CardSpacer from "@dashboard/components/CardSpacer"; import MultiAutocompleteSelectField, { MultiAutocompleteChoiceType, -} from "@saleor/components/MultiAutocompleteSelectField"; -import { FormChange } from "@saleor/hooks/useForm"; -import { FetchMoreProps, SearchProps } from "@saleor/types"; +} from "@dashboard/components/MultiAutocompleteSelectField"; +import { FormChange } from "@dashboard/hooks/useForm"; +import { FetchMoreProps, SearchProps } from "@dashboard/types"; import React from "react"; import { defineMessages, FormattedMessage, useIntl } from "react-intl"; diff --git a/src/shipping/components/ShippingZonesList/ShippingZonesList.tsx b/src/shipping/components/ShippingZonesList/ShippingZonesList.tsx index b2d20a352..b08e27acd 100644 --- a/src/shipping/components/ShippingZonesList/ShippingZonesList.tsx +++ b/src/shipping/components/ShippingZonesList/ShippingZonesList.tsx @@ -1,18 +1,18 @@ +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; +import Checkbox from "@dashboard/components/Checkbox"; +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import { TableButtonWrapper } from "@dashboard/components/TableButtonWrapper/TableButtonWrapper"; +import TableHead from "@dashboard/components/TableHead"; +import { TablePaginationWithContext } from "@dashboard/components/TablePagination"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { ShippingZoneFragment } from "@dashboard/graphql"; +import { maybe, renderCollection } from "@dashboard/misc"; +import { shippingZoneAddUrl, shippingZoneUrl } from "@dashboard/shipping/urls"; +import { ListActions, ListProps } from "@dashboard/types"; import { Card, TableBody, TableCell, TableFooter } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; -import Checkbox from "@saleor/components/Checkbox"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import { TableButtonWrapper } from "@saleor/components/TableButtonWrapper/TableButtonWrapper"; -import TableHead from "@saleor/components/TableHead"; -import { TablePaginationWithContext } from "@saleor/components/TablePagination"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { ShippingZoneFragment } from "@saleor/graphql"; import { DeleteIcon, IconButton, makeStyles } from "@saleor/macaw-ui"; -import { maybe, renderCollection } from "@saleor/misc"; -import { shippingZoneAddUrl, shippingZoneUrl } from "@saleor/shipping/urls"; -import { ListActions, ListProps } from "@saleor/types"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/shipping/components/ShippingZonesListPage/ShippingZonesListPage.stories.tsx b/src/shipping/components/ShippingZonesListPage/ShippingZonesListPage.stories.tsx index e7b2faf55..ba0bc2254 100644 --- a/src/shipping/components/ShippingZonesListPage/ShippingZonesListPage.stories.tsx +++ b/src/shipping/components/ShippingZonesListPage/ShippingZonesListPage.stories.tsx @@ -2,10 +2,10 @@ import { adminUserPermissions, listActionsProps, pageListProps, -} from "@saleor/fixtures"; -import { WeightUnitsEnum } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; -import { PaginatorContextDecorator } from "@saleor/storybook/PaginatorContextDecorator"; +} from "@dashboard/fixtures"; +import { WeightUnitsEnum } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; +import { PaginatorContextDecorator } from "@dashboard/storybook/PaginatorContextDecorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/shipping/components/ShippingZonesListPage/ShippingZonesListPage.tsx b/src/shipping/components/ShippingZonesListPage/ShippingZonesListPage.tsx index 1ca9d89c8..b17e95358 100644 --- a/src/shipping/components/ShippingZonesListPage/ShippingZonesListPage.tsx +++ b/src/shipping/components/ShippingZonesListPage/ShippingZonesListPage.tsx @@ -1,17 +1,21 @@ -import { Backlink } from "@saleor/components/Backlink"; -import Container from "@saleor/components/Container"; -import Grid from "@saleor/components/Grid"; -import PageHeader from "@saleor/components/PageHeader"; -import RequirePermissions from "@saleor/components/RequirePermissions"; -import { configurationMenuUrl } from "@saleor/configuration"; +import { Backlink } from "@dashboard/components/Backlink"; +import Container from "@dashboard/components/Container"; +import Grid from "@dashboard/components/Grid"; +import PageHeader from "@dashboard/components/PageHeader"; +import RequirePermissions from "@dashboard/components/RequirePermissions"; +import { configurationMenuUrl } from "@dashboard/configuration"; import { PermissionEnum, ShippingZoneFragment, WeightUnitsEnum, -} from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import { sectionNames } from "@saleor/intl"; -import { ListActions, PageListProps, UserPermissionProps } from "@saleor/types"; +} from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import { sectionNames } from "@dashboard/intl"; +import { + ListActions, + PageListProps, + UserPermissionProps, +} from "@dashboard/types"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/shipping/components/UnassignDialog/UnassignDialog.tsx b/src/shipping/components/UnassignDialog/UnassignDialog.tsx index dd93087bf..3e3199a2d 100644 --- a/src/shipping/components/UnassignDialog/UnassignDialog.tsx +++ b/src/shipping/components/UnassignDialog/UnassignDialog.tsx @@ -1,5 +1,5 @@ +import ActionDialog from "@dashboard/components/ActionDialog"; import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/shipping/errors.ts b/src/shipping/errors.ts index afef59d9b..2b70bdc64 100644 --- a/src/shipping/errors.ts +++ b/src/shipping/errors.ts @@ -1,5 +1,5 @@ -import { ShippingErrorCode, ShippingErrorFragment } from "@saleor/graphql"; -import getShippingErrorMessage from "@saleor/utils/errors/shipping"; +import { ShippingErrorCode, ShippingErrorFragment } from "@dashboard/graphql"; +import getShippingErrorMessage from "@dashboard/utils/errors/shipping"; import { defineMessages, IntlShape } from "react-intl"; const messages = defineMessages({ diff --git a/src/shipping/fixtures.ts b/src/shipping/fixtures.ts index 13a5468e1..3dc838280 100644 --- a/src/shipping/fixtures.ts +++ b/src/shipping/fixtures.ts @@ -5,8 +5,8 @@ import { ShippingZoneFragment, ShippingZoneQuery, WeightUnitsEnum, -} from "@saleor/graphql"; -import { RelayToFlat } from "@saleor/types"; +} from "@dashboard/graphql"; +import { RelayToFlat } from "@dashboard/types"; export const shippingZones: ShippingZoneFragment[] = [ { diff --git a/src/shipping/handlers.ts b/src/shipping/handlers.ts index 61bf37cd5..75456c6fc 100644 --- a/src/shipping/handlers.ts +++ b/src/shipping/handlers.ts @@ -1,4 +1,4 @@ -import { ChannelShippingData } from "@saleor/channels/utils"; +import { ChannelShippingData } from "@dashboard/channels/utils"; import { CountryFragment, CreateShippingRateMutationVariables, @@ -11,12 +11,12 @@ import { useCreateShippingRateMutation, useDeleteShippingRateMutation, useShippingMethodChannelListingUpdateMutation, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { commonMessages } from "@saleor/intl"; -import { extractMutationErrors, getMutationState } from "@saleor/misc"; -import { getParsedDataForJsonStringField } from "@saleor/utils/richText/misc"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { commonMessages } from "@dashboard/intl"; +import { extractMutationErrors, getMutationState } from "@dashboard/misc"; +import { getParsedDataForJsonStringField } from "@dashboard/utils/richText/misc"; import differenceBy from "lodash/differenceBy"; import { useIntl } from "react-intl"; diff --git a/src/shipping/index.tsx b/src/shipping/index.tsx index d9c9f7b8f..d9fef3b40 100644 --- a/src/shipping/index.tsx +++ b/src/shipping/index.tsx @@ -1,4 +1,4 @@ -import { sectionNames } from "@saleor/intl"; +import { sectionNames } from "@dashboard/intl"; import { parse as parseQs } from "qs"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/shipping/urls.ts b/src/shipping/urls.ts index b47a03f00..7b900ac2b 100644 --- a/src/shipping/urls.ts +++ b/src/shipping/urls.ts @@ -1,6 +1,6 @@ -import { ChannelsAction } from "@saleor/channels/urls"; -import { ShippingMethodTypeEnum } from "@saleor/graphql"; -import { stringifyQs } from "@saleor/utils/urls"; +import { ChannelsAction } from "@dashboard/channels/urls"; +import { ShippingMethodTypeEnum } from "@dashboard/graphql"; +import { stringifyQs } from "@dashboard/utils/urls"; import urlJoin from "url-join"; import { BulkAction, Dialog, Pagination, SingleAction } from "../types"; diff --git a/src/shipping/views/RateCreate.tsx b/src/shipping/views/RateCreate.tsx index bb94f3a0d..8439868ac 100644 --- a/src/shipping/views/RateCreate.tsx +++ b/src/shipping/views/RateCreate.tsx @@ -1,31 +1,31 @@ -import { createSortedShippingChannels } from "@saleor/channels/utils"; -import ChannelsAvailabilityDialog from "@saleor/components/ChannelsAvailabilityDialog"; -import { WindowTitle } from "@saleor/components/WindowTitle"; +import { createSortedShippingChannels } from "@dashboard/channels/utils"; +import ChannelsAvailabilityDialog from "@dashboard/components/ChannelsAvailabilityDialog"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; import { PostalCodeRuleInclusionTypeEnum, useShippingZoneChannelsQuery, -} from "@saleor/graphql"; -import useChannels from "@saleor/hooks/useChannels"; -import useNavigator from "@saleor/hooks/useNavigator"; -import { sectionNames } from "@saleor/intl"; -import ShippingZonePostalCodeRangeDialog from "@saleor/shipping/components/ShippingZonePostalCodeRangeDialog"; -import ShippingZoneRatesCreatePage from "@saleor/shipping/components/ShippingZoneRatesCreatePage"; -import { useShippingRateCreator } from "@saleor/shipping/handlers"; +} from "@dashboard/graphql"; +import useChannels from "@dashboard/hooks/useChannels"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { sectionNames } from "@dashboard/intl"; +import ShippingZonePostalCodeRangeDialog from "@dashboard/shipping/components/ShippingZonePostalCodeRangeDialog"; +import ShippingZoneRatesCreatePage from "@dashboard/shipping/components/ShippingZoneRatesCreatePage"; +import { useShippingRateCreator } from "@dashboard/shipping/handlers"; import { shippingRateCreateUrl, ShippingRateCreateUrlDialog, ShippingRateCreateUrlQueryParams, shippingZoneUrl, -} from "@saleor/shipping/urls"; -import postalCodesReducer from "@saleor/shipping/views/reducer"; +} from "@dashboard/shipping/urls"; +import postalCodesReducer from "@dashboard/shipping/views/reducer"; import { filterPostalCodes, getPostalCodeRuleByMinMax, getRuleObject, -} from "@saleor/shipping/views/utils"; -import { useTaxClassFetchMore } from "@saleor/taxes/utils/useTaxClassFetchMore"; -import { MinMax } from "@saleor/types"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; +} from "@dashboard/shipping/views/utils"; +import { useTaxClassFetchMore } from "@dashboard/taxes/utils/useTaxClassFetchMore"; +import { MinMax } from "@dashboard/types"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/shipping/views/RateUpdate.tsx b/src/shipping/views/RateUpdate.tsx index 100cee379..bf360e800 100644 --- a/src/shipping/views/RateUpdate.tsx +++ b/src/shipping/views/RateUpdate.tsx @@ -1,11 +1,11 @@ import { createShippingChannelsFromRate, createSortedShippingChannels, -} from "@saleor/channels/utils"; -import { Button } from "@saleor/components/Button"; -import ChannelsAvailabilityDialog from "@saleor/components/ChannelsAvailabilityDialog"; -import { WindowTitle } from "@saleor/components/WindowTitle"; -import { DEFAULT_INITIAL_SEARCH_DATA, PAGINATE_BY } from "@saleor/config"; +} from "@dashboard/channels/utils"; +import { Button } from "@dashboard/components/Button"; +import ChannelsAvailabilityDialog from "@dashboard/components/ChannelsAvailabilityDialog"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; +import { DEFAULT_INITIAL_SEARCH_DATA, PAGINATE_BY } from "@dashboard/config"; import { PostalCodeRuleInclusionTypeEnum, ShippingMethodTypeEnum, @@ -17,46 +17,46 @@ import { useUpdateMetadataMutation, useUpdatePrivateMetadataMutation, useUpdateShippingRateMutation, -} from "@saleor/graphql"; -import useBulkActions from "@saleor/hooks/useBulkActions"; -import useChannels from "@saleor/hooks/useChannels"; +} from "@dashboard/graphql"; +import useBulkActions from "@dashboard/hooks/useBulkActions"; +import useChannels from "@dashboard/hooks/useChannels"; import useLocalPaginator, { useLocalPaginationState, -} from "@saleor/hooks/useLocalPaginator"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { PaginatorContext } from "@saleor/hooks/usePaginator"; -import { commonMessages, sectionNames } from "@saleor/intl"; -import { getById, getByUnmatchingId } from "@saleor/misc"; -import useProductSearch from "@saleor/searches/useProductSearch"; -import DeleteShippingRateDialog from "@saleor/shipping/components/DeleteShippingRateDialog"; -import ShippingMethodProductsAddDialog from "@saleor/shipping/components/ShippingMethodProductsAddDialog"; -import ShippingZonePostalCodeRangeDialog from "@saleor/shipping/components/ShippingZonePostalCodeRangeDialog"; -import ShippingZoneRatesPage from "@saleor/shipping/components/ShippingZoneRatesPage"; -import { ShippingZoneRateUpdateFormData } from "@saleor/shipping/components/ShippingZoneRatesPage/types"; -import UnassignDialog from "@saleor/shipping/components/UnassignDialog"; +} from "@dashboard/hooks/useLocalPaginator"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { PaginatorContext } from "@dashboard/hooks/usePaginator"; +import { commonMessages, sectionNames } from "@dashboard/intl"; +import { getById, getByUnmatchingId } from "@dashboard/misc"; +import useProductSearch from "@dashboard/searches/useProductSearch"; +import DeleteShippingRateDialog from "@dashboard/shipping/components/DeleteShippingRateDialog"; +import ShippingMethodProductsAddDialog from "@dashboard/shipping/components/ShippingMethodProductsAddDialog"; +import ShippingZonePostalCodeRangeDialog from "@dashboard/shipping/components/ShippingZonePostalCodeRangeDialog"; +import ShippingZoneRatesPage from "@dashboard/shipping/components/ShippingZoneRatesPage"; +import { ShippingZoneRateUpdateFormData } from "@dashboard/shipping/components/ShippingZoneRatesPage/types"; +import UnassignDialog from "@dashboard/shipping/components/UnassignDialog"; import { getShippingMethodChannelVariables, getUpdateShippingPriceRateVariables, getUpdateShippingWeightRateVariables, -} from "@saleor/shipping/handlers"; +} from "@dashboard/shipping/handlers"; import { shippingRateEditUrl, ShippingRateUrlDialog, ShippingRateUrlQueryParams, shippingZoneUrl, -} from "@saleor/shipping/urls"; -import postalCodesReducer from "@saleor/shipping/views/reducer"; +} from "@dashboard/shipping/urls"; +import postalCodesReducer from "@dashboard/shipping/views/reducer"; import { filterPostalCodes, getPostalCodeRuleByMinMax, getRuleObject, -} from "@saleor/shipping/views/utils"; -import { useTaxClassFetchMore } from "@saleor/taxes/utils/useTaxClassFetchMore"; -import { MinMax } from "@saleor/types"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createMetadataUpdateHandler from "@saleor/utils/handlers/metadataUpdateHandler"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/shipping/views/utils"; +import { useTaxClassFetchMore } from "@dashboard/taxes/utils/useTaxClassFetchMore"; +import { MinMax } from "@dashboard/types"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createMetadataUpdateHandler from "@dashboard/utils/handlers/metadataUpdateHandler"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/shipping/views/ShippingZoneCreate.tsx b/src/shipping/views/ShippingZoneCreate.tsx index 705ad699c..d76029faf 100644 --- a/src/shipping/views/ShippingZoneCreate.tsx +++ b/src/shipping/views/ShippingZoneCreate.tsx @@ -1,13 +1,13 @@ import { useCreateShippingZoneMutation, useShopCountriesQuery, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import useShop from "@saleor/hooks/useShop"; -import { commonMessages } from "@saleor/intl"; -import { extractMutationErrors } from "@saleor/misc"; -import { mapCountriesToCountriesCodes } from "@saleor/utils/maps"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import useShop from "@dashboard/hooks/useShop"; +import { commonMessages } from "@dashboard/intl"; +import { extractMutationErrors } from "@dashboard/misc"; +import { mapCountriesToCountriesCodes } from "@dashboard/utils/maps"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/shipping/views/ShippingZoneDetails/index.tsx b/src/shipping/views/ShippingZoneDetails/index.tsx index 624b2b14a..87a797262 100644 --- a/src/shipping/views/ShippingZoneDetails/index.tsx +++ b/src/shipping/views/ShippingZoneDetails/index.tsx @@ -1,8 +1,7 @@ -import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; -import useAppChannel from "@saleor/components/AppLayout/AppChannelContext"; -import NotFoundPage from "@saleor/components/NotFoundPage"; -import { DEFAULT_INITIAL_SEARCH_DATA, PAGINATE_BY } from "@saleor/config"; +import ActionDialog from "@dashboard/components/ActionDialog"; +import useAppChannel from "@dashboard/components/AppLayout/AppChannelContext"; +import NotFoundPage from "@dashboard/components/NotFoundPage"; +import { DEFAULT_INITIAL_SEARCH_DATA, PAGINATE_BY } from "@dashboard/config"; import { CountryCode, ShippingMethodTypeEnum, @@ -15,29 +14,30 @@ import { useUpdatePrivateMetadataMutation, useUpdateShippingZoneMutation, useWarehouseCreateMutation, -} from "@saleor/graphql"; -import { useLocalPaginationState } from "@saleor/hooks/useLocalPaginator"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import useShop from "@saleor/hooks/useShop"; -import { commonMessages } from "@saleor/intl"; +} from "@dashboard/graphql"; +import { useLocalPaginationState } from "@dashboard/hooks/useLocalPaginator"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import useShop from "@dashboard/hooks/useShop"; +import { commonMessages } from "@dashboard/intl"; import { extractMutationErrors, findValueInEnum, getById, getStringOrPlaceholder, -} from "@saleor/misc"; -import useWarehouseSearch from "@saleor/searches/useWarehouseSearch"; -import DeleteShippingRateDialog from "@saleor/shipping/components/DeleteShippingRateDialog"; -import ShippingZoneAddWarehouseDialog from "@saleor/shipping/components/ShippingZoneAddWarehouseDialog"; -import ShippingZoneCountriesAssignDialog from "@saleor/shipping/components/ShippingZoneCountriesAssignDialog"; -import { arrayDiff } from "@saleor/utils/arrays"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createMetadataUpdateHandler from "@saleor/utils/handlers/metadataUpdateHandler"; +} from "@dashboard/misc"; +import useWarehouseSearch from "@dashboard/searches/useWarehouseSearch"; +import DeleteShippingRateDialog from "@dashboard/shipping/components/DeleteShippingRateDialog"; +import ShippingZoneAddWarehouseDialog from "@dashboard/shipping/components/ShippingZoneAddWarehouseDialog"; +import ShippingZoneCountriesAssignDialog from "@dashboard/shipping/components/ShippingZoneCountriesAssignDialog"; +import { arrayDiff } from "@dashboard/utils/arrays"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createMetadataUpdateHandler from "@dashboard/utils/handlers/metadataUpdateHandler"; import { mapCountriesToCountriesCodes, mapEdgesToItems, -} from "@saleor/utils/maps"; +} from "@dashboard/utils/maps"; +import { DialogContentText } from "@material-ui/core"; import { diff } from "fast-array-diff"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/shipping/views/ShippingZonesList.tsx b/src/shipping/views/ShippingZonesList.tsx index 36b226cf7..f2638ae8c 100644 --- a/src/shipping/views/ShippingZonesList.tsx +++ b/src/shipping/views/ShippingZonesList.tsx @@ -1,33 +1,33 @@ -import { DialogContentText } from "@material-ui/core"; -import { useUser } from "@saleor/auth"; -import ActionDialog from "@saleor/components/ActionDialog"; +import { useUser } from "@dashboard/auth"; +import ActionDialog from "@dashboard/components/ActionDialog"; import { useBulkDeleteShippingZoneMutation, useDeleteShippingZoneMutation, useShippingZonesQuery, useUpdateDefaultWeightUnitMutation, -} from "@saleor/graphql"; -import useBulkActions from "@saleor/hooks/useBulkActions"; -import useListSettings from "@saleor/hooks/useListSettings"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; +} from "@dashboard/graphql"; +import useBulkActions from "@dashboard/hooks/useBulkActions"; +import useListSettings from "@dashboard/hooks/useListSettings"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { usePaginationReset } from "@dashboard/hooks/usePaginationReset"; import usePaginator, { createPaginationState, PaginatorContext, -} from "@saleor/hooks/usePaginator"; -import useShop from "@saleor/hooks/useShop"; -import { commonMessages } from "@saleor/intl"; -import { DeleteIcon, IconButton } from "@saleor/macaw-ui"; +} from "@dashboard/hooks/usePaginator"; +import useShop from "@dashboard/hooks/useShop"; +import { commonMessages } from "@dashboard/intl"; import { extractMutationErrors, getById, getStringOrPlaceholder, maybe, -} from "@saleor/misc"; -import { ListViews } from "@saleor/types"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/misc"; +import { ListViews } from "@dashboard/types"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; +import { DialogContentText } from "@material-ui/core"; +import { DeleteIcon, IconButton } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/shipping/views/reducer.tsx b/src/shipping/views/reducer.tsx index a4a3b9a4d..a56fc44c4 100644 --- a/src/shipping/views/reducer.tsx +++ b/src/shipping/views/reducer.tsx @@ -1,7 +1,7 @@ import { PostalCodeRuleInclusionTypeEnum, ShippingMethodWithPostalCodesFragment, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; export interface PostalCodesState { codesToDelete?: string[]; diff --git a/src/shipping/views/utils.tsx b/src/shipping/views/utils.tsx index 6db455ac2..dfce9e180 100644 --- a/src/shipping/views/utils.tsx +++ b/src/shipping/views/utils.tsx @@ -1,5 +1,5 @@ -import { PostalCodeRuleInclusionTypeEnum } from "@saleor/graphql"; -import { MinMax } from "@saleor/types"; +import { PostalCodeRuleInclusionTypeEnum } from "@dashboard/graphql"; +import { MinMax } from "@dashboard/types"; export const filterPostalCodes = (postalCodes, codeToFilterOut) => postalCodes.filter( diff --git a/src/siteSettings/components/SiteCheckoutSettingsCard/SiteCheckoutSettingsCard.tsx b/src/siteSettings/components/SiteCheckoutSettingsCard/SiteCheckoutSettingsCard.tsx index 10da598e2..40980dabb 100644 --- a/src/siteSettings/components/SiteCheckoutSettingsCard/SiteCheckoutSettingsCard.tsx +++ b/src/siteSettings/components/SiteCheckoutSettingsCard/SiteCheckoutSettingsCard.tsx @@ -1,8 +1,8 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import { ShopErrorFragment } from "@dashboard/graphql"; +import { getFormErrors } from "@dashboard/utils/errors"; import { Card, CardContent, TextField, Typography } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import FormSpacer from "@saleor/components/FormSpacer"; -import { ShopErrorFragment } from "@saleor/graphql"; -import { getFormErrors } from "@saleor/utils/errors"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/siteSettings/components/SiteSettingsPage/SiteSettingsPage.stories.tsx b/src/siteSettings/components/SiteSettingsPage/SiteSettingsPage.stories.tsx index 2980abbc6..15160f2fd 100644 --- a/src/siteSettings/components/SiteSettingsPage/SiteSettingsPage.stories.tsx +++ b/src/siteSettings/components/SiteSettingsPage/SiteSettingsPage.stories.tsx @@ -1,6 +1,6 @@ -import { ShopErrorCode } from "@saleor/graphql"; -import { shop } from "@saleor/siteSettings/fixtures"; -import Decorator from "@saleor/storybook/Decorator"; +import { ShopErrorCode } from "@dashboard/graphql"; +import { shop } from "@dashboard/siteSettings/fixtures"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/siteSettings/components/SiteSettingsPage/SiteSettingsPage.tsx b/src/siteSettings/components/SiteSettingsPage/SiteSettingsPage.tsx index c07d724d3..7f7ab47f5 100644 --- a/src/siteSettings/components/SiteSettingsPage/SiteSettingsPage.tsx +++ b/src/siteSettings/components/SiteSettingsPage/SiteSettingsPage.tsx @@ -1,23 +1,23 @@ -import { createCountryHandler } from "@saleor/components/AddressEdit/createCountryHandler"; -import { Backlink } from "@saleor/components/Backlink"; -import CompanyAddressInput from "@saleor/components/CompanyAddressInput"; -import Container from "@saleor/components/Container"; -import Form from "@saleor/components/Form"; -import Grid from "@saleor/components/Grid"; -import Hr from "@saleor/components/Hr"; -import PageHeader from "@saleor/components/PageHeader"; -import PageSectionHeader from "@saleor/components/PageSectionHeader"; -import Savebar from "@saleor/components/Savebar"; -import { configurationMenuUrl } from "@saleor/configuration"; -import { ShopErrorFragment, SiteSettingsQuery } from "@saleor/graphql"; -import useAddressValidation from "@saleor/hooks/useAddressValidation"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useStateFromProps from "@saleor/hooks/useStateFromProps"; -import { commonMessages, sectionNames } from "@saleor/intl"; +import { createCountryHandler } from "@dashboard/components/AddressEdit/createCountryHandler"; +import { Backlink } from "@dashboard/components/Backlink"; +import CompanyAddressInput from "@dashboard/components/CompanyAddressInput"; +import Container from "@dashboard/components/Container"; +import Form from "@dashboard/components/Form"; +import Grid from "@dashboard/components/Grid"; +import Hr from "@dashboard/components/Hr"; +import PageHeader from "@dashboard/components/PageHeader"; +import PageSectionHeader from "@dashboard/components/PageSectionHeader"; +import Savebar from "@dashboard/components/Savebar"; +import { configurationMenuUrl } from "@dashboard/configuration"; +import { ShopErrorFragment, SiteSettingsQuery } from "@dashboard/graphql"; +import useAddressValidation from "@dashboard/hooks/useAddressValidation"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useStateFromProps from "@dashboard/hooks/useStateFromProps"; +import { commonMessages, sectionNames } from "@dashboard/intl"; +import createSingleAutocompleteSelectHandler from "@dashboard/utils/handlers/singleAutocompleteSelectChangeHandler"; +import { mapCountriesToChoices } from "@dashboard/utils/maps"; import { ConfirmButtonTransitionState, makeStyles } from "@saleor/macaw-ui"; -import createSingleAutocompleteSelectHandler from "@saleor/utils/handlers/singleAutocompleteSelectChangeHandler"; -import { mapCountriesToChoices } from "@saleor/utils/maps"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/siteSettings/fixtures.ts b/src/siteSettings/fixtures.ts index 78441071a..7896b22e1 100644 --- a/src/siteSettings/fixtures.ts +++ b/src/siteSettings/fixtures.ts @@ -1,4 +1,4 @@ -import { SiteSettingsQuery } from "@saleor/graphql"; +import { SiteSettingsQuery } from "@dashboard/graphql"; export const shop: SiteSettingsQuery["shop"] = { __typename: "Shop", diff --git a/src/siteSettings/urls.ts b/src/siteSettings/urls.ts index 3bd3f40c7..269ed5ec0 100644 --- a/src/siteSettings/urls.ts +++ b/src/siteSettings/urls.ts @@ -1,4 +1,4 @@ -import { stringifyQs } from "@saleor/utils/urls"; +import { stringifyQs } from "@dashboard/utils/urls"; import { Dialog } from "../types"; diff --git a/src/siteSettings/views/index.tsx b/src/siteSettings/views/index.tsx index f58f06731..aee530e6e 100644 --- a/src/siteSettings/views/index.tsx +++ b/src/siteSettings/views/index.tsx @@ -1,11 +1,11 @@ -import { WindowTitle } from "@saleor/components/WindowTitle"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; import { CountryCode, useShopSettingsUpdateMutation, useSiteSettingsQuery, -} from "@saleor/graphql"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { commonMessages, sectionNames } from "@saleor/intl"; +} from "@dashboard/graphql"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { commonMessages, sectionNames } from "@dashboard/intl"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/staff/components/StaffAddMemberDialog/StaffAddMemberDialog.tsx b/src/staff/components/StaffAddMemberDialog/StaffAddMemberDialog.tsx index ad1968139..5cd7ec7fb 100644 --- a/src/staff/components/StaffAddMemberDialog/StaffAddMemberDialog.tsx +++ b/src/staff/components/StaffAddMemberDialog/StaffAddMemberDialog.tsx @@ -1,3 +1,16 @@ +import BackButton from "@dashboard/components/BackButton"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import Form from "@dashboard/components/Form"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import { + SearchPermissionGroupsQuery, + StaffErrorFragment, +} from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useModalDialogErrors from "@dashboard/hooks/useModalDialogErrors"; +import { commonMessages } from "@dashboard/intl"; +import { FetchMoreProps, RelayToFlat, SearchPageProps } from "@dashboard/types"; +import { getFormErrors } from "@dashboard/utils/errors"; import { Dialog, DialogActions, @@ -5,20 +18,7 @@ import { DialogTitle, TextField, } from "@material-ui/core"; -import BackButton from "@saleor/components/BackButton"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import Form from "@saleor/components/Form"; -import FormSpacer from "@saleor/components/FormSpacer"; -import { - SearchPermissionGroupsQuery, - StaffErrorFragment, -} from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useModalDialogErrors from "@saleor/hooks/useModalDialogErrors"; -import { commonMessages } from "@saleor/intl"; import { ConfirmButtonTransitionState, makeStyles } from "@saleor/macaw-ui"; -import { FetchMoreProps, RelayToFlat, SearchPageProps } from "@saleor/types"; -import { getFormErrors } from "@saleor/utils/errors"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/staff/components/StaffDetailsPage/StaffDetailsPage.stories.tsx b/src/staff/components/StaffDetailsPage/StaffDetailsPage.stories.tsx index 40110e849..13bb40eb9 100644 --- a/src/staff/components/StaffDetailsPage/StaffDetailsPage.stories.tsx +++ b/src/staff/components/StaffDetailsPage/StaffDetailsPage.stories.tsx @@ -1,6 +1,6 @@ -import { userPermissionGroups } from "@saleor/permissionGroups/fixtures"; -import { staffMember } from "@saleor/staff/fixtures"; -import Decorator from "@saleor/storybook/Decorator"; +import { userPermissionGroups } from "@dashboard/permissionGroups/fixtures"; +import { staffMember } from "@dashboard/staff/fixtures"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/staff/components/StaffDetailsPage/StaffDetailsPage.tsx b/src/staff/components/StaffDetailsPage/StaffDetailsPage.tsx index a6a861ea9..08ce3bcce 100644 --- a/src/staff/components/StaffDetailsPage/StaffDetailsPage.tsx +++ b/src/staff/components/StaffDetailsPage/StaffDetailsPage.tsx @@ -1,32 +1,35 @@ -import { Card, CardContent, Typography } from "@material-ui/core"; -import AccountPermissionGroups from "@saleor/components/AccountPermissionGroups"; -import { Backlink } from "@saleor/components/Backlink"; -import CardSpacer from "@saleor/components/CardSpacer"; -import CardTitle from "@saleor/components/CardTitle"; -import Container from "@saleor/components/Container"; -import Form from "@saleor/components/Form"; -import Grid from "@saleor/components/Grid"; -import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; +import AccountPermissionGroups from "@dashboard/components/AccountPermissionGroups"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import CardTitle from "@dashboard/components/CardTitle"; +import Container from "@dashboard/components/Container"; +import Form from "@dashboard/components/Form"; +import Grid from "@dashboard/components/Grid"; +import { MultiAutocompleteChoiceType } from "@dashboard/components/MultiAutocompleteSelectField"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; import { SearchPermissionGroupsQuery, StaffErrorFragment, StaffMemberDetailsFragment, UserFragment, -} from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useLocale from "@saleor/hooks/useLocale"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useStateFromProps from "@saleor/hooks/useStateFromProps"; -import { sectionNames } from "@saleor/intl"; +} from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useLocale from "@dashboard/hooks/useLocale"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useStateFromProps from "@dashboard/hooks/useStateFromProps"; +import { sectionNames } from "@dashboard/intl"; +import { getUserName } from "@dashboard/misc"; +import UserStatus from "@dashboard/staff/components/UserStatus"; +import { staffListUrl } from "@dashboard/staff/urls"; +import { + getMemberPermissionGroups, + isMemberActive, +} from "@dashboard/staff/utils"; +import { FetchMoreProps, RelayToFlat, SearchPageProps } from "@dashboard/types"; +import createMultiAutocompleteSelectHandler from "@dashboard/utils/handlers/multiAutocompleteSelectChangeHandler"; +import { Card, CardContent, Typography } from "@material-ui/core"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { getUserName } from "@saleor/misc"; -import UserStatus from "@saleor/staff/components/UserStatus"; -import { staffListUrl } from "@saleor/staff/urls"; -import { getMemberPermissionGroups, isMemberActive } from "@saleor/staff/utils"; -import { FetchMoreProps, RelayToFlat, SearchPageProps } from "@saleor/types"; -import createMultiAutocompleteSelectHandler from "@saleor/utils/handlers/multiAutocompleteSelectChangeHandler"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/staff/components/StaffList/StaffList.tsx b/src/staff/components/StaffList/StaffList.tsx index 93ee75c61..ab76d8efe 100644 --- a/src/staff/components/StaffList/StaffList.tsx +++ b/src/staff/components/StaffList/StaffList.tsx @@ -1,3 +1,21 @@ +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableCellHeader from "@dashboard/components/TableCellHeader"; +import { TablePaginationWithContext } from "@dashboard/components/TablePagination"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { StaffListQuery } from "@dashboard/graphql"; +import { + getUserInitials, + getUserName, + maybe, + renderCollection, +} from "@dashboard/misc"; +import { + StaffListUrlSortField, + staffMemberDetailsUrl, +} from "@dashboard/staff/urls"; +import { ListProps, RelayToFlat, SortPage } from "@dashboard/types"; +import { getArrowDirection } from "@dashboard/utils/sort"; import { TableBody, TableCell, @@ -5,25 +23,7 @@ import { TableHead, Typography, } from "@material-ui/core"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableCellHeader from "@saleor/components/TableCellHeader"; -import { TablePaginationWithContext } from "@saleor/components/TablePagination"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { StaffListQuery } from "@saleor/graphql"; import { makeStyles } from "@saleor/macaw-ui"; -import { - getUserInitials, - getUserName, - maybe, - renderCollection, -} from "@saleor/misc"; -import { - StaffListUrlSortField, - staffMemberDetailsUrl, -} from "@saleor/staff/urls"; -import { ListProps, RelayToFlat, SortPage } from "@saleor/types"; -import { getArrowDirection } from "@saleor/utils/sort"; import clsx from "clsx"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/staff/components/StaffListPage/StaffListPage.stories.tsx b/src/staff/components/StaffListPage/StaffListPage.stories.tsx index e740f2f62..dbab56d75 100644 --- a/src/staff/components/StaffListPage/StaffListPage.stories.tsx +++ b/src/staff/components/StaffListPage/StaffListPage.stories.tsx @@ -6,12 +6,12 @@ import { searchPageProps, sortPageProps, tabPageProps, -} from "@saleor/fixtures"; -import { StaffMemberStatus } from "@saleor/graphql"; -import { staffMembers } from "@saleor/staff/fixtures"; -import { StaffListUrlSortField } from "@saleor/staff/urls"; -import Decorator from "@saleor/storybook/Decorator"; -import { PaginatorContextDecorator } from "@saleor/storybook/PaginatorContextDecorator"; +} from "@dashboard/fixtures"; +import { StaffMemberStatus } from "@dashboard/graphql"; +import { staffMembers } from "@dashboard/staff/fixtures"; +import { StaffListUrlSortField } from "@dashboard/staff/urls"; +import Decorator from "@dashboard/storybook/Decorator"; +import { PaginatorContextDecorator } from "@dashboard/storybook/PaginatorContextDecorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/staff/components/StaffListPage/StaffListPage.tsx b/src/staff/components/StaffListPage/StaffListPage.tsx index b4d4e72c8..404eba82c 100644 --- a/src/staff/components/StaffListPage/StaffListPage.tsx +++ b/src/staff/components/StaffListPage/StaffListPage.tsx @@ -1,22 +1,22 @@ -import { Card } from "@material-ui/core"; -import { Backlink } from "@saleor/components/Backlink"; -import { Button } from "@saleor/components/Button"; -import { Container } from "@saleor/components/Container"; -import FilterBar from "@saleor/components/FilterBar"; -import LimitReachedAlert from "@saleor/components/LimitReachedAlert"; -import PageHeader from "@saleor/components/PageHeader"; -import { configurationMenuUrl } from "@saleor/configuration"; -import { RefreshLimitsQuery, StaffListQuery } from "@saleor/graphql"; -import { sectionNames } from "@saleor/intl"; -import { StaffListUrlSortField } from "@saleor/staff/urls"; +import { Backlink } from "@dashboard/components/Backlink"; +import { Button } from "@dashboard/components/Button"; +import { Container } from "@dashboard/components/Container"; +import FilterBar from "@dashboard/components/FilterBar"; +import LimitReachedAlert from "@dashboard/components/LimitReachedAlert"; +import PageHeader from "@dashboard/components/PageHeader"; +import { configurationMenuUrl } from "@dashboard/configuration"; +import { RefreshLimitsQuery, StaffListQuery } from "@dashboard/graphql"; +import { sectionNames } from "@dashboard/intl"; +import { StaffListUrlSortField } from "@dashboard/staff/urls"; import { FilterPageProps, ListProps, RelayToFlat, SortPage, TabPageProps, -} from "@saleor/types"; -import { hasLimits, isLimitReached } from "@saleor/utils/limits"; +} from "@dashboard/types"; +import { hasLimits, isLimitReached } from "@dashboard/utils/limits"; +import { Card } from "@material-ui/core"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/staff/components/StaffListPage/filters.ts b/src/staff/components/StaffListPage/filters.ts index d7b4d4d62..d50903b51 100644 --- a/src/staff/components/StaffListPage/filters.ts +++ b/src/staff/components/StaffListPage/filters.ts @@ -1,7 +1,7 @@ -import { IFilter } from "@saleor/components/Filter"; -import { StaffMemberStatus } from "@saleor/graphql"; -import { FilterOpts } from "@saleor/types"; -import { createOptionsField } from "@saleor/utils/filters/fields"; +import { IFilter } from "@dashboard/components/Filter"; +import { StaffMemberStatus } from "@dashboard/graphql"; +import { FilterOpts } from "@dashboard/types"; +import { createOptionsField } from "@dashboard/utils/filters/fields"; import { defineMessages, IntlShape } from "react-intl"; export enum StaffFilterKeys { diff --git a/src/staff/components/StaffPassword/StaffPassword.tsx b/src/staff/components/StaffPassword/StaffPassword.tsx index 3a46af8c8..c258472ce 100644 --- a/src/staff/components/StaffPassword/StaffPassword.tsx +++ b/src/staff/components/StaffPassword/StaffPassword.tsx @@ -1,6 +1,6 @@ +import { Button } from "@dashboard/components/Button"; +import CardTitle from "@dashboard/components/CardTitle"; import { Card, CardContent, Typography } from "@material-ui/core"; -import { Button } from "@saleor/components/Button"; -import CardTitle from "@saleor/components/CardTitle"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/staff/components/StaffPasswordResetDialog/StaffPasswordResetDialog.tsx b/src/staff/components/StaffPasswordResetDialog/StaffPasswordResetDialog.tsx index 51343554f..860bb9659 100644 --- a/src/staff/components/StaffPasswordResetDialog/StaffPasswordResetDialog.tsx +++ b/src/staff/components/StaffPasswordResetDialog/StaffPasswordResetDialog.tsx @@ -1,3 +1,14 @@ +import BackButton from "@dashboard/components/BackButton"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import Form from "@dashboard/components/Form"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import { AccountErrorFragment } from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useModalDialogErrors from "@dashboard/hooks/useModalDialogErrors"; +import { buttonMessages } from "@dashboard/intl"; +import { DialogProps } from "@dashboard/types"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getAccountErrorMessage from "@dashboard/utils/errors/account"; import { Dialog, DialogActions, @@ -5,18 +16,7 @@ import { DialogTitle, TextField, } from "@material-ui/core"; -import BackButton from "@saleor/components/BackButton"; -import ConfirmButton from "@saleor/components/ConfirmButton"; -import Form from "@saleor/components/Form"; -import FormSpacer from "@saleor/components/FormSpacer"; -import { AccountErrorFragment } from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useModalDialogErrors from "@saleor/hooks/useModalDialogErrors"; -import { buttonMessages } from "@saleor/intl"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { DialogProps } from "@saleor/types"; -import { getFormErrors } from "@saleor/utils/errors"; -import getAccountErrorMessage from "@saleor/utils/errors/account"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/staff/components/StaffPreferences/StaffPreferences.tsx b/src/staff/components/StaffPreferences/StaffPreferences.tsx index 1514bed7a..e9dee6333 100644 --- a/src/staff/components/StaffPreferences/StaffPreferences.tsx +++ b/src/staff/components/StaffPreferences/StaffPreferences.tsx @@ -1,9 +1,9 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import FormSpacer from "@dashboard/components/FormSpacer"; +import { Locale, localeNames } from "@dashboard/components/Locale"; +import SingleAutocompleteSelectField from "@dashboard/components/SingleAutocompleteSelectField"; +import { capitalize } from "@dashboard/misc"; import { Card, CardContent, Typography } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import FormSpacer from "@saleor/components/FormSpacer"; -import { Locale, localeNames } from "@saleor/components/Locale"; -import SingleAutocompleteSelectField from "@saleor/components/SingleAutocompleteSelectField"; -import { capitalize } from "@saleor/misc"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/staff/components/StaffProperties/StaffProperties.tsx b/src/staff/components/StaffProperties/StaffProperties.tsx index 7cfb9ff11..8052774ad 100644 --- a/src/staff/components/StaffProperties/StaffProperties.tsx +++ b/src/staff/components/StaffProperties/StaffProperties.tsx @@ -1,15 +1,15 @@ import photoIcon from "@assets/images/photo-icon.svg"; -import { Card, CardContent, TextField, Typography } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; +import CardTitle from "@dashboard/components/CardTitle"; import { StaffErrorFragment, StaffMemberDetailsFragment, UserFragment, -} from "@saleor/graphql"; -import { commonMessages } from "@saleor/intl"; +} from "@dashboard/graphql"; +import { commonMessages } from "@dashboard/intl"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getStaffErrorMessage from "@dashboard/utils/errors/staff"; +import { Card, CardContent, TextField, Typography } from "@material-ui/core"; import { makeStyles } from "@saleor/macaw-ui"; -import { getFormErrors } from "@saleor/utils/errors"; -import getStaffErrorMessage from "@saleor/utils/errors/staff"; import React from "react"; import SVG from "react-inlinesvg"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/staff/components/UserStatus/UserStatus.tsx b/src/staff/components/UserStatus/UserStatus.tsx index 7cddfd494..33fd9d15b 100644 --- a/src/staff/components/UserStatus/UserStatus.tsx +++ b/src/staff/components/UserStatus/UserStatus.tsx @@ -1,6 +1,6 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import { ControlledCheckbox } from "@dashboard/components/ControlledCheckbox"; import { Card, CardContent, Typography } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import { ControlledCheckbox } from "@saleor/components/ControlledCheckbox"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/staff/fixtures.ts b/src/staff/fixtures.ts index 236b072a4..ecab5cd43 100644 --- a/src/staff/fixtures.ts +++ b/src/staff/fixtures.ts @@ -1,7 +1,7 @@ import avatarImage from "@assets/images/avatars/avatar1.png"; -import { permissions } from "@saleor/fixtures"; -import { StaffListQuery, StaffMemberDetailsFragment } from "@saleor/graphql"; -import { RelayToFlat } from "@saleor/types"; +import { permissions } from "@dashboard/fixtures"; +import { StaffListQuery, StaffMemberDetailsFragment } from "@dashboard/graphql"; +import { RelayToFlat } from "@dashboard/types"; export const staffMembers: RelayToFlat = [ { diff --git a/src/staff/index.tsx b/src/staff/index.tsx index 852654f4d..ab7eb1b9f 100644 --- a/src/staff/index.tsx +++ b/src/staff/index.tsx @@ -1,5 +1,5 @@ -import { sectionNames } from "@saleor/intl"; -import { asSortParams } from "@saleor/utils/sort"; +import { sectionNames } from "@dashboard/intl"; +import { asSortParams } from "@dashboard/utils/sort"; import { parse as parseQs } from "qs"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/staff/urls.ts b/src/staff/urls.ts index 98a2e3eb4..7d0ff6efe 100644 --- a/src/staff/urls.ts +++ b/src/staff/urls.ts @@ -1,4 +1,4 @@ -import { stringifyQs } from "@saleor/utils/urls"; +import { stringifyQs } from "@dashboard/utils/urls"; import urlJoin from "url-join"; import { diff --git a/src/staff/utils.ts b/src/staff/utils.ts index 70ff6ac4d..3a635af8b 100644 --- a/src/staff/utils.ts +++ b/src/staff/utils.ts @@ -1,4 +1,4 @@ -import { StaffMemberDetailsFragment, UserFragment } from "@saleor/graphql"; +import { StaffMemberDetailsFragment, UserFragment } from "@dashboard/graphql"; import difference from "lodash/difference"; import { StaffDetailsFormData } from "./components/StaffDetailsPage"; diff --git a/src/staff/views/StaffDetails.tsx b/src/staff/views/StaffDetails.tsx index 83428a00a..1241bebd0 100644 --- a/src/staff/views/StaffDetails.tsx +++ b/src/staff/views/StaffDetails.tsx @@ -1,9 +1,8 @@ -import { DialogContentText } from "@material-ui/core"; -import { useUser } from "@saleor/auth"; -import ActionDialog from "@saleor/components/ActionDialog"; -import NotFoundPage from "@saleor/components/NotFoundPage"; -import { WindowTitle } from "@saleor/components/WindowTitle"; -import { DEFAULT_INITIAL_SEARCH_DATA } from "@saleor/config"; +import { useUser } from "@dashboard/auth"; +import ActionDialog from "@dashboard/components/ActionDialog"; +import NotFoundPage from "@dashboard/components/NotFoundPage"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; +import { DEFAULT_INITIAL_SEARCH_DATA } from "@dashboard/config"; import { useChangeStaffPasswordMutation, useStaffAvatarDeleteMutation, @@ -11,17 +10,18 @@ import { useStaffMemberDeleteMutation, useStaffMemberDetailsQuery, useStaffMemberUpdateMutation, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { commonMessages, errorMessages } from "@saleor/intl"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { commonMessages, errorMessages } from "@dashboard/intl"; import { extractMutationErrors, getStringOrPlaceholder, maybe, -} from "@saleor/misc"; -import usePermissionGroupSearch from "@saleor/searches/usePermissionGroupSearch"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/misc"; +import usePermissionGroupSearch from "@dashboard/searches/usePermissionGroupSearch"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; +import { DialogContentText } from "@material-ui/core"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/staff/views/StaffList/StaffList.tsx b/src/staff/views/StaffList/StaffList.tsx index 8b18885c5..d8f2df2b2 100644 --- a/src/staff/views/StaffList/StaffList.tsx +++ b/src/staff/views/StaffList/StaffList.tsx @@ -1,29 +1,32 @@ -import { newPasswordUrl } from "@saleor/auth/urls"; -import DeleteFilterTabDialog from "@saleor/components/DeleteFilterTabDialog"; +import { newPasswordUrl } from "@dashboard/auth/urls"; +import DeleteFilterTabDialog from "@dashboard/components/DeleteFilterTabDialog"; import SaveFilterTabDialog, { SaveFilterTabDialogFormData, -} from "@saleor/components/SaveFilterTabDialog"; -import { useShopLimitsQuery } from "@saleor/components/Shop/queries"; -import { DEFAULT_INITIAL_SEARCH_DATA } from "@saleor/config"; -import { useStaffListQuery, useStaffMemberAddMutation } from "@saleor/graphql"; -import useListSettings from "@saleor/hooks/useListSettings"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; +} from "@dashboard/components/SaveFilterTabDialog"; +import { useShopLimitsQuery } from "@dashboard/components/Shop/queries"; +import { DEFAULT_INITIAL_SEARCH_DATA } from "@dashboard/config"; +import { + useStaffListQuery, + useStaffMemberAddMutation, +} from "@dashboard/graphql"; +import useListSettings from "@dashboard/hooks/useListSettings"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { usePaginationReset } from "@dashboard/hooks/usePaginationReset"; import usePaginator, { createPaginationState, PaginatorContext, -} from "@saleor/hooks/usePaginator"; -import { commonMessages } from "@saleor/intl"; -import { getStringOrPlaceholder } from "@saleor/misc"; -import usePermissionGroupSearch from "@saleor/searches/usePermissionGroupSearch"; -import { ListViews } from "@saleor/types"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createFilterHandlers from "@saleor/utils/handlers/filterHandlers"; -import createSortHandler from "@saleor/utils/handlers/sortHandler"; -import { mapEdgesToItems } from "@saleor/utils/maps"; -import { getSortParams } from "@saleor/utils/sort"; -import { getAppMountUriForRedirect } from "@saleor/utils/urls"; +} from "@dashboard/hooks/usePaginator"; +import { commonMessages } from "@dashboard/intl"; +import { getStringOrPlaceholder } from "@dashboard/misc"; +import usePermissionGroupSearch from "@dashboard/searches/usePermissionGroupSearch"; +import { ListViews } from "@dashboard/types"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createFilterHandlers from "@dashboard/utils/handlers/filterHandlers"; +import createSortHandler from "@dashboard/utils/handlers/sortHandler"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; +import { getSortParams } from "@dashboard/utils/sort"; +import { getAppMountUriForRedirect } from "@dashboard/utils/urls"; import React from "react"; import { useIntl } from "react-intl"; import urlJoin from "url-join"; diff --git a/src/staff/views/StaffList/filters.test.ts b/src/staff/views/StaffList/filters.test.ts index e3835e504..1392a52ba 100644 --- a/src/staff/views/StaffList/filters.test.ts +++ b/src/staff/views/StaffList/filters.test.ts @@ -1,8 +1,8 @@ -import { StaffMemberStatus } from "@saleor/graphql"; -import { createFilterStructure } from "@saleor/staff/components/StaffListPage"; -import { StaffListUrlFilters } from "@saleor/staff/urls"; -import { getFilterQueryParams } from "@saleor/utils/filters"; -import { stringifyQs } from "@saleor/utils/urls"; +import { StaffMemberStatus } from "@dashboard/graphql"; +import { createFilterStructure } from "@dashboard/staff/components/StaffListPage"; +import { StaffListUrlFilters } from "@dashboard/staff/urls"; +import { getFilterQueryParams } from "@dashboard/utils/filters"; +import { stringifyQs } from "@dashboard/utils/urls"; import { getExistingKeys, setFilterOptsStatus } from "@test/filters"; import { config } from "@test/intl"; import { createIntl } from "react-intl"; diff --git a/src/staff/views/StaffList/filters.ts b/src/staff/views/StaffList/filters.ts index a44be1967..4409c931a 100644 --- a/src/staff/views/StaffList/filters.ts +++ b/src/staff/views/StaffList/filters.ts @@ -1,10 +1,13 @@ -import { FilterElement, FilterElementRegular } from "@saleor/components/Filter"; -import { StaffMemberStatus, StaffUserInput } from "@saleor/graphql"; -import { findValueInEnum, maybe } from "@saleor/misc"; +import { + FilterElement, + FilterElementRegular, +} from "@dashboard/components/Filter"; +import { StaffMemberStatus, StaffUserInput } from "@dashboard/graphql"; +import { findValueInEnum, maybe } from "@dashboard/misc"; import { StaffFilterKeys, StaffListFilterOpts, -} from "@saleor/staff/components/StaffListPage"; +} from "@dashboard/staff/components/StaffListPage"; import { createFilterTabUtils, diff --git a/src/staff/views/StaffList/sort.ts b/src/staff/views/StaffList/sort.ts index 1fe66044f..92f08e74e 100644 --- a/src/staff/views/StaffList/sort.ts +++ b/src/staff/views/StaffList/sort.ts @@ -1,6 +1,6 @@ -import { UserSortField } from "@saleor/graphql"; -import { StaffListUrlSortField } from "@saleor/staff/urls"; -import { createGetSortQueryVariables } from "@saleor/utils/sort"; +import { UserSortField } from "@dashboard/graphql"; +import { StaffListUrlSortField } from "@dashboard/staff/urls"; +import { createGetSortQueryVariables } from "@dashboard/utils/sort"; export function getSortQueryField(sort: StaffListUrlSortField): UserSortField { switch (sort) { diff --git a/src/storybook/Decorator.tsx b/src/storybook/Decorator.tsx index ca0ba99ae..fe3e28dfa 100644 --- a/src/storybook/Decorator.tsx +++ b/src/storybook/Decorator.tsx @@ -1,7 +1,7 @@ -import { ExternalAppProvider } from "@saleor/apps/components/ExternalAppContext"; -import { Locale, RawLocaleProvider } from "@saleor/components/Locale"; +import { ExternalAppProvider } from "@dashboard/apps/components/ExternalAppContext"; +import { Locale, RawLocaleProvider } from "@dashboard/components/Locale"; +import themeOverrides from "@dashboard/themeOverrides"; import { ThemeProvider } from "@saleor/macaw-ui"; -import themeOverrides from "@saleor/themeOverrides"; import React from "react"; import { IntlProvider } from "react-intl"; import { BrowserRouter } from "react-router-dom"; diff --git a/src/storybook/MockedUserProvider.tsx b/src/storybook/MockedUserProvider.tsx index 3ed83e7cc..9d8ddf8aa 100644 --- a/src/storybook/MockedUserProvider.tsx +++ b/src/storybook/MockedUserProvider.tsx @@ -1,6 +1,6 @@ -import { UserContext } from "@saleor/auth"; -import { adminUserPermissions } from "@saleor/fixtures"; -import { UserFragment } from "@saleor/graphql"; +import { UserContext } from "@dashboard/auth"; +import { adminUserPermissions } from "@dashboard/fixtures"; +import { UserFragment } from "@dashboard/graphql"; import * as React from "react"; export const MockedUserProvider: React.FC<{ diff --git a/src/storybook/PaginatorContextDecorator.tsx b/src/storybook/PaginatorContextDecorator.tsx index eca24aa96..2d10b9048 100644 --- a/src/storybook/PaginatorContextDecorator.tsx +++ b/src/storybook/PaginatorContextDecorator.tsx @@ -1,5 +1,5 @@ -import { paginatorContextValues } from "@saleor/fixtures"; -import { PaginatorContext } from "@saleor/hooks/usePaginator"; +import { paginatorContextValues } from "@dashboard/fixtures"; +import { PaginatorContext } from "@dashboard/hooks/usePaginator"; import React from "react"; export const PaginatorContextDecorator = storyFn => ( diff --git a/src/taxes/components/TaxCountryDialog/TaxCountryDialog.tsx b/src/taxes/components/TaxCountryDialog/TaxCountryDialog.tsx index 8315cb998..4542d1992 100644 --- a/src/taxes/components/TaxCountryDialog/TaxCountryDialog.tsx +++ b/src/taxes/components/TaxCountryDialog/TaxCountryDialog.tsx @@ -1,3 +1,9 @@ +import VerticalSpacer from "@dashboard/apps/components/VerticalSpacer"; +import { CountryFragment } from "@dashboard/graphql"; +import { useLocalSearch } from "@dashboard/hooks/useLocalSearch"; +import useModalDialogOpen from "@dashboard/hooks/useModalDialogOpen"; +import { buttonMessages } from "@dashboard/intl"; +import { taxesMessages } from "@dashboard/taxes/messages"; import { Dialog, DialogActions, @@ -8,13 +14,7 @@ import { Radio, TextField, } from "@material-ui/core"; -import VerticalSpacer from "@saleor/apps/components/VerticalSpacer"; -import { CountryFragment } from "@saleor/graphql"; -import { useLocalSearch } from "@saleor/hooks/useLocalSearch"; -import useModalDialogOpen from "@saleor/hooks/useModalDialogOpen"; -import { buttonMessages } from "@saleor/intl"; import { Button, DialogHeader, SearchIcon } from "@saleor/macaw-ui"; -import { taxesMessages } from "@saleor/taxes/messages"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/taxes/components/TaxInput/TaxInput.tsx b/src/taxes/components/TaxInput/TaxInput.tsx index 9cf11d2a9..84a35643f 100644 --- a/src/taxes/components/TaxInput/TaxInput.tsx +++ b/src/taxes/components/TaxInput/TaxInput.tsx @@ -1,6 +1,6 @@ +import { findPriceSeparator } from "@dashboard/components/PriceField/utils"; +import { FormChange } from "@dashboard/hooks/useForm"; import { InputAdornment, TextField, TextFieldProps } from "@material-ui/core"; -import { findPriceSeparator } from "@saleor/components/PriceField/utils"; -import { FormChange } from "@saleor/hooks/useForm"; import React from "react"; import { useStyles } from "./styles"; diff --git a/src/taxes/components/TaxPageTitle/TaxPageTitle.tsx b/src/taxes/components/TaxPageTitle/TaxPageTitle.tsx index b843be04f..c2f7ab6de 100644 --- a/src/taxes/components/TaxPageTitle/TaxPageTitle.tsx +++ b/src/taxes/components/TaxPageTitle/TaxPageTitle.tsx @@ -1,6 +1,6 @@ -import HorizontalSpacer from "@saleor/apps/components/HorizontalSpacer"; -import PreviewPill from "@saleor/components/PreviewPill"; -import { sectionNames } from "@saleor/intl"; +import HorizontalSpacer from "@dashboard/apps/components/HorizontalSpacer"; +import PreviewPill from "@dashboard/components/PreviewPill"; +import { sectionNames } from "@dashboard/intl"; import { makeStyles } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/taxes/fixtures.ts b/src/taxes/fixtures.ts index 6fa3c3bed..e7e9ae282 100644 --- a/src/taxes/fixtures.ts +++ b/src/taxes/fixtures.ts @@ -3,7 +3,7 @@ import { TaxClassFragment, TaxConfigurationFragment, TaxCountryConfigurationFragment, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; export const taxConfigurations: TaxConfigurationFragment[] = [ { diff --git a/src/taxes/index.tsx b/src/taxes/index.tsx index d5525c343..a7bb288eb 100644 --- a/src/taxes/index.tsx +++ b/src/taxes/index.tsx @@ -1,4 +1,4 @@ -import { sectionNames } from "@saleor/intl"; +import { sectionNames } from "@dashboard/intl"; import { parse as parseQs } from "qs"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/taxes/pages/TaxChannelsPage/TaxChannelsMenu/TaxChannelsMenu.tsx b/src/taxes/pages/TaxChannelsPage/TaxChannelsMenu/TaxChannelsMenu.tsx index 3409bdeff..5b58bff53 100644 --- a/src/taxes/pages/TaxChannelsPage/TaxChannelsMenu/TaxChannelsMenu.tsx +++ b/src/taxes/pages/TaxChannelsPage/TaxChannelsMenu/TaxChannelsMenu.tsx @@ -1,11 +1,11 @@ +import ListItemLink from "@dashboard/components/ListItemLink"; +import Skeleton from "@dashboard/components/Skeleton"; +import { TaxConfigurationFragment } from "@dashboard/graphql"; +import { taxesMessages } from "@dashboard/taxes/messages"; +import { taxConfigurationListUrl } from "@dashboard/taxes/urls"; +import { isLastElement } from "@dashboard/taxes/utils/utils"; import { Card, Divider } from "@material-ui/core"; -import ListItemLink from "@saleor/components/ListItemLink"; -import Skeleton from "@saleor/components/Skeleton"; -import { TaxConfigurationFragment } from "@saleor/graphql"; import { List, ListHeader, ListItem, ListItemCell } from "@saleor/macaw-ui"; -import { taxesMessages } from "@saleor/taxes/messages"; -import { taxConfigurationListUrl } from "@saleor/taxes/urls"; -import { isLastElement } from "@saleor/taxes/utils/utils"; import clsx from "clsx"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/taxes/pages/TaxChannelsPage/TaxChannelsPage.stories.tsx b/src/taxes/pages/TaxChannelsPage/TaxChannelsPage.stories.tsx index 40b0e547e..c014e3c5f 100644 --- a/src/taxes/pages/TaxChannelsPage/TaxChannelsPage.stories.tsx +++ b/src/taxes/pages/TaxChannelsPage/TaxChannelsPage.stories.tsx @@ -1,7 +1,7 @@ -import { countries } from "@saleor/fixtures"; -import { CountryFragment } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; -import { taxConfigurations } from "@saleor/taxes/fixtures"; +import { countries } from "@dashboard/fixtures"; +import { CountryFragment } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; +import { taxConfigurations } from "@dashboard/taxes/fixtures"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/taxes/pages/TaxChannelsPage/TaxChannelsPage.tsx b/src/taxes/pages/TaxChannelsPage/TaxChannelsPage.tsx index d839c2cc3..1d986513e 100644 --- a/src/taxes/pages/TaxChannelsPage/TaxChannelsPage.tsx +++ b/src/taxes/pages/TaxChannelsPage/TaxChannelsPage.tsx @@ -1,13 +1,12 @@ -import { Card, CardContent, Divider } from "@material-ui/core"; -import VerticalSpacer from "@saleor/apps/components/VerticalSpacer"; -import CardTitle from "@saleor/components/CardTitle"; -import Container from "@saleor/components/Container"; -import Form from "@saleor/components/Form"; -import Grid from "@saleor/components/Grid"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; -import Skeleton from "@saleor/components/Skeleton"; -import { configurationMenuUrl } from "@saleor/configuration"; +import VerticalSpacer from "@dashboard/apps/components/VerticalSpacer"; +import CardTitle from "@dashboard/components/CardTitle"; +import Container from "@dashboard/components/Container"; +import Form from "@dashboard/components/Form"; +import Grid from "@dashboard/components/Grid"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; +import Skeleton from "@dashboard/components/Skeleton"; +import { configurationMenuUrl } from "@dashboard/configuration"; import { CountryCode, CountryFragment, @@ -15,8 +14,13 @@ import { TaxConfigurationFragment, TaxConfigurationPerCountryFragment, TaxConfigurationUpdateInput, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import TaxCountryDialog from "@dashboard/taxes/components/TaxCountryDialog"; +import TaxPageTitle from "@dashboard/taxes/components/TaxPageTitle"; +import { taxesMessages } from "@dashboard/taxes/messages"; +import { isLastElement } from "@dashboard/taxes/utils/utils"; +import { Card, CardContent, Divider } from "@material-ui/core"; import { Button, ConfirmButtonTransitionState, @@ -27,10 +31,6 @@ import { PageTab, PageTabs, } from "@saleor/macaw-ui"; -import TaxCountryDialog from "@saleor/taxes/components/TaxCountryDialog"; -import TaxPageTitle from "@saleor/taxes/components/TaxPageTitle"; -import { taxesMessages } from "@saleor/taxes/messages"; -import { isLastElement } from "@saleor/taxes/utils/utils"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/taxes/pages/TaxChannelsPage/TaxCountryExceptionListItem/TaxCountryExceptionListItem.tsx b/src/taxes/pages/TaxChannelsPage/TaxCountryExceptionListItem/TaxCountryExceptionListItem.tsx index e0cb52119..bd02c1416 100644 --- a/src/taxes/pages/TaxChannelsPage/TaxCountryExceptionListItem/TaxCountryExceptionListItem.tsx +++ b/src/taxes/pages/TaxChannelsPage/TaxCountryExceptionListItem/TaxCountryExceptionListItem.tsx @@ -1,13 +1,13 @@ -import { Divider } from "@material-ui/core"; -import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; +import ControlledCheckbox from "@dashboard/components/ControlledCheckbox"; import SingleSelectField, { Choice, -} from "@saleor/components/SingleSelectField"; +} from "@dashboard/components/SingleSelectField"; import { TaxConfigurationPerCountryFragment, TaxConfigurationUpdateInput, -} from "@saleor/graphql"; -import { FormChange } from "@saleor/hooks/useForm"; +} from "@dashboard/graphql"; +import { FormChange } from "@dashboard/hooks/useForm"; +import { Divider } from "@material-ui/core"; import { DeleteIcon, IconButton, diff --git a/src/taxes/pages/TaxChannelsPage/TaxSettingsCard/TaxSettingsCard.tsx b/src/taxes/pages/TaxChannelsPage/TaxSettingsCard/TaxSettingsCard.tsx index d93f5c965..960ef5182 100644 --- a/src/taxes/pages/TaxChannelsPage/TaxSettingsCard/TaxSettingsCard.tsx +++ b/src/taxes/pages/TaxChannelsPage/TaxSettingsCard/TaxSettingsCard.tsx @@ -1,3 +1,12 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import ControlledCheckbox from "@dashboard/components/ControlledCheckbox"; +import Grid from "@dashboard/components/Grid"; +import SingleSelectField, { + Choice, +} from "@dashboard/components/SingleSelectField"; +import { TaxConfigurationUpdateInput } from "@dashboard/graphql"; +import { FormChange } from "@dashboard/hooks/useForm"; +import { taxesMessages } from "@dashboard/taxes/messages"; import { Card, CardContent, @@ -7,15 +16,6 @@ import { RadioGroup, Typography, } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; -import Grid from "@saleor/components/Grid"; -import SingleSelectField, { - Choice, -} from "@saleor/components/SingleSelectField"; -import { TaxConfigurationUpdateInput } from "@saleor/graphql"; -import { FormChange } from "@saleor/hooks/useForm"; -import { taxesMessages } from "@saleor/taxes/messages"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/taxes/pages/TaxClassesPage/TaxClassesMenu/TaxClassesMenu.tsx b/src/taxes/pages/TaxClassesPage/TaxClassesMenu/TaxClassesMenu.tsx index e8043d2ef..377ee2baf 100644 --- a/src/taxes/pages/TaxClassesPage/TaxClassesMenu/TaxClassesMenu.tsx +++ b/src/taxes/pages/TaxClassesPage/TaxClassesMenu/TaxClassesMenu.tsx @@ -1,8 +1,11 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import ListItemLink from "@dashboard/components/ListItemLink"; +import Skeleton from "@dashboard/components/Skeleton"; +import { TaxClassFragment } from "@dashboard/graphql"; +import { taxesMessages } from "@dashboard/taxes/messages"; +import { taxClassesListUrl } from "@dashboard/taxes/urls"; +import { isLastElement } from "@dashboard/taxes/utils/utils"; import { Card, CardContent, Divider } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import ListItemLink from "@saleor/components/ListItemLink"; -import Skeleton from "@saleor/components/Skeleton"; -import { TaxClassFragment } from "@saleor/graphql"; import { Button, DeleteIcon, @@ -12,9 +15,6 @@ import { ListItem, ListItemCell, } from "@saleor/macaw-ui"; -import { taxesMessages } from "@saleor/taxes/messages"; -import { taxClassesListUrl } from "@saleor/taxes/urls"; -import { isLastElement } from "@saleor/taxes/utils/utils"; import clsx from "clsx"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/taxes/pages/TaxClassesPage/TaxClassesPage.stories.tsx b/src/taxes/pages/TaxClassesPage/TaxClassesPage.stories.tsx index 514fc3876..398583d30 100644 --- a/src/taxes/pages/TaxClassesPage/TaxClassesPage.stories.tsx +++ b/src/taxes/pages/TaxClassesPage/TaxClassesPage.stories.tsx @@ -1,5 +1,5 @@ -import Decorator from "@saleor/storybook/Decorator"; -import { taxClasses } from "@saleor/taxes/fixtures"; +import Decorator from "@dashboard/storybook/Decorator"; +import { taxClasses } from "@dashboard/taxes/fixtures"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/taxes/pages/TaxClassesPage/TaxClassesPage.tsx b/src/taxes/pages/TaxClassesPage/TaxClassesPage.tsx index 808ccc6ce..8b5fde30b 100644 --- a/src/taxes/pages/TaxClassesPage/TaxClassesPage.tsx +++ b/src/taxes/pages/TaxClassesPage/TaxClassesPage.tsx @@ -1,3 +1,24 @@ +import VerticalSpacer from "@dashboard/apps/components/VerticalSpacer"; +import CardTitle from "@dashboard/components/CardTitle"; +import Container from "@dashboard/components/Container"; +import Grid from "@dashboard/components/Grid"; +import Metadata from "@dashboard/components/Metadata"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; +import Skeleton from "@dashboard/components/Skeleton"; +import { configurationMenuUrl } from "@dashboard/configuration"; +import { TaxClassFragment } from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { getById } from "@dashboard/misc"; +import { parseQuery } from "@dashboard/orders/components/OrderCustomerAddressesEditDialog/utils"; +import TaxPageTitle from "@dashboard/taxes/components/TaxPageTitle"; +import { taxesMessages } from "@dashboard/taxes/messages"; +import { TaxClassesPageFormData } from "@dashboard/taxes/types"; +import { useAutofocus } from "@dashboard/taxes/utils/useAutofocus"; +import { isLastElement } from "@dashboard/taxes/utils/utils"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getTaxesErrorMessage from "@dashboard/utils/errors/taxes"; import { Card, CardContent, @@ -5,18 +26,6 @@ import { InputAdornment, TextField, } from "@material-ui/core"; -import VerticalSpacer from "@saleor/apps/components/VerticalSpacer"; -import CardTitle from "@saleor/components/CardTitle"; -import Container from "@saleor/components/Container"; -import Grid from "@saleor/components/Grid"; -import Metadata from "@saleor/components/Metadata"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; -import Skeleton from "@saleor/components/Skeleton"; -import { configurationMenuUrl } from "@saleor/configuration"; -import { TaxClassFragment } from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; import { ConfirmButtonTransitionState, List, @@ -27,15 +36,6 @@ import { PageTabs, SearchIcon, } from "@saleor/macaw-ui"; -import { getById } from "@saleor/misc"; -import { parseQuery } from "@saleor/orders/components/OrderCustomerAddressesEditDialog/utils"; -import TaxPageTitle from "@saleor/taxes/components/TaxPageTitle"; -import { taxesMessages } from "@saleor/taxes/messages"; -import { TaxClassesPageFormData } from "@saleor/taxes/types"; -import { useAutofocus } from "@saleor/taxes/utils/useAutofocus"; -import { isLastElement } from "@saleor/taxes/utils/utils"; -import { getFormErrors } from "@saleor/utils/errors"; -import getTaxesErrorMessage from "@saleor/utils/errors/taxes"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/taxes/pages/TaxClassesPage/form.tsx b/src/taxes/pages/TaxClassesPage/form.tsx index 017f8ec66..8a7804fb0 100644 --- a/src/taxes/pages/TaxClassesPage/form.tsx +++ b/src/taxes/pages/TaxClassesPage/form.tsx @@ -1,13 +1,13 @@ -import { useExitFormDialog } from "@saleor/components/Form/useExitFormDialog"; -import { TaxClassFragment } from "@saleor/graphql"; -import useForm, { FormChange, SubmitPromise } from "@saleor/hooks/useForm"; -import useFormset from "@saleor/hooks/useFormset"; -import useHandleFormSubmit from "@saleor/hooks/useHandleFormSubmit"; -import { TaxClassesPageFormData } from "@saleor/taxes/types"; -import { getTaxClassInitialFormData } from "@saleor/taxes/utils/data"; -import { validateTaxClassFormData } from "@saleor/taxes/utils/validation"; -import { TaxClassError } from "@saleor/utils/errors/taxes"; -import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger"; +import { useExitFormDialog } from "@dashboard/components/Form/useExitFormDialog"; +import { TaxClassFragment } from "@dashboard/graphql"; +import useForm, { FormChange, SubmitPromise } from "@dashboard/hooks/useForm"; +import useFormset from "@dashboard/hooks/useFormset"; +import useHandleFormSubmit from "@dashboard/hooks/useHandleFormSubmit"; +import { TaxClassesPageFormData } from "@dashboard/taxes/types"; +import { getTaxClassInitialFormData } from "@dashboard/taxes/utils/data"; +import { validateTaxClassFormData } from "@dashboard/taxes/utils/validation"; +import { TaxClassError } from "@dashboard/utils/errors/taxes"; +import useMetadataChangeTrigger from "@dashboard/utils/metadata/useMetadataChangeTrigger"; import React, { useState } from "react"; interface TaxClassesFormHandlers { diff --git a/src/taxes/pages/TaxCountriesPage/TaxCountriesMenu/TaxCountriesMenu.tsx b/src/taxes/pages/TaxCountriesPage/TaxCountriesMenu/TaxCountriesMenu.tsx index 7ab7f21e7..dbbc416a6 100644 --- a/src/taxes/pages/TaxCountriesPage/TaxCountriesMenu/TaxCountriesMenu.tsx +++ b/src/taxes/pages/TaxCountriesPage/TaxCountriesMenu/TaxCountriesMenu.tsx @@ -1,8 +1,11 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import ListItemLink from "@dashboard/components/ListItemLink"; +import Skeleton from "@dashboard/components/Skeleton"; +import { TaxCountryConfigurationFragment } from "@dashboard/graphql"; +import { taxesMessages } from "@dashboard/taxes/messages"; +import { taxCountriesListUrl } from "@dashboard/taxes/urls"; +import { isLastElement } from "@dashboard/taxes/utils/utils"; import { Card, CardContent, Divider } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import ListItemLink from "@saleor/components/ListItemLink"; -import Skeleton from "@saleor/components/Skeleton"; -import { TaxCountryConfigurationFragment } from "@saleor/graphql"; import { Button, DeleteIcon, @@ -12,9 +15,6 @@ import { ListItem, ListItemCell, } from "@saleor/macaw-ui"; -import { taxesMessages } from "@saleor/taxes/messages"; -import { taxCountriesListUrl } from "@saleor/taxes/urls"; -import { isLastElement } from "@saleor/taxes/utils/utils"; import clsx from "clsx"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/taxes/pages/TaxCountriesPage/TaxCountriesPage.stories.tsx b/src/taxes/pages/TaxCountriesPage/TaxCountriesPage.stories.tsx index 79ed0b999..9734cb159 100644 --- a/src/taxes/pages/TaxCountriesPage/TaxCountriesPage.stories.tsx +++ b/src/taxes/pages/TaxCountriesPage/TaxCountriesPage.stories.tsx @@ -1,5 +1,5 @@ -import Decorator from "@saleor/storybook/Decorator"; -import { taxCountryConfigurations } from "@saleor/taxes/fixtures"; +import Decorator from "@dashboard/storybook/Decorator"; +import { taxCountryConfigurations } from "@dashboard/taxes/fixtures"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/taxes/pages/TaxCountriesPage/TaxCountriesPage.tsx b/src/taxes/pages/TaxCountriesPage/TaxCountriesPage.tsx index ac78f407c..3d12b9d22 100644 --- a/src/taxes/pages/TaxCountriesPage/TaxCountriesPage.tsx +++ b/src/taxes/pages/TaxCountriesPage/TaxCountriesPage.tsx @@ -1,3 +1,22 @@ +import VerticalSpacer from "@dashboard/apps/components/VerticalSpacer"; +import CardTitle from "@dashboard/components/CardTitle"; +import Container from "@dashboard/components/Container"; +import Grid from "@dashboard/components/Grid"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; +import Skeleton from "@dashboard/components/Skeleton"; +import { configurationMenuUrl } from "@dashboard/configuration"; +import { + CountryCode, + TaxClassRateInput, + TaxCountryConfigurationFragment, +} from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { parseQuery } from "@dashboard/orders/components/OrderCustomerAddressesEditDialog/utils"; +import TaxPageTitle from "@dashboard/taxes/components/TaxPageTitle"; +import { taxesMessages } from "@dashboard/taxes/messages"; +import { isLastElement } from "@dashboard/taxes/utils/utils"; import { Card, CardContent, @@ -5,21 +24,6 @@ import { InputAdornment, TextField, } from "@material-ui/core"; -import VerticalSpacer from "@saleor/apps/components/VerticalSpacer"; -import CardTitle from "@saleor/components/CardTitle"; -import Container from "@saleor/components/Container"; -import Grid from "@saleor/components/Grid"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; -import Skeleton from "@saleor/components/Skeleton"; -import { configurationMenuUrl } from "@saleor/configuration"; -import { - CountryCode, - TaxClassRateInput, - TaxCountryConfigurationFragment, -} from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; import { ConfirmButtonTransitionState, List, @@ -30,10 +34,6 @@ import { PageTabs, SearchIcon, } from "@saleor/macaw-ui"; -import { parseQuery } from "@saleor/orders/components/OrderCustomerAddressesEditDialog/utils"; -import TaxPageTitle from "@saleor/taxes/components/TaxPageTitle"; -import { taxesMessages } from "@saleor/taxes/messages"; -import { isLastElement } from "@saleor/taxes/utils/utils"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/taxes/pages/TaxCountriesPage/form.tsx b/src/taxes/pages/TaxCountriesPage/form.tsx index 44b3f40aa..4282629f4 100644 --- a/src/taxes/pages/TaxCountriesPage/form.tsx +++ b/src/taxes/pages/TaxCountriesPage/form.tsx @@ -1,13 +1,13 @@ -import { useExitFormDialog } from "@saleor/components/Form/useExitFormDialog"; +import { useExitFormDialog } from "@dashboard/components/Form/useExitFormDialog"; import { TaxClassFragment, TaxClassRateInput, TaxCountryConfigurationFragment, -} from "@saleor/graphql"; -import useForm, { SubmitPromise } from "@saleor/hooks/useForm"; -import useFormset, { FormsetData } from "@saleor/hooks/useFormset"; -import useHandleFormSubmit from "@saleor/hooks/useHandleFormSubmit"; -import { taxesMessages } from "@saleor/taxes/messages"; +} from "@dashboard/graphql"; +import useForm, { SubmitPromise } from "@dashboard/hooks/useForm"; +import useFormset, { FormsetData } from "@dashboard/hooks/useFormset"; +import useHandleFormSubmit from "@dashboard/hooks/useHandleFormSubmit"; +import { taxesMessages } from "@dashboard/taxes/messages"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/taxes/types.ts b/src/taxes/types.ts index 7e91a023d..50c45cfdd 100644 --- a/src/taxes/types.ts +++ b/src/taxes/types.ts @@ -1,6 +1,6 @@ -import { MetadataFormData } from "@saleor/components/Metadata"; -import { TaxClassRateInput } from "@saleor/graphql"; -import { FormsetData } from "@saleor/hooks/useFormset"; +import { MetadataFormData } from "@dashboard/components/Metadata"; +import { TaxClassRateInput } from "@dashboard/graphql"; +import { FormsetData } from "@dashboard/hooks/useFormset"; export interface TaxClassesPageFormData extends MetadataFormData { id: string; diff --git a/src/taxes/urls.ts b/src/taxes/urls.ts index ba3250ddb..8002c60e4 100644 --- a/src/taxes/urls.ts +++ b/src/taxes/urls.ts @@ -1,5 +1,5 @@ -import { Dialog } from "@saleor/types"; -import { stringifyQs } from "@saleor/utils/urls"; +import { Dialog } from "@dashboard/types"; +import { stringifyQs } from "@dashboard/utils/urls"; import urlJoin from "url-join"; import { encodeURIComponentOptional } from "./utils/utils"; diff --git a/src/taxes/utils/data.ts b/src/taxes/utils/data.ts index ead7112cf..c55ebe993 100644 --- a/src/taxes/utils/data.ts +++ b/src/taxes/utils/data.ts @@ -4,9 +4,9 @@ import { TaxClassCreateInput, TaxClassFragment, TaxClassUpdateInput, -} from "@saleor/graphql"; -import { FormsetAtomicData } from "@saleor/hooks/useFormset"; -import { mapMetadataItemToInput } from "@saleor/utils/maps"; +} from "@dashboard/graphql"; +import { FormsetAtomicData } from "@dashboard/hooks/useFormset"; +import { mapMetadataItemToInput } from "@dashboard/utils/maps"; import { TaxClassesPageFormData } from "../types"; diff --git a/src/taxes/utils/useTaxClassFetchMore.ts b/src/taxes/utils/useTaxClassFetchMore.ts index 8032bcf3c..50ee500f8 100644 --- a/src/taxes/utils/useTaxClassFetchMore.ts +++ b/src/taxes/utils/useTaxClassFetchMore.ts @@ -1,6 +1,9 @@ -import { TaxClassBaseFragment, useTaxClassAssignQuery } from "@saleor/graphql"; -import { FetchMoreProps } from "@saleor/types"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +import { + TaxClassBaseFragment, + useTaxClassAssignQuery, +} from "@dashboard/graphql"; +import { FetchMoreProps } from "@dashboard/types"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; interface UseTaxClassFetchMoreHookResult { taxClasses: TaxClassBaseFragment[]; diff --git a/src/taxes/utils/useTaxUrlRedirect.ts b/src/taxes/utils/useTaxUrlRedirect.ts index 4664f01e0..f0d89e863 100644 --- a/src/taxes/utils/useTaxUrlRedirect.ts +++ b/src/taxes/utils/useTaxUrlRedirect.ts @@ -6,8 +6,8 @@ * Its use is similar in countries and tax classes views. */ -import { CountryWithCodeFragment } from "@saleor/graphql"; -import { UseNavigatorResult } from "@saleor/hooks/useNavigator"; +import { CountryWithCodeFragment } from "@dashboard/graphql"; +import { UseNavigatorResult } from "@dashboard/hooks/useNavigator"; import React from "react"; interface TaxEntityWithId { diff --git a/src/taxes/utils/utils.ts b/src/taxes/utils/utils.ts index f734a7fdb..1e3d0daed 100644 --- a/src/taxes/utils/utils.ts +++ b/src/taxes/utils/utils.ts @@ -3,7 +3,7 @@ import { TaxClassFragment, TaxCountriesListQuery, TaxCountryConfigurationFragment, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import uniqBy from "lodash/uniqBy"; export const encodeURIComponentOptional = ( diff --git a/src/taxes/utils/validation.ts b/src/taxes/utils/validation.ts index 771f7d751..4db578967 100644 --- a/src/taxes/utils/validation.ts +++ b/src/taxes/utils/validation.ts @@ -1,4 +1,4 @@ -import { CommonError, CommonErrorCode } from "@saleor/utils/errors/common"; +import { CommonError, CommonErrorCode } from "@dashboard/utils/errors/common"; import { TaxClassesPageFormData } from "../types"; diff --git a/src/taxes/views/TaxChannelsList.tsx b/src/taxes/views/TaxChannelsList.tsx index 6b8b43efc..cf70a764b 100644 --- a/src/taxes/views/TaxChannelsList.tsx +++ b/src/taxes/views/TaxChannelsList.tsx @@ -1,13 +1,13 @@ import { useTaxConfigurationsListQuery, useTaxConfigurationUpdateMutation, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import useShop from "@saleor/hooks/useShop"; -import { commonMessages } from "@saleor/intl"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import useShop from "@dashboard/hooks/useShop"; +import { commonMessages } from "@dashboard/intl"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/taxes/views/TaxClassesList.tsx b/src/taxes/views/TaxClassesList.tsx index 7658231b4..2c42a307d 100644 --- a/src/taxes/views/TaxClassesList.tsx +++ b/src/taxes/views/TaxClassesList.tsx @@ -8,15 +8,15 @@ import { useTaxCountriesListQuery, useUpdateMetadataMutation, useUpdatePrivateMetadataMutation, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { commonMessages } from "@saleor/intl"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { commonMessages } from "@dashboard/intl"; import createMetadataCreateHandler, { CreateMetadataHandlerFunctionResult, -} from "@saleor/utils/handlers/metadataCreateHandler"; -import createMetadataUpdateHandler from "@saleor/utils/handlers/metadataUpdateHandler"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/utils/handlers/metadataCreateHandler"; +import createMetadataUpdateHandler from "@dashboard/utils/handlers/metadataUpdateHandler"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/taxes/views/TaxCountriesList.tsx b/src/taxes/views/TaxCountriesList.tsx index e6674f241..877f5017c 100644 --- a/src/taxes/views/TaxCountriesList.tsx +++ b/src/taxes/views/TaxCountriesList.tsx @@ -5,13 +5,13 @@ import { useTaxCountriesListQuery, useTaxCountryConfigurationDeleteMutation, useTaxCountryConfigurationUpdateMutation, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import useShop from "@saleor/hooks/useShop"; -import { commonMessages } from "@saleor/intl"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import useShop from "@dashboard/hooks/useShop"; +import { commonMessages } from "@dashboard/intl"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/translations/components/ProductContextSwitcher/ProductContextSwitcher.tsx b/src/translations/components/ProductContextSwitcher/ProductContextSwitcher.tsx index e0c55601e..4376e4f30 100644 --- a/src/translations/components/ProductContextSwitcher/ProductContextSwitcher.tsx +++ b/src/translations/components/ProductContextSwitcher/ProductContextSwitcher.tsx @@ -1,3 +1,10 @@ +import { useProductVariantListQuery } from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { + languageEntityUrl, + productVariantUrl, + TranslatableEntities, +} from "@dashboard/translations/urls"; import { Card, ClickAwayListener, @@ -9,14 +16,7 @@ import { Typography, } from "@material-ui/core"; import ArrowDropDown from "@material-ui/icons/ArrowDropDown"; -import { useProductVariantListQuery } from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; import { makeStyles } from "@saleor/macaw-ui"; -import { - languageEntityUrl, - productVariantUrl, - TranslatableEntities, -} from "@saleor/translations/urls"; import clsx from "clsx"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/translations/components/TranslationFields/TranslationFields.tsx b/src/translations/components/TranslationFields/TranslationFields.tsx index ad86561b3..0108caed4 100644 --- a/src/translations/components/TranslationFields/TranslationFields.tsx +++ b/src/translations/components/TranslationFields/TranslationFields.tsx @@ -1,24 +1,24 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import Grid from "@dashboard/components/Grid"; +import Hr from "@dashboard/components/Hr"; +import Skeleton from "@dashboard/components/Skeleton"; +import { TablePaginationWithContext } from "@dashboard/components/TablePagination"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import { buttonMessages } from "@dashboard/intl"; +import { + TranslationField, + TranslationFieldType, +} from "@dashboard/translations/types"; +import { ListProps } from "@dashboard/types"; import { OutputData } from "@editorjs/editorjs"; import { Card, CardContent, Typography } from "@material-ui/core"; import ArrowIcon from "@material-ui/icons/ArrowDropDown"; -import CardTitle from "@saleor/components/CardTitle"; -import Grid from "@saleor/components/Grid"; -import Hr from "@saleor/components/Hr"; -import Skeleton from "@saleor/components/Skeleton"; -import { TablePaginationWithContext } from "@saleor/components/TablePagination"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import { buttonMessages } from "@saleor/intl"; import { Button, ConfirmButtonTransitionState, IconButton, makeStyles, } from "@saleor/macaw-ui"; -import { - TranslationField, - TranslationFieldType, -} from "@saleor/translations/types"; -import { ListProps } from "@saleor/types"; import clsx from "clsx"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/translations/components/TranslationFields/TranslationFieldsLong.tsx b/src/translations/components/TranslationFields/TranslationFieldsLong.tsx index 573bfe4a1..256b3b10f 100644 --- a/src/translations/components/TranslationFields/TranslationFieldsLong.tsx +++ b/src/translations/components/TranslationFields/TranslationFieldsLong.tsx @@ -1,6 +1,6 @@ +import Form from "@dashboard/components/Form"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; import { TextField, Typography } from "@material-ui/core"; -import Form from "@saleor/components/Form"; -import { SubmitPromise } from "@saleor/hooks/useForm"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/translations/components/TranslationFields/TranslationFieldsRich.tsx b/src/translations/components/TranslationFields/TranslationFieldsRich.tsx index f7d7a0d6a..253e104e0 100644 --- a/src/translations/components/TranslationFields/TranslationFieldsRich.tsx +++ b/src/translations/components/TranslationFields/TranslationFieldsRich.tsx @@ -1,9 +1,9 @@ +import RichTextEditor from "@dashboard/components/RichTextEditor"; +import RichTextEditorContent from "@dashboard/components/RichTextEditor/RichTextEditorContent"; +import { RichTextEditorLoading } from "@dashboard/components/RichTextEditor/RichTextEditorLoading"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; import { OutputData } from "@editorjs/editorjs"; import { Typography } from "@material-ui/core"; -import RichTextEditor from "@saleor/components/RichTextEditor"; -import RichTextEditorContent from "@saleor/components/RichTextEditor/RichTextEditorContent"; -import { RichTextEditorLoading } from "@saleor/components/RichTextEditor/RichTextEditorLoading"; -import { SubmitPromise } from "@saleor/hooks/useForm"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/translations/components/TranslationFields/TranslationFieldsSave.tsx b/src/translations/components/TranslationFields/TranslationFieldsSave.tsx index 63ed4567c..b19c8a735 100644 --- a/src/translations/components/TranslationFields/TranslationFieldsSave.tsx +++ b/src/translations/components/TranslationFields/TranslationFieldsSave.tsx @@ -1,5 +1,5 @@ -import ConfirmButton from "@saleor/components/ConfirmButton"; -import { buttonMessages } from "@saleor/intl"; +import ConfirmButton from "@dashboard/components/ConfirmButton"; +import { buttonMessages } from "@dashboard/intl"; import { Button, ConfirmButtonTransitionState, diff --git a/src/translations/components/TranslationFields/TranslationFieldsShort.tsx b/src/translations/components/TranslationFields/TranslationFieldsShort.tsx index 14eb14186..85a1bb666 100644 --- a/src/translations/components/TranslationFields/TranslationFieldsShort.tsx +++ b/src/translations/components/TranslationFields/TranslationFieldsShort.tsx @@ -1,6 +1,6 @@ +import Form from "@dashboard/components/Form"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; import { TextField, Typography } from "@material-ui/core"; -import Form from "@saleor/components/Form"; -import { SubmitPromise } from "@saleor/hooks/useForm"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/translations/components/TranslationFields/useRichTextSubmit.test.ts b/src/translations/components/TranslationFields/useRichTextSubmit.test.ts index 2b8ebdf61..96422d574 100644 --- a/src/translations/components/TranslationFields/useRichTextSubmit.test.ts +++ b/src/translations/components/TranslationFields/useRichTextSubmit.test.ts @@ -1,9 +1,9 @@ -import useRichText from "@saleor/utils/richText/useRichText"; +import useRichText from "@dashboard/utils/richText/useRichText"; import { renderHook } from "@testing-library/react-hooks"; import { useRichTextSubmit } from "./useRichTextSubmit"; -jest.mock("@saleor/utils/richText/useRichText", () => jest.fn()); +jest.mock("@dashboard/utils/richText/useRichText", () => jest.fn()); describe("useRichTextSubmit", () => { it("submits value from editor succesfully", async () => { diff --git a/src/translations/components/TranslationFields/useRichTextSubmit.ts b/src/translations/components/TranslationFields/useRichTextSubmit.ts index cc533edb9..b19ca47da 100644 --- a/src/translations/components/TranslationFields/useRichTextSubmit.ts +++ b/src/translations/components/TranslationFields/useRichTextSubmit.ts @@ -1,7 +1,7 @@ +import { useExitFormDialog } from "@dashboard/components/Form/useExitFormDialog"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useRichText from "@dashboard/utils/richText/useRichText"; import { OutputData } from "@editorjs/editorjs"; -import { useExitFormDialog } from "@saleor/components/Form/useExitFormDialog"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useRichText from "@saleor/utils/richText/useRichText"; import React from "react"; export function useRichTextSubmit( diff --git a/src/translations/components/TranslationsAttributesPage/TranslationsAttributesPage.tsx b/src/translations/components/TranslationsAttributesPage/TranslationsAttributesPage.tsx index f0975b126..5983edd60 100644 --- a/src/translations/components/TranslationsAttributesPage/TranslationsAttributesPage.tsx +++ b/src/translations/components/TranslationsAttributesPage/TranslationsAttributesPage.tsx @@ -1,22 +1,22 @@ -import { Backlink } from "@saleor/components/Backlink"; -import CardSpacer from "@saleor/components/CardSpacer"; -import Container from "@saleor/components/Container"; -import LanguageSwitch from "@saleor/components/LanguageSwitch"; -import PageHeader from "@saleor/components/PageHeader"; -import { ListSettingsUpdate } from "@saleor/components/TablePagination"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import Container from "@dashboard/components/Container"; +import LanguageSwitch from "@dashboard/components/LanguageSwitch"; +import PageHeader from "@dashboard/components/PageHeader"; +import { ListSettingsUpdate } from "@dashboard/components/TablePagination"; import { AttributeTranslationDetailsFragment, LanguageCodeEnum, -} from "@saleor/graphql"; -import { commonMessages, sectionNames } from "@saleor/intl"; -import { getStringOrPlaceholder } from "@saleor/misc"; -import { TranslationsEntitiesPageProps } from "@saleor/translations/types"; +} from "@dashboard/graphql"; +import { commonMessages, sectionNames } from "@dashboard/intl"; +import { getStringOrPlaceholder } from "@dashboard/misc"; +import { TranslationsEntitiesPageProps } from "@dashboard/translations/types"; import { languageEntitiesUrl, languageEntityUrl, TranslatableEntities, -} from "@saleor/translations/urls"; -import { ListSettings } from "@saleor/types"; +} from "@dashboard/translations/urls"; +import { ListSettings } from "@dashboard/types"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/translations/components/TranslationsCategoriesPage/TranslationsCategoriesPage.tsx b/src/translations/components/TranslationsCategoriesPage/TranslationsCategoriesPage.tsx index ac5b568f1..36be2c7af 100644 --- a/src/translations/components/TranslationsCategoriesPage/TranslationsCategoriesPage.tsx +++ b/src/translations/components/TranslationsCategoriesPage/TranslationsCategoriesPage.tsx @@ -1,20 +1,23 @@ -import { Backlink } from "@saleor/components/Backlink"; -import CardSpacer from "@saleor/components/CardSpacer"; -import Container from "@saleor/components/Container"; -import LanguageSwitch from "@saleor/components/LanguageSwitch"; -import PageHeader from "@saleor/components/PageHeader"; -import { CategoryTranslationFragment, LanguageCodeEnum } from "@saleor/graphql"; -import { commonMessages, sectionNames } from "@saleor/intl"; -import { getStringOrPlaceholder } from "@saleor/misc"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import Container from "@dashboard/components/Container"; +import LanguageSwitch from "@dashboard/components/LanguageSwitch"; +import PageHeader from "@dashboard/components/PageHeader"; +import { + CategoryTranslationFragment, + LanguageCodeEnum, +} from "@dashboard/graphql"; +import { commonMessages, sectionNames } from "@dashboard/intl"; +import { getStringOrPlaceholder } from "@dashboard/misc"; import { TranslationInputFieldName, TranslationsEntitiesPageProps, -} from "@saleor/translations/types"; +} from "@dashboard/translations/types"; import { languageEntitiesUrl, languageEntityUrl, TranslatableEntities, -} from "@saleor/translations/urls"; +} from "@dashboard/translations/urls"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/translations/components/TranslationsCollectionsPage/TranslationsCollectionsPage.tsx b/src/translations/components/TranslationsCollectionsPage/TranslationsCollectionsPage.tsx index 801de8f24..706d22683 100644 --- a/src/translations/components/TranslationsCollectionsPage/TranslationsCollectionsPage.tsx +++ b/src/translations/components/TranslationsCollectionsPage/TranslationsCollectionsPage.tsx @@ -1,23 +1,23 @@ -import { Backlink } from "@saleor/components/Backlink"; -import CardSpacer from "@saleor/components/CardSpacer"; -import Container from "@saleor/components/Container"; -import LanguageSwitch from "@saleor/components/LanguageSwitch"; -import PageHeader from "@saleor/components/PageHeader"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import Container from "@dashboard/components/Container"; +import LanguageSwitch from "@dashboard/components/LanguageSwitch"; +import PageHeader from "@dashboard/components/PageHeader"; import { CollectionTranslationFragment, LanguageCodeEnum, -} from "@saleor/graphql"; -import { commonMessages, sectionNames } from "@saleor/intl"; -import { getStringOrPlaceholder } from "@saleor/misc"; +} from "@dashboard/graphql"; +import { commonMessages, sectionNames } from "@dashboard/intl"; +import { getStringOrPlaceholder } from "@dashboard/misc"; import { TranslationInputFieldName, TranslationsEntitiesPageProps, -} from "@saleor/translations/types"; +} from "@dashboard/translations/types"; import { languageEntitiesUrl, languageEntityUrl, TranslatableEntities, -} from "@saleor/translations/urls"; +} from "@dashboard/translations/urls"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/translations/components/TranslationsEntitiesList/TranslationsEntitiesList.tsx b/src/translations/components/TranslationsEntitiesList/TranslationsEntitiesList.tsx index f9e6bf3f0..79c5fbbf1 100644 --- a/src/translations/components/TranslationsEntitiesList/TranslationsEntitiesList.tsx +++ b/src/translations/components/TranslationsEntitiesList/TranslationsEntitiesList.tsx @@ -1,13 +1,13 @@ +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import { TablePaginationWithContext } from "@dashboard/components/TablePagination"; +import TableRowLink from "@dashboard/components/TableRowLink"; import { TableBody, TableCell, TableFooter, TableHead, } from "@material-ui/core"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import { TablePaginationWithContext } from "@saleor/components/TablePagination"; -import TableRowLink from "@saleor/components/TableRowLink"; import { makeStyles } from "@saleor/macaw-ui"; import clsx from "clsx"; import React from "react"; diff --git a/src/translations/components/TranslationsEntitiesListPage/TranslationsEntitiesListPage.stories.tsx b/src/translations/components/TranslationsEntitiesListPage/TranslationsEntitiesListPage.stories.tsx index 87d58135e..b89c2e9f9 100644 --- a/src/translations/components/TranslationsEntitiesListPage/TranslationsEntitiesListPage.stories.tsx +++ b/src/translations/components/TranslationsEntitiesListPage/TranslationsEntitiesListPage.stories.tsx @@ -1,7 +1,7 @@ -import { pageListProps, searchPageProps } from "@saleor/fixtures"; -import { LanguageCodeEnum } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; -import { PaginatorContextDecorator } from "@saleor/storybook/PaginatorContextDecorator"; +import { pageListProps, searchPageProps } from "@dashboard/fixtures"; +import { LanguageCodeEnum } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; +import { PaginatorContextDecorator } from "@dashboard/storybook/PaginatorContextDecorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/translations/components/TranslationsEntitiesListPage/TranslationsEntitiesListPage.tsx b/src/translations/components/TranslationsEntitiesListPage/TranslationsEntitiesListPage.tsx index 2d918f6d3..18fcf2056 100644 --- a/src/translations/components/TranslationsEntitiesListPage/TranslationsEntitiesListPage.tsx +++ b/src/translations/components/TranslationsEntitiesListPage/TranslationsEntitiesListPage.tsx @@ -1,10 +1,10 @@ +import { Backlink } from "@dashboard/components/Backlink"; +import Container from "@dashboard/components/Container"; +import PageHeader from "@dashboard/components/PageHeader"; +import FilterTabs, { FilterTab } from "@dashboard/components/TableFilter"; +import { LanguageFragment } from "@dashboard/graphql"; +import { maybe } from "@dashboard/misc"; import { Card } from "@material-ui/core"; -import { Backlink } from "@saleor/components/Backlink"; -import Container from "@saleor/components/Container"; -import PageHeader from "@saleor/components/PageHeader"; -import FilterTabs, { FilterTab } from "@saleor/components/TableFilter"; -import { LanguageFragment } from "@saleor/graphql"; -import { maybe } from "@saleor/misc"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/translations/components/TranslationsLanguageList/TranslationsLanguageList.tsx b/src/translations/components/TranslationsLanguageList/TranslationsLanguageList.tsx index 2ca494b39..0a8c56768 100644 --- a/src/translations/components/TranslationsLanguageList/TranslationsLanguageList.tsx +++ b/src/translations/components/TranslationsLanguageList/TranslationsLanguageList.tsx @@ -1,10 +1,10 @@ +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { LanguageFragment } from "@dashboard/graphql"; +import { languageEntitiesUrl } from "@dashboard/translations/urls"; import { Card, TableBody, TableCell, TableHead } from "@material-ui/core"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { LanguageFragment } from "@saleor/graphql"; import { makeStyles } from "@saleor/macaw-ui"; -import { languageEntitiesUrl } from "@saleor/translations/urls"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/translations/components/TranslationsLanguageListPage/TranslationsLanguageListPage.stories.tsx b/src/translations/components/TranslationsLanguageListPage/TranslationsLanguageListPage.stories.tsx index 736c73c9c..3ce80ce99 100644 --- a/src/translations/components/TranslationsLanguageListPage/TranslationsLanguageListPage.stories.tsx +++ b/src/translations/components/TranslationsLanguageListPage/TranslationsLanguageListPage.stories.tsx @@ -1,4 +1,4 @@ -import Decorator from "@saleor/storybook/Decorator"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/translations/components/TranslationsLanguageListPage/TranslationsLanguageListPage.tsx b/src/translations/components/TranslationsLanguageListPage/TranslationsLanguageListPage.tsx index 4934d6b5b..19ae0c439 100644 --- a/src/translations/components/TranslationsLanguageListPage/TranslationsLanguageListPage.tsx +++ b/src/translations/components/TranslationsLanguageListPage/TranslationsLanguageListPage.tsx @@ -1,6 +1,6 @@ -import Container from "@saleor/components/Container"; -import PageHeader from "@saleor/components/PageHeader"; -import { LanguageFragment } from "@saleor/graphql"; +import Container from "@dashboard/components/Container"; +import PageHeader from "@dashboard/components/PageHeader"; +import { LanguageFragment } from "@dashboard/graphql"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/translations/components/TranslationsMenuItemPage/TranslationsMenuItemPage.tsx b/src/translations/components/TranslationsMenuItemPage/TranslationsMenuItemPage.tsx index e45395045..85895e2fc 100644 --- a/src/translations/components/TranslationsMenuItemPage/TranslationsMenuItemPage.tsx +++ b/src/translations/components/TranslationsMenuItemPage/TranslationsMenuItemPage.tsx @@ -1,19 +1,22 @@ -import { Backlink } from "@saleor/components/Backlink"; -import Container from "@saleor/components/Container"; -import LanguageSwitch from "@saleor/components/LanguageSwitch"; -import PageHeader from "@saleor/components/PageHeader"; -import { LanguageCodeEnum, MenuItemTranslationFragment } from "@saleor/graphql"; -import { commonMessages, sectionNames } from "@saleor/intl"; -import { getStringOrPlaceholder } from "@saleor/misc"; +import { Backlink } from "@dashboard/components/Backlink"; +import Container from "@dashboard/components/Container"; +import LanguageSwitch from "@dashboard/components/LanguageSwitch"; +import PageHeader from "@dashboard/components/PageHeader"; +import { + LanguageCodeEnum, + MenuItemTranslationFragment, +} from "@dashboard/graphql"; +import { commonMessages, sectionNames } from "@dashboard/intl"; +import { getStringOrPlaceholder } from "@dashboard/misc"; import { TranslationInputFieldName, TranslationsEntitiesPageProps, -} from "@saleor/translations/types"; +} from "@dashboard/translations/types"; import { languageEntitiesUrl, languageEntityUrl, TranslatableEntities, -} from "@saleor/translations/urls"; +} from "@dashboard/translations/urls"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/translations/components/TranslationsPagesPage/TranslationsPagesPage.tsx b/src/translations/components/TranslationsPagesPage/TranslationsPagesPage.tsx index 0794d8246..8b15022fa 100644 --- a/src/translations/components/TranslationsPagesPage/TranslationsPagesPage.tsx +++ b/src/translations/components/TranslationsPagesPage/TranslationsPagesPage.tsx @@ -1,21 +1,21 @@ -import { Backlink } from "@saleor/components/Backlink"; -import CardSpacer from "@saleor/components/CardSpacer"; -import Container from "@saleor/components/Container"; -import LanguageSwitch from "@saleor/components/LanguageSwitch"; -import PageHeader from "@saleor/components/PageHeader"; -import { LanguageCodeEnum, PageTranslationFragment } from "@saleor/graphql"; -import { commonMessages, sectionNames } from "@saleor/intl"; -import { getStringOrPlaceholder } from "@saleor/misc"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import Container from "@dashboard/components/Container"; +import LanguageSwitch from "@dashboard/components/LanguageSwitch"; +import PageHeader from "@dashboard/components/PageHeader"; +import { LanguageCodeEnum, PageTranslationFragment } from "@dashboard/graphql"; +import { commonMessages, sectionNames } from "@dashboard/intl"; +import { getStringOrPlaceholder } from "@dashboard/misc"; import { PageTranslationInputFieldName, TranslationsEntitiesPageProps, -} from "@saleor/translations/types"; +} from "@dashboard/translations/types"; import { languageEntitiesUrl, languageEntityUrl, TranslatableEntities, -} from "@saleor/translations/urls"; -import { mapAttributeValuesToTranslationFields } from "@saleor/translations/utils"; +} from "@dashboard/translations/urls"; +import { mapAttributeValuesToTranslationFields } from "@dashboard/translations/utils"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/translations/components/TranslationsProductVariantsPage/TranslationsProductVariantsPage.tsx b/src/translations/components/TranslationsProductVariantsPage/TranslationsProductVariantsPage.tsx index a742af5d8..f3ed9923e 100644 --- a/src/translations/components/TranslationsProductVariantsPage/TranslationsProductVariantsPage.tsx +++ b/src/translations/components/TranslationsProductVariantsPage/TranslationsProductVariantsPage.tsx @@ -1,24 +1,24 @@ -import { Backlink } from "@saleor/components/Backlink"; -import CardSpacer from "@saleor/components/CardSpacer"; -import Container from "@saleor/components/Container"; -import LanguageSwitch from "@saleor/components/LanguageSwitch"; -import PageHeader from "@saleor/components/PageHeader"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import Container from "@dashboard/components/Container"; +import LanguageSwitch from "@dashboard/components/LanguageSwitch"; +import PageHeader from "@dashboard/components/PageHeader"; import { LanguageCodeEnum, ProductVariantTranslationFragment, -} from "@saleor/graphql"; -import { commonMessages, sectionNames } from "@saleor/intl"; -import { getStringOrPlaceholder } from "@saleor/misc"; +} from "@dashboard/graphql"; +import { commonMessages, sectionNames } from "@dashboard/intl"; +import { getStringOrPlaceholder } from "@dashboard/misc"; import { TranslationInputFieldName, TranslationsEntitiesPageProps, -} from "@saleor/translations/types"; +} from "@dashboard/translations/types"; import { languageEntitiesUrl, productVariantUrl, TranslatableEntities, -} from "@saleor/translations/urls"; -import { mapAttributeValuesToTranslationFields } from "@saleor/translations/utils"; +} from "@dashboard/translations/urls"; +import { mapAttributeValuesToTranslationFields } from "@dashboard/translations/utils"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/translations/components/TranslationsProductsPage/TranslationsProductsPage.tsx b/src/translations/components/TranslationsProductsPage/TranslationsProductsPage.tsx index 887f5f79a..d24ad46b2 100644 --- a/src/translations/components/TranslationsProductsPage/TranslationsProductsPage.tsx +++ b/src/translations/components/TranslationsProductsPage/TranslationsProductsPage.tsx @@ -1,21 +1,24 @@ -import { Backlink } from "@saleor/components/Backlink"; -import CardSpacer from "@saleor/components/CardSpacer"; -import Container from "@saleor/components/Container"; -import LanguageSwitch from "@saleor/components/LanguageSwitch"; -import PageHeader from "@saleor/components/PageHeader"; -import { LanguageCodeEnum, ProductTranslationFragment } from "@saleor/graphql"; -import { commonMessages, sectionNames } from "@saleor/intl"; -import { getStringOrPlaceholder } from "@saleor/misc"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import Container from "@dashboard/components/Container"; +import LanguageSwitch from "@dashboard/components/LanguageSwitch"; +import PageHeader from "@dashboard/components/PageHeader"; +import { + LanguageCodeEnum, + ProductTranslationFragment, +} from "@dashboard/graphql"; +import { commonMessages, sectionNames } from "@dashboard/intl"; +import { getStringOrPlaceholder } from "@dashboard/misc"; import { TranslationInputFieldName, TranslationsEntitiesPageProps, -} from "@saleor/translations/types"; +} from "@dashboard/translations/types"; import { languageEntitiesUrl, languageEntityUrl, TranslatableEntities, -} from "@saleor/translations/urls"; -import { mapAttributeValuesToTranslationFields } from "@saleor/translations/utils"; +} from "@dashboard/translations/urls"; +import { mapAttributeValuesToTranslationFields } from "@dashboard/translations/utils"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/translations/components/TranslationsSalesPage/TranslationsSalesPage.tsx b/src/translations/components/TranslationsSalesPage/TranslationsSalesPage.tsx index 36acce467..82fc380d5 100644 --- a/src/translations/components/TranslationsSalesPage/TranslationsSalesPage.tsx +++ b/src/translations/components/TranslationsSalesPage/TranslationsSalesPage.tsx @@ -1,16 +1,16 @@ -import { Backlink } from "@saleor/components/Backlink"; -import Container from "@saleor/components/Container"; -import LanguageSwitch from "@saleor/components/LanguageSwitch"; -import PageHeader from "@saleor/components/PageHeader"; -import { LanguageCodeEnum, SaleTranslationFragment } from "@saleor/graphql"; -import { commonMessages, sectionNames } from "@saleor/intl"; -import { getStringOrPlaceholder } from "@saleor/misc"; -import { TranslationsEntitiesPageProps } from "@saleor/translations/types"; +import { Backlink } from "@dashboard/components/Backlink"; +import Container from "@dashboard/components/Container"; +import LanguageSwitch from "@dashboard/components/LanguageSwitch"; +import PageHeader from "@dashboard/components/PageHeader"; +import { LanguageCodeEnum, SaleTranslationFragment } from "@dashboard/graphql"; +import { commonMessages, sectionNames } from "@dashboard/intl"; +import { getStringOrPlaceholder } from "@dashboard/misc"; +import { TranslationsEntitiesPageProps } from "@dashboard/translations/types"; import { languageEntitiesUrl, languageEntityUrl, TranslatableEntities, -} from "@saleor/translations/urls"; +} from "@dashboard/translations/urls"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/translations/components/TranslationsShippingMethodPage/TranslationsShippingMethodPage.tsx b/src/translations/components/TranslationsShippingMethodPage/TranslationsShippingMethodPage.tsx index aefda24b2..a1e66fe59 100644 --- a/src/translations/components/TranslationsShippingMethodPage/TranslationsShippingMethodPage.tsx +++ b/src/translations/components/TranslationsShippingMethodPage/TranslationsShippingMethodPage.tsx @@ -1,22 +1,22 @@ -import { Backlink } from "@saleor/components/Backlink"; -import Container from "@saleor/components/Container"; -import LanguageSwitch from "@saleor/components/LanguageSwitch"; -import PageHeader from "@saleor/components/PageHeader"; +import { Backlink } from "@dashboard/components/Backlink"; +import Container from "@dashboard/components/Container"; +import LanguageSwitch from "@dashboard/components/LanguageSwitch"; +import PageHeader from "@dashboard/components/PageHeader"; import { LanguageCodeEnum, ShippingMethodTranslationFragment, -} from "@saleor/graphql"; -import { commonMessages, sectionNames } from "@saleor/intl"; -import { getStringOrPlaceholder } from "@saleor/misc"; +} from "@dashboard/graphql"; +import { commonMessages, sectionNames } from "@dashboard/intl"; +import { getStringOrPlaceholder } from "@dashboard/misc"; import { TranslationInputFieldName, TranslationsEntitiesPageProps, -} from "@saleor/translations/types"; +} from "@dashboard/translations/types"; import { languageEntitiesUrl, languageEntityUrl, TranslatableEntities, -} from "@saleor/translations/urls"; +} from "@dashboard/translations/urls"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/translations/components/TranslationsVouchersPage/TranslationsVouchersPage.tsx b/src/translations/components/TranslationsVouchersPage/TranslationsVouchersPage.tsx index dd65ee3d5..d61159069 100644 --- a/src/translations/components/TranslationsVouchersPage/TranslationsVouchersPage.tsx +++ b/src/translations/components/TranslationsVouchersPage/TranslationsVouchersPage.tsx @@ -1,16 +1,19 @@ -import { Backlink } from "@saleor/components/Backlink"; -import Container from "@saleor/components/Container"; -import LanguageSwitch from "@saleor/components/LanguageSwitch"; -import PageHeader from "@saleor/components/PageHeader"; -import { LanguageCodeEnum, VoucherTranslationFragment } from "@saleor/graphql"; -import { commonMessages, sectionNames } from "@saleor/intl"; -import { getStringOrPlaceholder } from "@saleor/misc"; -import { TranslationsEntitiesPageProps } from "@saleor/translations/types"; +import { Backlink } from "@dashboard/components/Backlink"; +import Container from "@dashboard/components/Container"; +import LanguageSwitch from "@dashboard/components/LanguageSwitch"; +import PageHeader from "@dashboard/components/PageHeader"; +import { + LanguageCodeEnum, + VoucherTranslationFragment, +} from "@dashboard/graphql"; +import { commonMessages, sectionNames } from "@dashboard/intl"; +import { getStringOrPlaceholder } from "@dashboard/misc"; +import { TranslationsEntitiesPageProps } from "@dashboard/translations/types"; import { languageEntitiesUrl, languageEntityUrl, TranslatableEntities, -} from "@saleor/translations/urls"; +} from "@dashboard/translations/urls"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/translations/fixtures.ts b/src/translations/fixtures.ts index 6d043d53c..4641e87b6 100644 --- a/src/translations/fixtures.ts +++ b/src/translations/fixtures.ts @@ -1,4 +1,4 @@ -import { LanguageCodeEnum, LanguageFragment } from "@saleor/graphql"; +import { LanguageCodeEnum, LanguageFragment } from "@dashboard/graphql"; export const languages: LanguageFragment[] = [ { diff --git a/src/translations/index.tsx b/src/translations/index.tsx index 26a813e27..17605beb9 100644 --- a/src/translations/index.tsx +++ b/src/translations/index.tsx @@ -1,5 +1,5 @@ -import { LanguageCodeEnum } from "@saleor/graphql"; -import { sectionNames } from "@saleor/intl"; +import { LanguageCodeEnum } from "@dashboard/graphql"; +import { sectionNames } from "@dashboard/intl"; import { parse as parseQs } from "qs"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/translations/types.ts b/src/translations/types.ts index 7c0d87b41..29923fb28 100644 --- a/src/translations/types.ts +++ b/src/translations/types.ts @@ -1,6 +1,6 @@ +import { LanguageFragment } from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; import { OutputData } from "@editorjs/editorjs"; -import { LanguageFragment } from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; export enum TranslationInputFieldName { diff --git a/src/translations/urls.ts b/src/translations/urls.ts index e16ad88cb..b2ef057d3 100644 --- a/src/translations/urls.ts +++ b/src/translations/urls.ts @@ -1,5 +1,5 @@ -import { Pagination } from "@saleor/types"; -import { stringifyQs } from "@saleor/utils/urls"; +import { Pagination } from "@dashboard/types"; +import { stringifyQs } from "@dashboard/utils/urls"; import urlJoin from "url-join"; import { TranslationsEntitiesListFilterTab } from "./components/TranslationsEntitiesListPage"; diff --git a/src/translations/utils.ts b/src/translations/utils.ts index a2239744f..596969fbe 100644 --- a/src/translations/utils.ts +++ b/src/translations/utils.ts @@ -1,15 +1,15 @@ -import { OutputData } from "@editorjs/editorjs"; import { AttributeTranslationDetailsFragment, AttributeValueTranslatableFragment, AttributeValueTranslationInput, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import { TranslationField, TranslationFieldType, -} from "@saleor/translations/types"; -import { mapEdgesToItems } from "@saleor/utils/maps"; -import { getParsedDataForJsonStringField } from "@saleor/utils/richText/misc"; +} from "@dashboard/translations/types"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; +import { getParsedDataForJsonStringField } from "@dashboard/utils/richText/misc"; +import { OutputData } from "@editorjs/editorjs"; import { IntlShape } from "react-intl"; import { fieldNames } from "./components/TranslationsAttributesPage"; diff --git a/src/translations/views/EntityLists/TranslationsAttributeList.tsx b/src/translations/views/EntityLists/TranslationsAttributeList.tsx index c8bd59128..2938af206 100644 --- a/src/translations/views/EntityLists/TranslationsAttributeList.tsx +++ b/src/translations/views/EntityLists/TranslationsAttributeList.tsx @@ -1,11 +1,11 @@ -import { useAttributeTranslationsQuery } from "@saleor/graphql"; -import usePaginator, { PaginatorContext } from "@saleor/hooks/usePaginator"; -import TranslationsEntitiesList from "@saleor/translations/components/TranslationsEntitiesList"; +import { useAttributeTranslationsQuery } from "@dashboard/graphql"; +import usePaginator, { PaginatorContext } from "@dashboard/hooks/usePaginator"; +import TranslationsEntitiesList from "@dashboard/translations/components/TranslationsEntitiesList"; import { languageEntityUrl, TranslatableEntities, -} from "@saleor/translations/urls"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/translations/urls"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import React from "react"; import { TranslationsEntityListProps } from "./types"; diff --git a/src/translations/views/EntityLists/TranslationsCategoryList.tsx b/src/translations/views/EntityLists/TranslationsCategoryList.tsx index 55043f761..0514920e5 100644 --- a/src/translations/views/EntityLists/TranslationsCategoryList.tsx +++ b/src/translations/views/EntityLists/TranslationsCategoryList.tsx @@ -1,11 +1,11 @@ -import { useCategoryTranslationsQuery } from "@saleor/graphql"; -import usePaginator, { PaginatorContext } from "@saleor/hooks/usePaginator"; -import TranslationsEntitiesList from "@saleor/translations/components/TranslationsEntitiesList"; +import { useCategoryTranslationsQuery } from "@dashboard/graphql"; +import usePaginator, { PaginatorContext } from "@dashboard/hooks/usePaginator"; +import TranslationsEntitiesList from "@dashboard/translations/components/TranslationsEntitiesList"; import { languageEntityUrl, TranslatableEntities, -} from "@saleor/translations/urls"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/translations/urls"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import React from "react"; import { TranslationsEntityListProps } from "./types"; diff --git a/src/translations/views/EntityLists/TranslationsCollectionList.tsx b/src/translations/views/EntityLists/TranslationsCollectionList.tsx index 02c2fa675..046e82e36 100644 --- a/src/translations/views/EntityLists/TranslationsCollectionList.tsx +++ b/src/translations/views/EntityLists/TranslationsCollectionList.tsx @@ -1,11 +1,11 @@ -import { useCollectionTranslationsQuery } from "@saleor/graphql"; -import usePaginator, { PaginatorContext } from "@saleor/hooks/usePaginator"; -import TranslationsEntitiesList from "@saleor/translations/components/TranslationsEntitiesList"; +import { useCollectionTranslationsQuery } from "@dashboard/graphql"; +import usePaginator, { PaginatorContext } from "@dashboard/hooks/usePaginator"; +import TranslationsEntitiesList from "@dashboard/translations/components/TranslationsEntitiesList"; import { languageEntityUrl, TranslatableEntities, -} from "@saleor/translations/urls"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/translations/urls"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import React from "react"; import { TranslationsEntityListProps } from "./types"; diff --git a/src/translations/views/EntityLists/TranslationsMenuItemList.tsx b/src/translations/views/EntityLists/TranslationsMenuItemList.tsx index 60a2d034e..f25ba43dc 100644 --- a/src/translations/views/EntityLists/TranslationsMenuItemList.tsx +++ b/src/translations/views/EntityLists/TranslationsMenuItemList.tsx @@ -1,11 +1,11 @@ -import { useMenuItemTranslationsQuery } from "@saleor/graphql"; -import usePaginator, { PaginatorContext } from "@saleor/hooks/usePaginator"; -import TranslationsEntitiesList from "@saleor/translations/components/TranslationsEntitiesList"; +import { useMenuItemTranslationsQuery } from "@dashboard/graphql"; +import usePaginator, { PaginatorContext } from "@dashboard/hooks/usePaginator"; +import TranslationsEntitiesList from "@dashboard/translations/components/TranslationsEntitiesList"; import { languageEntityUrl, TranslatableEntities, -} from "@saleor/translations/urls"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/translations/urls"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import React from "react"; import { TranslationsEntityListProps } from "./types"; diff --git a/src/translations/views/EntityLists/TranslationsPageList.tsx b/src/translations/views/EntityLists/TranslationsPageList.tsx index f31d9c06e..223597cf3 100644 --- a/src/translations/views/EntityLists/TranslationsPageList.tsx +++ b/src/translations/views/EntityLists/TranslationsPageList.tsx @@ -1,11 +1,11 @@ -import { usePageTranslationsQuery } from "@saleor/graphql"; -import usePaginator, { PaginatorContext } from "@saleor/hooks/usePaginator"; -import TranslationsEntitiesList from "@saleor/translations/components/TranslationsEntitiesList"; +import { usePageTranslationsQuery } from "@dashboard/graphql"; +import usePaginator, { PaginatorContext } from "@dashboard/hooks/usePaginator"; +import TranslationsEntitiesList from "@dashboard/translations/components/TranslationsEntitiesList"; import { languageEntityUrl, TranslatableEntities, -} from "@saleor/translations/urls"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/translations/urls"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import React from "react"; import { TranslationsEntityListProps } from "./types"; diff --git a/src/translations/views/EntityLists/TranslationsProductList.tsx b/src/translations/views/EntityLists/TranslationsProductList.tsx index 481c68bb2..7f2677d1f 100644 --- a/src/translations/views/EntityLists/TranslationsProductList.tsx +++ b/src/translations/views/EntityLists/TranslationsProductList.tsx @@ -1,11 +1,11 @@ -import { useProductTranslationsQuery } from "@saleor/graphql"; -import usePaginator, { PaginatorContext } from "@saleor/hooks/usePaginator"; -import TranslationsEntitiesList from "@saleor/translations/components/TranslationsEntitiesList"; +import { useProductTranslationsQuery } from "@dashboard/graphql"; +import usePaginator, { PaginatorContext } from "@dashboard/hooks/usePaginator"; +import TranslationsEntitiesList from "@dashboard/translations/components/TranslationsEntitiesList"; import { languageEntityUrl, TranslatableEntities, -} from "@saleor/translations/urls"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/translations/urls"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import React from "react"; import { TranslationsEntityListProps } from "./types"; diff --git a/src/translations/views/EntityLists/TranslationsSaleList.tsx b/src/translations/views/EntityLists/TranslationsSaleList.tsx index 2cda0698a..be120a303 100644 --- a/src/translations/views/EntityLists/TranslationsSaleList.tsx +++ b/src/translations/views/EntityLists/TranslationsSaleList.tsx @@ -1,11 +1,11 @@ -import { useSaleTranslationsQuery } from "@saleor/graphql"; -import usePaginator, { PaginatorContext } from "@saleor/hooks/usePaginator"; -import TranslationsEntitiesList from "@saleor/translations/components/TranslationsEntitiesList"; +import { useSaleTranslationsQuery } from "@dashboard/graphql"; +import usePaginator, { PaginatorContext } from "@dashboard/hooks/usePaginator"; +import TranslationsEntitiesList from "@dashboard/translations/components/TranslationsEntitiesList"; import { languageEntityUrl, TranslatableEntities, -} from "@saleor/translations/urls"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/translations/urls"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import React from "react"; import { TranslationsEntityListProps } from "./types"; diff --git a/src/translations/views/EntityLists/TranslationsShippingMethodList.tsx b/src/translations/views/EntityLists/TranslationsShippingMethodList.tsx index 266bd6da7..891fd3ce8 100644 --- a/src/translations/views/EntityLists/TranslationsShippingMethodList.tsx +++ b/src/translations/views/EntityLists/TranslationsShippingMethodList.tsx @@ -1,11 +1,11 @@ -import { useShippingMethodTranslationsQuery } from "@saleor/graphql"; -import usePaginator, { PaginatorContext } from "@saleor/hooks/usePaginator"; -import TranslationsEntitiesList from "@saleor/translations/components/TranslationsEntitiesList"; +import { useShippingMethodTranslationsQuery } from "@dashboard/graphql"; +import usePaginator, { PaginatorContext } from "@dashboard/hooks/usePaginator"; +import TranslationsEntitiesList from "@dashboard/translations/components/TranslationsEntitiesList"; import { languageEntityUrl, TranslatableEntities, -} from "@saleor/translations/urls"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/translations/urls"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import React from "react"; import { TranslationsEntityListProps } from "./types"; diff --git a/src/translations/views/EntityLists/TranslationsVoucherList.tsx b/src/translations/views/EntityLists/TranslationsVoucherList.tsx index 92238ece2..c27f6d0bf 100644 --- a/src/translations/views/EntityLists/TranslationsVoucherList.tsx +++ b/src/translations/views/EntityLists/TranslationsVoucherList.tsx @@ -1,11 +1,11 @@ -import { useVoucherTranslationsQuery } from "@saleor/graphql"; -import usePaginator, { PaginatorContext } from "@saleor/hooks/usePaginator"; -import TranslationsEntitiesList from "@saleor/translations/components/TranslationsEntitiesList"; +import { useVoucherTranslationsQuery } from "@dashboard/graphql"; +import usePaginator, { PaginatorContext } from "@dashboard/hooks/usePaginator"; +import TranslationsEntitiesList from "@dashboard/translations/components/TranslationsEntitiesList"; import { languageEntityUrl, TranslatableEntities, -} from "@saleor/translations/urls"; -import { mapEdgesToItems } from "@saleor/utils/maps"; +} from "@dashboard/translations/urls"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; import React from "react"; import { TranslationsEntityListProps } from "./types"; diff --git a/src/translations/views/EntityLists/types.ts b/src/translations/views/EntityLists/types.ts index b3c5f1309..31aa35796 100644 --- a/src/translations/views/EntityLists/types.ts +++ b/src/translations/views/EntityLists/types.ts @@ -1,6 +1,6 @@ -import { LanguageCodeEnum } from "@saleor/graphql"; -import { PaginationState } from "@saleor/hooks/usePaginator"; -import { LanguageEntitiesUrlQueryParams } from "@saleor/translations/urls"; +import { LanguageCodeEnum } from "@dashboard/graphql"; +import { PaginationState } from "@dashboard/hooks/usePaginator"; +import { LanguageEntitiesUrlQueryParams } from "@dashboard/translations/urls"; export interface TranslationsEntityListProps { params: LanguageEntitiesUrlQueryParams; diff --git a/src/translations/views/TranslationsAttributes.tsx b/src/translations/views/TranslationsAttributes.tsx index 3467cfba8..929f7aa3a 100644 --- a/src/translations/views/TranslationsAttributes.tsx +++ b/src/translations/views/TranslationsAttributes.tsx @@ -1,21 +1,21 @@ -import { OutputData } from "@editorjs/editorjs"; import { LanguageCodeEnum, useAttributeTranslationDetailsQuery, useUpdateAttributeTranslationsMutation, useUpdateAttributeValueTranslationsMutation, -} from "@saleor/graphql"; -import useListSettings from "@saleor/hooks/useListSettings"; +} from "@dashboard/graphql"; +import useListSettings from "@dashboard/hooks/useListSettings"; import useLocalPaginator, { useLocalPaginationState, -} from "@saleor/hooks/useLocalPaginator"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { PaginatorContext } from "@saleor/hooks/usePaginator"; -import useShop from "@saleor/hooks/useShop"; -import { commonMessages } from "@saleor/intl"; -import { ListViews, Pagination } from "@saleor/types"; -import { stringifyQs } from "@saleor/utils/urls"; +} from "@dashboard/hooks/useLocalPaginator"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { PaginatorContext } from "@dashboard/hooks/usePaginator"; +import useShop from "@dashboard/hooks/useShop"; +import { commonMessages } from "@dashboard/intl"; +import { ListViews, Pagination } from "@dashboard/types"; +import { stringifyQs } from "@dashboard/utils/urls"; +import { OutputData } from "@editorjs/editorjs"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/translations/views/TranslationsCategories.tsx b/src/translations/views/TranslationsCategories.tsx index b39bcd6e4..836aeed8d 100644 --- a/src/translations/views/TranslationsCategories.tsx +++ b/src/translations/views/TranslationsCategories.tsx @@ -1,15 +1,15 @@ -import { OutputData } from "@editorjs/editorjs"; import { LanguageCodeEnum, useCategoryTranslationDetailsQuery, useUpdateCategoryTranslationsMutation, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import useShop from "@saleor/hooks/useShop"; -import { commonMessages } from "@saleor/intl"; -import { extractMutationErrors } from "@saleor/misc"; -import { stringifyQs } from "@saleor/utils/urls"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import useShop from "@dashboard/hooks/useShop"; +import { commonMessages } from "@dashboard/intl"; +import { extractMutationErrors } from "@dashboard/misc"; +import { stringifyQs } from "@dashboard/utils/urls"; +import { OutputData } from "@editorjs/editorjs"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/translations/views/TranslationsCollections.tsx b/src/translations/views/TranslationsCollections.tsx index 7a919c97a..8f57dff22 100644 --- a/src/translations/views/TranslationsCollections.tsx +++ b/src/translations/views/TranslationsCollections.tsx @@ -2,12 +2,12 @@ import { LanguageCodeEnum, useCollectionTranslationDetailsQuery, useUpdateCollectionTranslationsMutation, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import useShop from "@saleor/hooks/useShop"; -import { commonMessages } from "@saleor/intl"; -import { stringifyQs } from "@saleor/utils/urls"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import useShop from "@dashboard/hooks/useShop"; +import { commonMessages } from "@dashboard/intl"; +import { stringifyQs } from "@dashboard/utils/urls"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/translations/views/TranslationsEntities.tsx b/src/translations/views/TranslationsEntities.tsx index c68ad1356..5cff7b3af 100644 --- a/src/translations/views/TranslationsEntities.tsx +++ b/src/translations/views/TranslationsEntities.tsx @@ -1,7 +1,7 @@ -import useNavigator from "@saleor/hooks/useNavigator"; -import { createPaginationState } from "@saleor/hooks/usePaginator"; -import useShop from "@saleor/hooks/useShop"; -import { stringifyQs } from "@saleor/utils/urls"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import { createPaginationState } from "@dashboard/hooks/usePaginator"; +import useShop from "@dashboard/hooks/useShop"; +import { stringifyQs } from "@dashboard/utils/urls"; import React from "react"; import { PAGINATE_BY } from "../../config"; diff --git a/src/translations/views/TranslationsLanguageList.tsx b/src/translations/views/TranslationsLanguageList.tsx index 30c21242f..80b9058e3 100644 --- a/src/translations/views/TranslationsLanguageList.tsx +++ b/src/translations/views/TranslationsLanguageList.tsx @@ -1,4 +1,4 @@ -import useShop from "@saleor/hooks/useShop"; +import useShop from "@dashboard/hooks/useShop"; import React from "react"; import { maybe } from "../../misc"; diff --git a/src/translations/views/TranslationsMenuItem.tsx b/src/translations/views/TranslationsMenuItem.tsx index 2d7105e2b..8adb3f2df 100644 --- a/src/translations/views/TranslationsMenuItem.tsx +++ b/src/translations/views/TranslationsMenuItem.tsx @@ -2,13 +2,13 @@ import { LanguageCodeEnum, useMenuItemTranslationDetailsQuery, useUpdateMenuItemTranslationsMutation, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import useShop from "@saleor/hooks/useShop"; -import { commonMessages } from "@saleor/intl"; -import { extractMutationErrors } from "@saleor/misc"; -import { stringifyQs } from "@saleor/utils/urls"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import useShop from "@dashboard/hooks/useShop"; +import { commonMessages } from "@dashboard/intl"; +import { extractMutationErrors } from "@dashboard/misc"; +import { stringifyQs } from "@dashboard/utils/urls"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/translations/views/TranslationsPages.tsx b/src/translations/views/TranslationsPages.tsx index ba6421fe0..310e66d82 100644 --- a/src/translations/views/TranslationsPages.tsx +++ b/src/translations/views/TranslationsPages.tsx @@ -1,16 +1,16 @@ -import { OutputData } from "@editorjs/editorjs"; import { LanguageCodeEnum, usePageTranslationDetailsQuery, useUpdateAttributeValueTranslationsMutation, useUpdatePageTranslationsMutation, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import useShop from "@saleor/hooks/useShop"; -import { commonMessages } from "@saleor/intl"; -import { extractMutationErrors } from "@saleor/misc"; -import { stringifyQs } from "@saleor/utils/urls"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import useShop from "@dashboard/hooks/useShop"; +import { commonMessages } from "@dashboard/intl"; +import { extractMutationErrors } from "@dashboard/misc"; +import { stringifyQs } from "@dashboard/utils/urls"; +import { OutputData } from "@editorjs/editorjs"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/translations/views/TranslationsProductVariants.tsx b/src/translations/views/TranslationsProductVariants.tsx index 9423f991f..171af2001 100644 --- a/src/translations/views/TranslationsProductVariants.tsx +++ b/src/translations/views/TranslationsProductVariants.tsx @@ -1,14 +1,14 @@ -import { OutputData } from "@editorjs/editorjs"; import { LanguageCodeEnum, useProductVariantTranslationDetailsQuery, useUpdateAttributeValueTranslationsMutation, useUpdateProductVariantTranslationsMutation, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import useShop from "@saleor/hooks/useShop"; -import { commonMessages } from "@saleor/intl"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import useShop from "@dashboard/hooks/useShop"; +import { commonMessages } from "@dashboard/intl"; +import { OutputData } from "@editorjs/editorjs"; import { stringify as stringifyQs } from "qs"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/translations/views/TranslationsProducts.tsx b/src/translations/views/TranslationsProducts.tsx index 3355aee74..8e9dbe5ac 100644 --- a/src/translations/views/TranslationsProducts.tsx +++ b/src/translations/views/TranslationsProducts.tsx @@ -1,15 +1,15 @@ -import { OutputData } from "@editorjs/editorjs"; import { LanguageCodeEnum, useProductTranslationDetailsQuery, useUpdateAttributeValueTranslationsMutation, useUpdateProductTranslationsMutation, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import useShop from "@saleor/hooks/useShop"; -import { commonMessages } from "@saleor/intl"; -import { stringifyQs } from "@saleor/utils/urls"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import useShop from "@dashboard/hooks/useShop"; +import { commonMessages } from "@dashboard/intl"; +import { stringifyQs } from "@dashboard/utils/urls"; +import { OutputData } from "@editorjs/editorjs"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/translations/views/TranslationsSales.tsx b/src/translations/views/TranslationsSales.tsx index eec312810..452277091 100644 --- a/src/translations/views/TranslationsSales.tsx +++ b/src/translations/views/TranslationsSales.tsx @@ -2,13 +2,13 @@ import { LanguageCodeEnum, useSaleTranslationDetailsQuery, useUpdateSaleTranslationsMutation, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import useShop from "@saleor/hooks/useShop"; -import { commonMessages } from "@saleor/intl"; -import { extractMutationErrors } from "@saleor/misc"; -import { stringifyQs } from "@saleor/utils/urls"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import useShop from "@dashboard/hooks/useShop"; +import { commonMessages } from "@dashboard/intl"; +import { extractMutationErrors } from "@dashboard/misc"; +import { stringifyQs } from "@dashboard/utils/urls"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/translations/views/TranslationsShippingMethod.tsx b/src/translations/views/TranslationsShippingMethod.tsx index fe402df1f..14e535f83 100644 --- a/src/translations/views/TranslationsShippingMethod.tsx +++ b/src/translations/views/TranslationsShippingMethod.tsx @@ -2,13 +2,13 @@ import { LanguageCodeEnum, useShippingMethodTranslationDetailsQuery, useUpdateShippingMethodTranslationsMutation, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import useShop from "@saleor/hooks/useShop"; -import { commonMessages } from "@saleor/intl"; -import { extractMutationErrors } from "@saleor/misc"; -import { stringifyQs } from "@saleor/utils/urls"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import useShop from "@dashboard/hooks/useShop"; +import { commonMessages } from "@dashboard/intl"; +import { extractMutationErrors } from "@dashboard/misc"; +import { stringifyQs } from "@dashboard/utils/urls"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/translations/views/TranslationsVouchers.tsx b/src/translations/views/TranslationsVouchers.tsx index 716b3a137..d78cb1403 100644 --- a/src/translations/views/TranslationsVouchers.tsx +++ b/src/translations/views/TranslationsVouchers.tsx @@ -2,12 +2,12 @@ import { LanguageCodeEnum, useUpdateVoucherTranslationsMutation, useVoucherTranslationDetailsQuery, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import useShop from "@saleor/hooks/useShop"; -import { commonMessages } from "@saleor/intl"; -import { stringifyQs } from "@saleor/utils/urls"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import useShop from "@dashboard/hooks/useShop"; +import { commonMessages } from "@dashboard/intl"; +import { stringifyQs } from "@dashboard/utils/urls"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/types.ts b/src/types.ts index 995ff354d..2c01ee1db 100644 --- a/src/types.ts +++ b/src/types.ts @@ -1,5 +1,5 @@ import { FetchResult, MutationResult } from "@apollo/client"; -import { UserPermissionFragment } from "@saleor/graphql"; +import { UserPermissionFragment } from "@dashboard/graphql"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import { FilterElement, IFilter } from "./components/Filter"; diff --git a/src/utils/errors/account.ts b/src/utils/errors/account.ts index f88a1d33d..1cffaaa0b 100644 --- a/src/utils/errors/account.ts +++ b/src/utils/errors/account.ts @@ -1,4 +1,4 @@ -import { AccountErrorCode } from "@saleor/graphql"; +import { AccountErrorCode } from "@dashboard/graphql"; import { SetPasswordData } from "@saleor/sdk"; import { defineMessages, IntlShape } from "react-intl"; diff --git a/src/utils/errors/app.ts b/src/utils/errors/app.ts index 262fffccd..86c8f7f0b 100644 --- a/src/utils/errors/app.ts +++ b/src/utils/errors/app.ts @@ -1,4 +1,4 @@ -import { AppErrorCode, AppErrorFragment } from "@saleor/graphql"; +import { AppErrorCode, AppErrorFragment } from "@dashboard/graphql"; import { defineMessages, IntlShape } from "react-intl"; import { getCommonFormFieldErrorMessage } from "./common"; diff --git a/src/utils/errors/attribute.ts b/src/utils/errors/attribute.ts index 77be491cf..910c836a2 100644 --- a/src/utils/errors/attribute.ts +++ b/src/utils/errors/attribute.ts @@ -1,4 +1,4 @@ -import { AttributeErrorCode, AttributeErrorFragment } from "@saleor/graphql"; +import { AttributeErrorCode, AttributeErrorFragment } from "@dashboard/graphql"; import { defineMessages, IntlShape } from "react-intl"; import { getCommonFormFieldErrorMessage } from "./common"; diff --git a/src/utils/errors/channels.ts b/src/utils/errors/channels.ts index 63469bd22..558047bfb 100644 --- a/src/utils/errors/channels.ts +++ b/src/utils/errors/channels.ts @@ -1,4 +1,4 @@ -import { ChannelErrorCode, ChannelErrorFragment } from "@saleor/graphql"; +import { ChannelErrorCode, ChannelErrorFragment } from "@dashboard/graphql"; import { defineMessages, IntlShape } from "react-intl"; import { getCommonFormFieldErrorMessage } from "./common"; diff --git a/src/utils/errors/common.ts b/src/utils/errors/common.ts index cee12d14e..68c8afbd4 100644 --- a/src/utils/errors/common.ts +++ b/src/utils/errors/common.ts @@ -1,4 +1,4 @@ -import { commonMessages } from "@saleor/intl"; +import { commonMessages } from "@dashboard/intl"; import { defineMessages, IntlShape } from "react-intl"; const commonErrorMessages = defineMessages({ diff --git a/src/utils/errors/discounts.ts b/src/utils/errors/discounts.ts index e939c597a..850515383 100644 --- a/src/utils/errors/discounts.ts +++ b/src/utils/errors/discounts.ts @@ -1,4 +1,4 @@ -import { DiscountErrorCode, DiscountErrorFragment } from "@saleor/graphql"; +import { DiscountErrorCode, DiscountErrorFragment } from "@dashboard/graphql"; import { defineMessages, IntlShape } from "react-intl"; import { getCommonFormFieldErrorMessage } from "./common"; diff --git a/src/utils/errors/export.ts b/src/utils/errors/export.ts index 7b33ded8b..73d7f43fb 100644 --- a/src/utils/errors/export.ts +++ b/src/utils/errors/export.ts @@ -1,4 +1,4 @@ -import { ExportErrorFragment } from "@saleor/graphql"; +import { ExportErrorFragment } from "@dashboard/graphql"; import { IntlShape } from "react-intl"; import { getCommonFormFieldErrorMessage } from "./common"; diff --git a/src/utils/errors/index.ts b/src/utils/errors/index.ts index c332e7909..1a511f3ef 100644 --- a/src/utils/errors/index.ts +++ b/src/utils/errors/index.ts @@ -1,4 +1,4 @@ -import { UserError } from "@saleor/types"; +import { UserError } from "@dashboard/types"; export function getFieldError( errors: T[], diff --git a/src/utils/errors/invoice.ts b/src/utils/errors/invoice.ts index c0ab9f04b..60e53c710 100644 --- a/src/utils/errors/invoice.ts +++ b/src/utils/errors/invoice.ts @@ -1,4 +1,4 @@ -import { InvoiceErrorCode, InvoiceErrorFragment } from "@saleor/graphql"; +import { InvoiceErrorCode, InvoiceErrorFragment } from "@dashboard/graphql"; import { defineMessages, IntlShape } from "react-intl"; import { getCommonFormFieldErrorMessage } from "./common"; diff --git a/src/utils/errors/menu.ts b/src/utils/errors/menu.ts index 87c6fe27e..1673ebb50 100644 --- a/src/utils/errors/menu.ts +++ b/src/utils/errors/menu.ts @@ -1,4 +1,4 @@ -import { MenuErrorFragment } from "@saleor/graphql"; +import { MenuErrorFragment } from "@dashboard/graphql"; import { IntlShape } from "react-intl"; import { getCommonFormFieldErrorMessage } from "./common"; diff --git a/src/utils/errors/order.ts b/src/utils/errors/order.ts index 02f3f3d80..87e787417 100644 --- a/src/utils/errors/order.ts +++ b/src/utils/errors/order.ts @@ -1,4 +1,4 @@ -import { OrderErrorCode, OrderErrorFragment } from "@saleor/graphql"; +import { OrderErrorCode, OrderErrorFragment } from "@dashboard/graphql"; import { defineMessages, IntlShape } from "react-intl"; import { getCommonFormFieldErrorMessage } from "./common"; diff --git a/src/utils/errors/page.ts b/src/utils/errors/page.ts index 8a23486cb..ca3c0176c 100644 --- a/src/utils/errors/page.ts +++ b/src/utils/errors/page.ts @@ -1,4 +1,4 @@ -import { PageErrorCode, PageErrorFragment } from "@saleor/graphql"; +import { PageErrorCode, PageErrorFragment } from "@dashboard/graphql"; import { defineMessages, IntlShape } from "react-intl"; import { getCommonFormFieldErrorMessage } from "./common"; diff --git a/src/utils/errors/permissionGroups.ts b/src/utils/errors/permissionGroups.ts index 6177c53e0..43d4ddb6b 100644 --- a/src/utils/errors/permissionGroups.ts +++ b/src/utils/errors/permissionGroups.ts @@ -1,7 +1,7 @@ import { PermissionGroupErrorCode, PermissionGroupErrorFragment, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import { defineMessages, IntlShape } from "react-intl"; import { getCommonFormFieldErrorMessage } from "./common"; diff --git a/src/utils/errors/plugins.ts b/src/utils/errors/plugins.ts index fb96d20af..3282122a5 100644 --- a/src/utils/errors/plugins.ts +++ b/src/utils/errors/plugins.ts @@ -1,4 +1,4 @@ -import { PluginErrorCode, PluginErrorFragment } from "@saleor/graphql"; +import { PluginErrorCode, PluginErrorFragment } from "@dashboard/graphql"; import { defineMessages, IntlShape } from "react-intl"; import { getCommonFormFieldErrorMessage } from "./common"; diff --git a/src/utils/errors/product.ts b/src/utils/errors/product.ts index a68488cbe..9c2999935 100644 --- a/src/utils/errors/product.ts +++ b/src/utils/errors/product.ts @@ -4,7 +4,7 @@ import { ProductChannelListingErrorFragment, ProductErrorCode, ProductErrorFragment, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import { defineMessages, IntlShape } from "react-intl"; import commonErrorMessages, { getCommonFormFieldErrorMessage } from "./common"; diff --git a/src/utils/errors/shipping.ts b/src/utils/errors/shipping.ts index 282f936c4..b8cdec643 100644 --- a/src/utils/errors/shipping.ts +++ b/src/utils/errors/shipping.ts @@ -1,4 +1,4 @@ -import { ShippingErrorCode, ShippingErrorFragment } from "@saleor/graphql"; +import { ShippingErrorCode, ShippingErrorFragment } from "@dashboard/graphql"; import { defineMessages, IntlShape } from "react-intl"; import { getCommonFormFieldErrorMessage } from "./common"; diff --git a/src/utils/errors/shop.ts b/src/utils/errors/shop.ts index 44340ca91..19cb03d0f 100644 --- a/src/utils/errors/shop.ts +++ b/src/utils/errors/shop.ts @@ -1,4 +1,4 @@ -import { ShopErrorCode, ShopErrorFragment } from "@saleor/graphql"; +import { ShopErrorCode, ShopErrorFragment } from "@dashboard/graphql"; import { defineMessages, IntlShape } from "react-intl"; import { getCommonFormFieldErrorMessage } from "./common"; diff --git a/src/utils/errors/staff.ts b/src/utils/errors/staff.ts index 22e8d69bf..a9affb4fb 100644 --- a/src/utils/errors/staff.ts +++ b/src/utils/errors/staff.ts @@ -1,4 +1,4 @@ -import { StaffErrorFragment } from "@saleor/graphql"; +import { StaffErrorFragment } from "@dashboard/graphql"; import { IntlShape } from "react-intl"; import getAccountErrorMessage from "./account"; diff --git a/src/utils/errors/stock.ts b/src/utils/errors/stock.ts index 759dcdf75..349d2deb8 100644 --- a/src/utils/errors/stock.ts +++ b/src/utils/errors/stock.ts @@ -2,7 +2,7 @@ import { BulkStockErrorFragment, StockErrorCode, StockErrorFragment, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import { defineMessages, IntlShape } from "react-intl"; import { getCommonFormFieldErrorMessage } from "./common"; diff --git a/src/utils/errors/taxes.ts b/src/utils/errors/taxes.ts index e404c7b91..18912ca19 100644 --- a/src/utils/errors/taxes.ts +++ b/src/utils/errors/taxes.ts @@ -2,7 +2,7 @@ import { TaxClassCreateErrorFragment, TaxClassDeleteErrorFragment, TaxClassUpdateErrorFragment, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import { IntlShape } from "react-intl"; import { diff --git a/src/utils/errors/warehouse.ts b/src/utils/errors/warehouse.ts index 4693fba65..0d14a49f2 100644 --- a/src/utils/errors/warehouse.ts +++ b/src/utils/errors/warehouse.ts @@ -1,4 +1,4 @@ -import { WarehouseErrorCode, WarehouseErrorFragment } from "@saleor/graphql"; +import { WarehouseErrorCode, WarehouseErrorFragment } from "@dashboard/graphql"; import { defineMessages, IntlShape } from "react-intl"; import { getCommonFormFieldErrorMessage } from "./common"; diff --git a/src/utils/errors/webhooks.ts b/src/utils/errors/webhooks.ts index 20080aba1..cc1a1c079 100644 --- a/src/utils/errors/webhooks.ts +++ b/src/utils/errors/webhooks.ts @@ -1,4 +1,4 @@ -import { WebhookErrorFragment } from "@saleor/graphql"; +import { WebhookErrorFragment } from "@dashboard/graphql"; import { IntlShape } from "react-intl"; import { getCommonFormFieldErrorMessage } from "./common"; diff --git a/src/utils/filters/fields.ts b/src/utils/filters/fields.ts index 0c9aff7b8..5847d85f2 100644 --- a/src/utils/filters/fields.ts +++ b/src/utils/filters/fields.ts @@ -1,11 +1,11 @@ -import { FieldType, FilterElementGeneric } from "@saleor/components/Filter"; -import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField"; +import { FieldType, FilterElementGeneric } from "@dashboard/components/Filter"; +import { MultiAutocompleteChoiceType } from "@dashboard/components/MultiAutocompleteSelectField"; import { FetchMoreProps, KeyValue, MinMax, SearchPageProps, -} from "@saleor/types"; +} from "@dashboard/types"; export function createPriceField( name: K, diff --git a/src/utils/filters/filters.ts b/src/utils/filters/filters.ts index 38b5898fc..2da40d964 100644 --- a/src/utils/filters/filters.ts +++ b/src/utils/filters/filters.ts @@ -3,9 +3,9 @@ import { FilterElementKeyValue, FilterElementRegular, IFilter, -} from "@saleor/components/Filter"; -import { findValueInEnum } from "@saleor/misc"; -import { ActiveTab } from "@saleor/types"; +} from "@dashboard/components/Filter"; +import { findValueInEnum } from "@dashboard/misc"; +import { ActiveTab } from "@dashboard/types"; import isArray from "lodash/isArray"; function createFilterUtils< diff --git a/src/utils/handlers/attributeValueSearchHandler.ts b/src/utils/handlers/attributeValueSearchHandler.ts index 3bffe134b..017e72878 100644 --- a/src/utils/handlers/attributeValueSearchHandler.ts +++ b/src/utils/handlers/attributeValueSearchHandler.ts @@ -1,9 +1,9 @@ import { SearchAttributeValuesQuery, SearchAttributeValuesQueryVariables, -} from "@saleor/graphql"; -import { UseSearchResult } from "@saleor/hooks/makeSearch"; -import useAttributeValueSearch from "@saleor/searches/useAttributeValueSearch"; +} from "@dashboard/graphql"; +import { UseSearchResult } from "@dashboard/hooks/makeSearch"; +import useAttributeValueSearch from "@dashboard/searches/useAttributeValueSearch"; import { useEffect, useState } from "react"; interface AttributeValueSearchHandlerState { diff --git a/src/utils/handlers/dialogActionHandlers.ts b/src/utils/handlers/dialogActionHandlers.ts index c352f98fd..3d159d2e6 100644 --- a/src/utils/handlers/dialogActionHandlers.ts +++ b/src/utils/handlers/dialogActionHandlers.ts @@ -1,5 +1,5 @@ -import { UseNavigatorResult } from "@saleor/hooks/useNavigator"; -import { BulkAction, Dialog, SingleAction } from "@saleor/types"; +import { UseNavigatorResult } from "@dashboard/hooks/useNavigator"; +import { BulkAction, Dialog, SingleAction } from "@dashboard/types"; type Url> = (params: T) => string; type CreateCloseModal< diff --git a/src/utils/handlers/filterHandlers.ts b/src/utils/handlers/filterHandlers.ts index 8295c5e2e..aa7e3f3dc 100644 --- a/src/utils/handlers/filterHandlers.ts +++ b/src/utils/handlers/filterHandlers.ts @@ -1,6 +1,6 @@ -import { IFilter } from "@saleor/components/Filter"; -import { UseNavigatorResult } from "@saleor/hooks/useNavigator"; -import { ActiveTab, Pagination, Search, Sort } from "@saleor/types"; +import { IFilter } from "@dashboard/components/Filter"; +import { UseNavigatorResult } from "@dashboard/hooks/useNavigator"; +import { ActiveTab, Pagination, Search, Sort } from "@dashboard/types"; import { GetFilterQueryParam, getFilterQueryParams } from "../filters"; diff --git a/src/utils/handlers/filterMetadataArray.ts b/src/utils/handlers/filterMetadataArray.ts index 1f5093c09..7f5c10367 100644 --- a/src/utils/handlers/filterMetadataArray.ts +++ b/src/utils/handlers/filterMetadataArray.ts @@ -1,4 +1,4 @@ -import { MetadataInput } from "@saleor/graphql"; +import { MetadataInput } from "@dashboard/graphql"; export const filterMetadataArray = (metadataInputs: MetadataInput[]) => metadataInputs.filter(input => !!input.key); diff --git a/src/utils/handlers/metadataCreateHandler.ts b/src/utils/handlers/metadataCreateHandler.ts index a9b4f4817..70c68e3d0 100644 --- a/src/utils/handlers/metadataCreateHandler.ts +++ b/src/utils/handlers/metadataCreateHandler.ts @@ -1,8 +1,8 @@ -import { MetadataFormData } from "@saleor/components/Metadata/types"; +import { MetadataFormData } from "@dashboard/components/Metadata/types"; import { UpdateMetadataMutationFn, UpdatePrivateMetadataMutationFn, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import { filterMetadataArray } from "./filterMetadataArray"; diff --git a/src/utils/handlers/metadataUpdateHandler.ts b/src/utils/handlers/metadataUpdateHandler.ts index 5d375cb0c..e28b0c05a 100644 --- a/src/utils/handlers/metadataUpdateHandler.ts +++ b/src/utils/handlers/metadataUpdateHandler.ts @@ -1,5 +1,5 @@ import { FetchResult } from "@apollo/client"; -import { MetadataFormData } from "@saleor/components/Metadata/types"; +import { MetadataFormData } from "@dashboard/components/Metadata/types"; import { MetadataErrorFragment, MetadataInput, @@ -7,9 +7,9 @@ import { UpdateMetadataMutationVariables, UpdatePrivateMetadataMutation, UpdatePrivateMetadataMutationVariables, -} from "@saleor/graphql"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import { arrayDiff } from "@saleor/utils/arrays"; +} from "@dashboard/graphql"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import { arrayDiff } from "@dashboard/utils/arrays"; import { filterMetadataArray } from "./filterMetadataArray"; import { areMetadataArraysEqual } from "./metadataUpdateHelpers"; diff --git a/src/utils/handlers/multiAutocompleteSelectChangeHandler.ts b/src/utils/handlers/multiAutocompleteSelectChangeHandler.ts index cd7fec1ad..36bec8216 100644 --- a/src/utils/handlers/multiAutocompleteSelectChangeHandler.ts +++ b/src/utils/handlers/multiAutocompleteSelectChangeHandler.ts @@ -1,7 +1,7 @@ -import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField"; -import { ChangeEvent, FormChange } from "@saleor/hooks/useForm"; -import { combinedMultiAutocompleteChoices } from "@saleor/misc"; -import { toggle } from "@saleor/utils/lists"; +import { MultiAutocompleteChoiceType } from "@dashboard/components/MultiAutocompleteSelectField"; +import { ChangeEvent, FormChange } from "@dashboard/hooks/useForm"; +import { combinedMultiAutocompleteChoices } from "@dashboard/misc"; +import { toggle } from "@dashboard/utils/lists"; /** * @param change Use toggleValue callback delivered by form diff --git a/src/utils/handlers/nonNegativeValueChangeHandler.ts b/src/utils/handlers/nonNegativeValueChangeHandler.ts index 445a6a73d..cc227326a 100644 --- a/src/utils/handlers/nonNegativeValueChangeHandler.ts +++ b/src/utils/handlers/nonNegativeValueChangeHandler.ts @@ -1,4 +1,4 @@ -import { FormChange } from "@saleor/hooks/useForm"; +import { FormChange } from "@dashboard/hooks/useForm"; function createNonNegativeValueChangeHandler(change: FormChange) { return (event: React.ChangeEvent) => { diff --git a/src/utils/handlers/queryChangeHandler.ts b/src/utils/handlers/queryChangeHandler.ts index 972e288ff..62851dffd 100644 --- a/src/utils/handlers/queryChangeHandler.ts +++ b/src/utils/handlers/queryChangeHandler.ts @@ -1,4 +1,4 @@ -import { ChangeEvent } from "@saleor/hooks/useForm"; +import { ChangeEvent } from "@dashboard/hooks/useForm"; export function onQueryChange( event: ChangeEvent, diff --git a/src/utils/handlers/singleAutocompleteSelectChangeHandler.ts b/src/utils/handlers/singleAutocompleteSelectChangeHandler.ts index 15087906a..5ca5eb7e4 100644 --- a/src/utils/handlers/singleAutocompleteSelectChangeHandler.ts +++ b/src/utils/handlers/singleAutocompleteSelectChangeHandler.ts @@ -1,5 +1,5 @@ -import { SingleAutocompleteChoiceType } from "@saleor/components/SingleAutocompleteSelectField"; -import { FormChange } from "@saleor/hooks/useForm"; +import { SingleAutocompleteChoiceType } from "@dashboard/components/SingleAutocompleteSelectField"; +import { FormChange } from "@dashboard/hooks/useForm"; export interface SingleAutocompleteSelectedChangeHandlerProps { change: FormChange; diff --git a/src/utils/handlers/sortHandler.ts b/src/utils/handlers/sortHandler.ts index 4cc93ce0d..ed4d2118d 100644 --- a/src/utils/handlers/sortHandler.ts +++ b/src/utils/handlers/sortHandler.ts @@ -1,6 +1,6 @@ -import { DEFAULT_INITIAL_PAGINATION_DATA } from "@saleor/config"; -import { UseNavigatorResult } from "@saleor/hooks/useNavigator"; -import { Sort } from "@saleor/types"; +import { DEFAULT_INITIAL_PAGINATION_DATA } from "@dashboard/config"; +import { UseNavigatorResult } from "@dashboard/hooks/useNavigator"; +import { Sort } from "@dashboard/types"; import { getSortUrlVariables } from "../sort"; diff --git a/src/utils/limits.ts b/src/utils/limits.ts index de255f94c..68c65671f 100644 --- a/src/utils/limits.ts +++ b/src/utils/limits.ts @@ -1,4 +1,4 @@ -import { LimitInfoFragment, RefreshLimitsQuery } from "@saleor/graphql"; +import { LimitInfoFragment, RefreshLimitsQuery } from "@dashboard/graphql"; export function hasLimits( limits: RefreshLimitsQuery["shop"]["limits"], diff --git a/src/utils/maps.ts b/src/utils/maps.ts index 0a9d81bd9..bd76db268 100644 --- a/src/utils/maps.ts +++ b/src/utils/maps.ts @@ -1,17 +1,17 @@ -import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField"; +import { MultiAutocompleteChoiceType } from "@dashboard/components/MultiAutocompleteSelectField"; import { ChoiceValue, SingleAutocompleteChoiceType, -} from "@saleor/components/SingleAutocompleteSelectField"; +} from "@dashboard/components/SingleAutocompleteSelectField"; import { CountryFragment, CountryWithCodeFragment, MetadataInput, MetadataItemFragment, SearchPagesQuery, -} from "@saleor/graphql"; -import { getFullName } from "@saleor/misc"; -import { Node, RelayToFlat, SlugNode, TagNode } from "@saleor/types"; +} from "@dashboard/graphql"; +import { getFullName } from "@dashboard/misc"; +import { Node, RelayToFlat, SlugNode, TagNode } from "@dashboard/types"; interface Edge { node: T; diff --git a/src/utils/metadata/getMetadata.ts b/src/utils/metadata/getMetadata.ts index a64242da7..58c6c24e8 100644 --- a/src/utils/metadata/getMetadata.ts +++ b/src/utils/metadata/getMetadata.ts @@ -1,4 +1,4 @@ -import { MetadataFormData } from "@saleor/components/Metadata"; +import { MetadataFormData } from "@dashboard/components/Metadata"; function getMetadata( data: MetadataFormData, diff --git a/src/utils/metadata/useMetadataChangeTrigger.ts b/src/utils/metadata/useMetadataChangeTrigger.ts index 00f6a2361..1531e597a 100644 --- a/src/utils/metadata/useMetadataChangeTrigger.ts +++ b/src/utils/metadata/useMetadataChangeTrigger.ts @@ -1,4 +1,4 @@ -import { FormChange } from "@saleor/hooks/useForm"; +import { FormChange } from "@dashboard/hooks/useForm"; import { useState } from "react"; function useMetadataChangeTrigger() { diff --git a/src/utils/richText/useMultipleRichText.ts b/src/utils/richText/useMultipleRichText.ts index 1e158ade1..10740dd05 100644 --- a/src/utils/richText/useMultipleRichText.ts +++ b/src/utils/richText/useMultipleRichText.ts @@ -1,5 +1,5 @@ +import { EditorCore } from "@dashboard/components/RichTextEditor"; import { OutputData } from "@editorjs/editorjs"; -import { EditorCore } from "@saleor/components/RichTextEditor"; import { useCallback, useRef } from "react"; import useMap from "../objects/useMap"; diff --git a/src/utils/richText/useRichText.ts b/src/utils/richText/useRichText.ts index b859661c5..44abde192 100644 --- a/src/utils/richText/useRichText.ts +++ b/src/utils/richText/useRichText.ts @@ -1,5 +1,5 @@ +import { EditorCore } from "@dashboard/components/RichTextEditor"; import { OutputData } from "@editorjs/editorjs"; -import { EditorCore } from "@saleor/components/RichTextEditor"; import { useMemo, useRef, useState } from "react"; interface UseRichTextOptions { diff --git a/src/utils/sort.ts b/src/utils/sort.ts index 9e2e8e6f9..1cec2eade 100644 --- a/src/utils/sort.ts +++ b/src/utils/sort.ts @@ -1,5 +1,5 @@ -import { OrderDirection } from "@saleor/graphql"; -import { findValueInEnum, parseBoolean } from "@saleor/misc"; +import { OrderDirection } from "@dashboard/graphql"; +import { findValueInEnum, parseBoolean } from "@dashboard/misc"; import { TableCellHeaderArrowDirection } from "../components/TableCellHeader"; import { Sort } from "../types"; diff --git a/src/utils/urls.ts b/src/utils/urls.ts index d6c9dc966..43d6bd1d2 100644 --- a/src/utils/urls.ts +++ b/src/utils/urls.ts @@ -1,4 +1,4 @@ -import { getAppDefaultUri, getAppMountUri } from "@saleor/config"; +import { getAppDefaultUri, getAppMountUri } from "@dashboard/config"; import isArray from "lodash/isArray"; import { stringify } from "qs"; diff --git a/src/warehouses/components/WarehouseCreatePage/WarehouseCreatePage.stories.tsx b/src/warehouses/components/WarehouseCreatePage/WarehouseCreatePage.stories.tsx index fc2f5db69..c15c46f2e 100644 --- a/src/warehouses/components/WarehouseCreatePage/WarehouseCreatePage.stories.tsx +++ b/src/warehouses/components/WarehouseCreatePage/WarehouseCreatePage.stories.tsx @@ -1,6 +1,6 @@ -import { countries } from "@saleor/fixtures"; -import { WarehouseErrorCode } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; +import { countries } from "@dashboard/fixtures"; +import { WarehouseErrorCode } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/warehouses/components/WarehouseCreatePage/WarehouseCreatePage.tsx b/src/warehouses/components/WarehouseCreatePage/WarehouseCreatePage.tsx index 0bbc73213..4e92ed2a2 100644 --- a/src/warehouses/components/WarehouseCreatePage/WarehouseCreatePage.tsx +++ b/src/warehouses/components/WarehouseCreatePage/WarehouseCreatePage.tsx @@ -1,26 +1,26 @@ -import { createCountryHandler } from "@saleor/components/AddressEdit/createCountryHandler"; -import { Backlink } from "@saleor/components/Backlink"; -import CardSpacer from "@saleor/components/CardSpacer"; -import CompanyAddressInput from "@saleor/components/CompanyAddressInput"; -import Container from "@saleor/components/Container"; -import Form from "@saleor/components/Form"; -import Grid from "@saleor/components/Grid"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; -import { AddressTypeInput } from "@saleor/customers/types"; +import { createCountryHandler } from "@dashboard/components/AddressEdit/createCountryHandler"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import CompanyAddressInput from "@dashboard/components/CompanyAddressInput"; +import Container from "@dashboard/components/Container"; +import Form from "@dashboard/components/Form"; +import Grid from "@dashboard/components/Grid"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; +import { AddressTypeInput } from "@dashboard/customers/types"; import { CountryWithCodeFragment, WarehouseErrorFragment, -} from "@saleor/graphql"; -import useAddressValidation from "@saleor/hooks/useAddressValidation"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useStateFromProps from "@saleor/hooks/useStateFromProps"; -import { sectionNames } from "@saleor/intl"; +} from "@dashboard/graphql"; +import useAddressValidation from "@dashboard/hooks/useAddressValidation"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useStateFromProps from "@dashboard/hooks/useStateFromProps"; +import { sectionNames } from "@dashboard/intl"; +import createSingleAutocompleteSelectHandler from "@dashboard/utils/handlers/singleAutocompleteSelectChangeHandler"; +import { mapCountriesToChoices } from "@dashboard/utils/maps"; +import { warehouseListUrl } from "@dashboard/warehouses/urls"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import createSingleAutocompleteSelectHandler from "@saleor/utils/handlers/singleAutocompleteSelectChangeHandler"; -import { mapCountriesToChoices } from "@saleor/utils/maps"; -import { warehouseListUrl } from "@saleor/warehouses/urls"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/warehouses/components/WarehouseDeleteDialog/WarehouseDeleteDialog.tsx b/src/warehouses/components/WarehouseDeleteDialog/WarehouseDeleteDialog.tsx index 350bac54c..1e1daac8e 100644 --- a/src/warehouses/components/WarehouseDeleteDialog/WarehouseDeleteDialog.tsx +++ b/src/warehouses/components/WarehouseDeleteDialog/WarehouseDeleteDialog.tsx @@ -1,5 +1,5 @@ +import ActionDialog from "@dashboard/components/ActionDialog"; import { DialogContentText } from "@material-ui/core"; -import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/warehouses/components/WarehouseDetailsPage/WarehouseDetailsPage.stories.tsx b/src/warehouses/components/WarehouseDetailsPage/WarehouseDetailsPage.stories.tsx index 9f7683b42..f12e5f146 100644 --- a/src/warehouses/components/WarehouseDetailsPage/WarehouseDetailsPage.stories.tsx +++ b/src/warehouses/components/WarehouseDetailsPage/WarehouseDetailsPage.stories.tsx @@ -1,6 +1,6 @@ -import { countries } from "@saleor/fixtures"; -import { WarehouseErrorCode } from "@saleor/graphql"; -import Decorator from "@saleor/storybook/Decorator"; +import { countries } from "@dashboard/fixtures"; +import { WarehouseErrorCode } from "@dashboard/graphql"; +import Decorator from "@dashboard/storybook/Decorator"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/warehouses/components/WarehouseDetailsPage/WarehouseDetailsPage.tsx b/src/warehouses/components/WarehouseDetailsPage/WarehouseDetailsPage.tsx index 536123ef5..3880c4f28 100644 --- a/src/warehouses/components/WarehouseDetailsPage/WarehouseDetailsPage.tsx +++ b/src/warehouses/components/WarehouseDetailsPage/WarehouseDetailsPage.tsx @@ -1,30 +1,30 @@ -import { createCountryHandler } from "@saleor/components/AddressEdit/createCountryHandler"; -import { Backlink } from "@saleor/components/Backlink"; -import CardSpacer from "@saleor/components/CardSpacer"; -import CompanyAddressInput from "@saleor/components/CompanyAddressInput"; -import Container from "@saleor/components/Container"; -import Form from "@saleor/components/Form"; -import Grid from "@saleor/components/Grid"; -import PageHeader from "@saleor/components/PageHeader"; -import Savebar from "@saleor/components/Savebar"; -import { AddressTypeInput } from "@saleor/customers/types"; +import { createCountryHandler } from "@dashboard/components/AddressEdit/createCountryHandler"; +import { Backlink } from "@dashboard/components/Backlink"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import CompanyAddressInput from "@dashboard/components/CompanyAddressInput"; +import Container from "@dashboard/components/Container"; +import Form from "@dashboard/components/Form"; +import Grid from "@dashboard/components/Grid"; +import PageHeader from "@dashboard/components/PageHeader"; +import Savebar from "@dashboard/components/Savebar"; +import { AddressTypeInput } from "@dashboard/customers/types"; import { CountryCode, CountryWithCodeFragment, WarehouseClickAndCollectOptionEnum, WarehouseDetailsFragment, WarehouseErrorFragment, -} from "@saleor/graphql"; -import useAddressValidation from "@saleor/hooks/useAddressValidation"; -import { SubmitPromise } from "@saleor/hooks/useForm"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useStateFromProps from "@saleor/hooks/useStateFromProps"; -import { sectionNames } from "@saleor/intl"; +} from "@dashboard/graphql"; +import useAddressValidation from "@dashboard/hooks/useAddressValidation"; +import { SubmitPromise } from "@dashboard/hooks/useForm"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useStateFromProps from "@dashboard/hooks/useStateFromProps"; +import { sectionNames } from "@dashboard/intl"; +import { findValueInEnum, maybe } from "@dashboard/misc"; +import createSingleAutocompleteSelectHandler from "@dashboard/utils/handlers/singleAutocompleteSelectChangeHandler"; +import { mapCountriesToChoices, mapEdgesToItems } from "@dashboard/utils/maps"; +import { warehouseListUrl } from "@dashboard/warehouses/urls"; import { ConfirmButtonTransitionState } from "@saleor/macaw-ui"; -import { findValueInEnum, maybe } from "@saleor/misc"; -import createSingleAutocompleteSelectHandler from "@saleor/utils/handlers/singleAutocompleteSelectChangeHandler"; -import { mapCountriesToChoices, mapEdgesToItems } from "@saleor/utils/maps"; -import { warehouseListUrl } from "@saleor/warehouses/urls"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/warehouses/components/WarehouseInfo/WarehouseInfo.tsx b/src/warehouses/components/WarehouseInfo/WarehouseInfo.tsx index 753da2287..681420369 100644 --- a/src/warehouses/components/WarehouseInfo/WarehouseInfo.tsx +++ b/src/warehouses/components/WarehouseInfo/WarehouseInfo.tsx @@ -1,10 +1,10 @@ +import CardTitle from "@dashboard/components/CardTitle"; +import { WarehouseErrorFragment } from "@dashboard/graphql"; +import { FormChange } from "@dashboard/hooks/useForm"; +import { commonMessages } from "@dashboard/intl"; +import { getFormErrors } from "@dashboard/utils/errors"; +import getWarehouseErrorMessage from "@dashboard/utils/errors/warehouse"; import { Card, CardContent, TextField } from "@material-ui/core"; -import CardTitle from "@saleor/components/CardTitle"; -import { WarehouseErrorFragment } from "@saleor/graphql"; -import { FormChange } from "@saleor/hooks/useForm"; -import { commonMessages } from "@saleor/intl"; -import { getFormErrors } from "@saleor/utils/errors"; -import getWarehouseErrorMessage from "@saleor/utils/errors/warehouse"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/warehouses/components/WarehouseList/WarehouseList.tsx b/src/warehouses/components/WarehouseList/WarehouseList.tsx index 19eec50e8..cd7a1d2f3 100644 --- a/src/warehouses/components/WarehouseList/WarehouseList.tsx +++ b/src/warehouses/components/WarehouseList/WarehouseList.tsx @@ -1,3 +1,18 @@ +import ResponsiveTable from "@dashboard/components/ResponsiveTable"; +import Skeleton from "@dashboard/components/Skeleton"; +import { TableButtonWrapper } from "@dashboard/components/TableButtonWrapper/TableButtonWrapper"; +import TableCellHeader from "@dashboard/components/TableCellHeader"; +import { TablePaginationWithContext } from "@dashboard/components/TablePagination"; +import TableRowLink from "@dashboard/components/TableRowLink"; +import { WarehouseWithShippingFragment } from "@dashboard/graphql"; +import { maybe, renderCollection, stopPropagation } from "@dashboard/misc"; +import { ListProps, SortPage } from "@dashboard/types"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; +import { getArrowDirection } from "@dashboard/utils/sort"; +import { + WarehouseListUrlSortField, + warehouseUrl, +} from "@dashboard/warehouses/urls"; import { TableBody, TableCell, @@ -5,22 +20,7 @@ import { TableHead, } from "@material-ui/core"; import EditIcon from "@material-ui/icons/Edit"; -import ResponsiveTable from "@saleor/components/ResponsiveTable"; -import Skeleton from "@saleor/components/Skeleton"; -import { TableButtonWrapper } from "@saleor/components/TableButtonWrapper/TableButtonWrapper"; -import TableCellHeader from "@saleor/components/TableCellHeader"; -import { TablePaginationWithContext } from "@saleor/components/TablePagination"; -import TableRowLink from "@saleor/components/TableRowLink"; -import { WarehouseWithShippingFragment } from "@saleor/graphql"; import { DeleteIcon, IconButton, makeStyles } from "@saleor/macaw-ui"; -import { maybe, renderCollection, stopPropagation } from "@saleor/misc"; -import { ListProps, SortPage } from "@saleor/types"; -import { mapEdgesToItems } from "@saleor/utils/maps"; -import { getArrowDirection } from "@saleor/utils/sort"; -import { - WarehouseListUrlSortField, - warehouseUrl, -} from "@saleor/warehouses/urls"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/warehouses/components/WarehouseListPage/WarehouseListPage.stories.tsx b/src/warehouses/components/WarehouseListPage/WarehouseListPage.stories.tsx index 2c92d1a97..0204851d5 100644 --- a/src/warehouses/components/WarehouseListPage/WarehouseListPage.stories.tsx +++ b/src/warehouses/components/WarehouseListPage/WarehouseListPage.stories.tsx @@ -5,10 +5,10 @@ import { searchPageProps, sortPageProps, tabPageProps, -} from "@saleor/fixtures"; -import Decorator from "@saleor/storybook/Decorator"; -import { PaginatorContextDecorator } from "@saleor/storybook/PaginatorContextDecorator"; -import { WarehouseListUrlSortField } from "@saleor/warehouses/urls"; +} from "@dashboard/fixtures"; +import Decorator from "@dashboard/storybook/Decorator"; +import { PaginatorContextDecorator } from "@dashboard/storybook/PaginatorContextDecorator"; +import { WarehouseListUrlSortField } from "@dashboard/warehouses/urls"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/warehouses/components/WarehouseListPage/WarehouseListPage.tsx b/src/warehouses/components/WarehouseListPage/WarehouseListPage.tsx index d444d16e9..1ee34223b 100644 --- a/src/warehouses/components/WarehouseListPage/WarehouseListPage.tsx +++ b/src/warehouses/components/WarehouseListPage/WarehouseListPage.tsx @@ -1,27 +1,27 @@ -import { Card } from "@material-ui/core"; -import { Backlink } from "@saleor/components/Backlink"; -import { Button } from "@saleor/components/Button"; -import Container from "@saleor/components/Container"; -import LimitReachedAlert from "@saleor/components/LimitReachedAlert"; -import PageHeader from "@saleor/components/PageHeader"; -import SearchBar from "@saleor/components/SearchBar"; -import { configurationMenuUrl } from "@saleor/configuration"; +import { Backlink } from "@dashboard/components/Backlink"; +import { Button } from "@dashboard/components/Button"; +import Container from "@dashboard/components/Container"; +import LimitReachedAlert from "@dashboard/components/LimitReachedAlert"; +import PageHeader from "@dashboard/components/PageHeader"; +import SearchBar from "@dashboard/components/SearchBar"; +import { configurationMenuUrl } from "@dashboard/configuration"; import { RefreshLimitsQuery, WarehouseWithShippingFragment, -} from "@saleor/graphql"; -import { sectionNames } from "@saleor/intl"; +} from "@dashboard/graphql"; +import { sectionNames } from "@dashboard/intl"; import { PageListProps, SearchPageProps, SortPage, TabPageProps, -} from "@saleor/types"; -import { hasLimits, isLimitReached } from "@saleor/utils/limits"; +} from "@dashboard/types"; +import { hasLimits, isLimitReached } from "@dashboard/utils/limits"; import { warehouseAddUrl, WarehouseListUrlSortField, -} from "@saleor/warehouses/urls"; +} from "@dashboard/warehouses/urls"; +import { Card } from "@material-ui/core"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/warehouses/components/WarehouseSettings/WarehouseSettings.tsx b/src/warehouses/components/WarehouseSettings/WarehouseSettings.tsx index d238db232..b15cea2d3 100644 --- a/src/warehouses/components/WarehouseSettings/WarehouseSettings.tsx +++ b/src/warehouses/components/WarehouseSettings/WarehouseSettings.tsx @@ -1,19 +1,19 @@ -import { Card, CardContent, Divider, Typography } from "@material-ui/core"; -import CardSpacer from "@saleor/components/CardSpacer"; -import CardTitle from "@saleor/components/CardTitle"; -import { FormSpacer } from "@saleor/components/FormSpacer"; -import Link from "@saleor/components/Link"; -import PreviewPill from "@saleor/components/PreviewPill"; -import { RadioGroupField } from "@saleor/components/RadioGroupField"; -import Skeleton from "@saleor/components/Skeleton"; +import CardSpacer from "@dashboard/components/CardSpacer"; +import CardTitle from "@dashboard/components/CardTitle"; +import { FormSpacer } from "@dashboard/components/FormSpacer"; +import Link from "@dashboard/components/Link"; +import PreviewPill from "@dashboard/components/PreviewPill"; +import { RadioGroupField } from "@dashboard/components/RadioGroupField"; +import Skeleton from "@dashboard/components/Skeleton"; import { WarehouseClickAndCollectOptionEnum, WarehouseWithShippingFragment, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; +import { renderCollection } from "@dashboard/misc"; +import { shippingZoneUrl } from "@dashboard/shipping/urls"; +import { RelayToFlat } from "@dashboard/types"; +import { Card, CardContent, Divider, Typography } from "@material-ui/core"; import { makeStyles } from "@saleor/macaw-ui"; -import { renderCollection } from "@saleor/misc"; -import { shippingZoneUrl } from "@saleor/shipping/urls"; -import { RelayToFlat } from "@saleor/types"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/warehouses/fixtures.ts b/src/warehouses/fixtures.ts index 1d0f90414..1caf1b96a 100644 --- a/src/warehouses/fixtures.ts +++ b/src/warehouses/fixtures.ts @@ -1,9 +1,9 @@ -import { address } from "@saleor/fixtures"; +import { address } from "@dashboard/fixtures"; import { WarehouseClickAndCollectOptionEnum, WarehouseDetailsFragment, WarehouseWithShippingFragment, -} from "@saleor/graphql"; +} from "@dashboard/graphql"; import { shippingZones } from "../shipping/fixtures"; diff --git a/src/warehouses/index.tsx b/src/warehouses/index.tsx index d1fa1c663..204a5b34b 100644 --- a/src/warehouses/index.tsx +++ b/src/warehouses/index.tsx @@ -1,5 +1,5 @@ -import { sectionNames } from "@saleor/intl"; -import { asSortParams } from "@saleor/utils/sort"; +import { sectionNames } from "@dashboard/intl"; +import { asSortParams } from "@dashboard/utils/sort"; import { parse as parseQs } from "qs"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/warehouses/urls.ts b/src/warehouses/urls.ts index 9d1aa7641..4a3bf489c 100644 --- a/src/warehouses/urls.ts +++ b/src/warehouses/urls.ts @@ -1,4 +1,4 @@ -import { stringifyQs } from "@saleor/utils/urls"; +import { stringifyQs } from "@dashboard/utils/urls"; import urlJoin from "url-join"; import { diff --git a/src/warehouses/views/WarehouseCreate/WarehouseCreate.tsx b/src/warehouses/views/WarehouseCreate/WarehouseCreate.tsx index bc9658ad1..6693712de 100644 --- a/src/warehouses/views/WarehouseCreate/WarehouseCreate.tsx +++ b/src/warehouses/views/WarehouseCreate/WarehouseCreate.tsx @@ -1,18 +1,18 @@ -import { WindowTitle } from "@saleor/components/WindowTitle"; -import { CountryCode, useWarehouseCreateMutation } from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import useShop from "@saleor/hooks/useShop"; -import { commonMessages } from "@saleor/intl"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; +import { CountryCode, useWarehouseCreateMutation } from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import useShop from "@dashboard/hooks/useShop"; +import { commonMessages } from "@dashboard/intl"; import { extractMutationErrors, findValueInEnum, getMutationStatus, -} from "@saleor/misc"; +} from "@dashboard/misc"; import WarehouseCreatePage, { WarehouseCreatePageFormData, -} from "@saleor/warehouses/components/WarehouseCreatePage"; -import { warehouseUrl } from "@saleor/warehouses/urls"; +} from "@dashboard/warehouses/components/WarehouseCreatePage"; +import { warehouseUrl } from "@dashboard/warehouses/urls"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/warehouses/views/WarehouseDetails/WarehouseDetails.tsx b/src/warehouses/views/WarehouseDetails/WarehouseDetails.tsx index d64e88f0f..03dafa5e6 100644 --- a/src/warehouses/views/WarehouseDetails/WarehouseDetails.tsx +++ b/src/warehouses/views/WarehouseDetails/WarehouseDetails.tsx @@ -1,31 +1,31 @@ -import NotFoundPage from "@saleor/components/NotFoundPage"; -import { WindowTitle } from "@saleor/components/WindowTitle"; +import NotFoundPage from "@dashboard/components/NotFoundPage"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; import { CountryCode, useWarehouseDeleteMutation, useWarehouseDetailsQuery, useWarehouseUpdateMutation, -} from "@saleor/graphql"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import useShop from "@saleor/hooks/useShop"; -import { commonMessages } from "@saleor/intl"; +} from "@dashboard/graphql"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import useShop from "@dashboard/hooks/useShop"; +import { commonMessages } from "@dashboard/intl"; import { extractMutationErrors, findValueInEnum, getMutationStatus, getStringOrPlaceholder, -} from "@saleor/misc"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import WarehouseDeleteDialog from "@saleor/warehouses/components/WarehouseDeleteDialog"; +} from "@dashboard/misc"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import WarehouseDeleteDialog from "@dashboard/warehouses/components/WarehouseDeleteDialog"; import WarehouseDetailsPage, { WarehouseDetailsPageFormData, -} from "@saleor/warehouses/components/WarehouseDetailsPage"; +} from "@dashboard/warehouses/components/WarehouseDetailsPage"; import { warehouseListUrl, warehouseUrl, WarehouseUrlQueryParams, -} from "@saleor/warehouses/urls"; +} from "@dashboard/warehouses/urls"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/warehouses/views/WarehouseList/WarehouseList.tsx b/src/warehouses/views/WarehouseList/WarehouseList.tsx index 5f8c3c1fc..a3526a047 100644 --- a/src/warehouses/views/WarehouseList/WarehouseList.tsx +++ b/src/warehouses/views/WarehouseList/WarehouseList.tsx @@ -1,36 +1,36 @@ -import DeleteFilterTabDialog from "@saleor/components/DeleteFilterTabDialog"; +import DeleteFilterTabDialog from "@dashboard/components/DeleteFilterTabDialog"; import SaveFilterTabDialog, { SaveFilterTabDialogFormData, -} from "@saleor/components/SaveFilterTabDialog"; -import { useShopLimitsQuery } from "@saleor/components/Shop/queries"; -import { WindowTitle } from "@saleor/components/WindowTitle"; +} from "@dashboard/components/SaveFilterTabDialog"; +import { useShopLimitsQuery } from "@dashboard/components/Shop/queries"; +import { WindowTitle } from "@dashboard/components/WindowTitle"; import { useWarehouseDeleteMutation, useWarehouseListQuery, -} from "@saleor/graphql"; -import useListSettings from "@saleor/hooks/useListSettings"; -import useNavigator from "@saleor/hooks/useNavigator"; -import useNotifier from "@saleor/hooks/useNotifier"; -import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; +} from "@dashboard/graphql"; +import useListSettings from "@dashboard/hooks/useListSettings"; +import useNavigator from "@dashboard/hooks/useNavigator"; +import useNotifier from "@dashboard/hooks/useNotifier"; +import { usePaginationReset } from "@dashboard/hooks/usePaginationReset"; import usePaginator, { createPaginationState, PaginatorContext, -} from "@saleor/hooks/usePaginator"; -import { commonMessages, sectionNames } from "@saleor/intl"; -import { getById, getMutationStatus, maybe } from "@saleor/misc"; -import { ListViews } from "@saleor/types"; -import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers"; -import createFilterHandlers from "@saleor/utils/handlers/filterHandlers"; -import createSortHandler from "@saleor/utils/handlers/sortHandler"; -import { mapEdgesToItems } from "@saleor/utils/maps"; -import { getSortParams } from "@saleor/utils/sort"; -import WarehouseDeleteDialog from "@saleor/warehouses/components/WarehouseDeleteDialog"; -import WarehouseListPage from "@saleor/warehouses/components/WarehouseListPage"; +} from "@dashboard/hooks/usePaginator"; +import { commonMessages, sectionNames } from "@dashboard/intl"; +import { getById, getMutationStatus, maybe } from "@dashboard/misc"; +import { ListViews } from "@dashboard/types"; +import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers"; +import createFilterHandlers from "@dashboard/utils/handlers/filterHandlers"; +import createSortHandler from "@dashboard/utils/handlers/sortHandler"; +import { mapEdgesToItems } from "@dashboard/utils/maps"; +import { getSortParams } from "@dashboard/utils/sort"; +import WarehouseDeleteDialog from "@dashboard/warehouses/components/WarehouseDeleteDialog"; +import WarehouseListPage from "@dashboard/warehouses/components/WarehouseListPage"; import { warehouseListUrl, WarehouseListUrlDialog, WarehouseListUrlQueryParams, -} from "@saleor/warehouses/urls"; +} from "@dashboard/warehouses/urls"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/warehouses/views/WarehouseList/filters.ts b/src/warehouses/views/WarehouseList/filters.ts index 75e5acc1b..18f07d713 100644 --- a/src/warehouses/views/WarehouseList/filters.ts +++ b/src/warehouses/views/WarehouseList/filters.ts @@ -1,4 +1,4 @@ -import { WarehouseFilterInput } from "@saleor/graphql"; +import { WarehouseFilterInput } from "@dashboard/graphql"; import { createFilterTabUtils, diff --git a/src/warehouses/views/WarehouseList/sort.ts b/src/warehouses/views/WarehouseList/sort.ts index 8b95f2051..f8de431d7 100644 --- a/src/warehouses/views/WarehouseList/sort.ts +++ b/src/warehouses/views/WarehouseList/sort.ts @@ -1,6 +1,6 @@ -import { WarehouseSortField } from "@saleor/graphql"; -import { createGetSortQueryVariables } from "@saleor/utils/sort"; -import { WarehouseListUrlSortField } from "@saleor/warehouses/urls"; +import { WarehouseSortField } from "@dashboard/graphql"; +import { createGetSortQueryVariables } from "@dashboard/utils/sort"; +import { WarehouseListUrlSortField } from "@dashboard/warehouses/urls"; export function getSortQueryField( sort: WarehouseListUrlSortField, diff --git a/testUtils/api.ts b/testUtils/api.ts index d8408b220..eae1461d5 100644 --- a/testUtils/api.ts +++ b/testUtils/api.ts @@ -1,9 +1,9 @@ import { ApolloClient, InMemoryCache } from "@apollo/client"; import { BatchHttpLink } from "@apollo/client/link/batch-http"; +import { getApiUrl } from "@dashboard/config"; import NodeHttpAdapter from "@pollyjs/adapter-node-http"; import { Polly } from "@pollyjs/core"; import FSPersister from "@pollyjs/persister-fs"; -import { getApiUrl } from "@saleor/config"; import { createFetch } from "@saleor/sdk"; import path from "path"; import { setupPolly } from "setup-polly-jest"; diff --git a/testUtils/filters.ts b/testUtils/filters.ts index 48c6679a6..d407fae69 100644 --- a/testUtils/filters.ts +++ b/testUtils/filters.ts @@ -1,4 +1,4 @@ -import { IFilter } from "@saleor/components/Filter"; +import { IFilter } from "@dashboard/components/Filter"; import clone from "lodash/clone"; export function getExistingKeys(o: {}): string[] { @@ -7,7 +7,7 @@ export function getExistingKeys(o: {}): string[] { export function setFilterOptsStatus( opts: IFilter, - status: boolean + status: boolean, ): IFilter { const newOpts = clone(opts); for (const optName in opts) { diff --git a/testUtils/mocks/address.ts b/testUtils/mocks/address.ts index fd5e5e9b7..358d4237b 100644 --- a/testUtils/mocks/address.ts +++ b/testUtils/mocks/address.ts @@ -1,5 +1,5 @@ import { MockedResponse } from "@apollo/client/testing"; -import { addressValidationQuery } from "@saleor/components/AddressEdit/queries"; +import { addressValidationQuery } from "@dashboard/components/AddressEdit/queries"; export const addressMocks: MockedResponse[] = [ { diff --git a/testUtils/mocks/apps.ts b/testUtils/mocks/apps.ts index d97acef99..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 "@saleor/apps/queries"; +import { extensionList } from "@dashboard/apps/queries"; export const appsMocks: MockedResponse[] = [ { diff --git a/testUtils/mocks/pageTypes.ts b/testUtils/mocks/pageTypes.ts index 2423c60c1..057bec58d 100644 --- a/testUtils/mocks/pageTypes.ts +++ b/testUtils/mocks/pageTypes.ts @@ -1,5 +1,5 @@ import { MockedResponse } from "@apollo/client/testing"; -import { SearchPageTypesDocument } from "@saleor/graphql"; +import { SearchPageTypesDocument } from "@dashboard/graphql"; export const pageTypesMocks: MockedResponse[] = [ { diff --git a/testUtils/mocks/warehouses.ts b/testUtils/mocks/warehouses.ts index 93d84982b..ddb6364bf 100644 --- a/testUtils/mocks/warehouses.ts +++ b/testUtils/mocks/warehouses.ts @@ -1,5 +1,5 @@ import { MockedResponse } from "@apollo/client/testing"; -import { SearchWarehousesDocument } from "@saleor/graphql"; +import { SearchWarehousesDocument } from "@dashboard/graphql"; export const warehousesMocks: MockedResponse[] = [ { diff --git a/testUtils/wrapper.tsx b/testUtils/wrapper.tsx index f6a364573..fe218e92c 100644 --- a/testUtils/wrapper.tsx +++ b/testUtils/wrapper.tsx @@ -1,7 +1,7 @@ -import { ExternalAppProvider } from "@saleor/apps/components/ExternalAppContext"; -import { Provider as DateProvider } from "@saleor/components/Date/DateContext"; -import { Locale, RawLocaleProvider } from "@saleor/components/Locale"; -import { TimezoneProvider } from "@saleor/components/Timezone"; +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 { ThemeProvider } from "@saleor/macaw-ui"; import React from "react"; import { IntlProvider } from "react-intl"; diff --git a/tsconfig.json b/tsconfig.json index 6bee63da1..6eaba60c5 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -19,7 +19,7 @@ "paths": { "@assets/*": ["assets/*"], "@locale/*": ["locale/*"], - "@saleor/*": ["src/*"], + "@dashboard/*": ["src/*"], "@test/*": ["testUtils/*"] }, "resolveJsonModule": true diff --git a/vite.config.js b/vite.config.js index 9949970a4..43ce3e47a 100644 --- a/vite.config.js +++ b/vite.config.js @@ -159,24 +159,10 @@ export default defineConfig(({ command, mode }) => { }, resolve: { alias: { - /* - Aliases from tsconfig, we need to preserve them. - Since @saleor points to "src", we need to add aliases for macaw and sdk as first. - */ - "@saleor/macaw-ui": path.resolve( - __dirname, - "node_modules/@saleor/macaw-ui", - ), - "@saleor/app-sdk": path.resolve( - __dirname, - "node_modules/@saleor/app-sdk", - ), - "@saleor/sdk": path.resolve(__dirname, "node_modules/@saleor/sdk"), - "@saleor": path.resolve(__dirname, "./src"), "@assets": path.resolve(__dirname, "./assets"), "@locale": path.resolve(__dirname, "./locale"), + "@dashboard": path.resolve(__dirname, "./src"), src: path.resolve(__dirname, "./src"), - /* Moment.js/react-moment does not fully suport ES modules. Vite resolves it by using jsnext:main https://github.com/moment/moment/blob/develop/package.json#L26.