From 9fc9edfba1f15496e5e00153727f04da948bc3f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20=C5=BBuraw?= <9116238+krzysztofzuraw@users.noreply.github.com> Date: Mon, 13 Jan 2025 10:45:14 +0100 Subject: [PATCH] Run autofix for monorepo (#1681) --- .changeset/silver-mangos-behave.md | 19 ++++++++++++ .../src/modules/app/metadata-manager.test.ts | 5 ++-- apps/cms-v2/scripts/deploy.ts | 3 +- .../bulk-sync/use-bulk-sync-products-state.ts | 1 + .../bulk-sync/use-fetch-all-products.tsx | 2 +- .../channels-provider-connection-list.tsx | 1 + .../app-config-metadata-manager.ts | 5 ++-- .../modules/configuration/app-config.test.ts | 3 +- .../cms-v2/src/modules/configuration/index.ts | 6 ++-- .../schemas/builder-provider.schema.ts | 4 ++- .../channel-provider-connection.schema.ts | 3 +- .../schemas/contentful-provider.schema.ts | 1 + .../schemas/datocms-provider.schema.ts | 4 ++- .../schemas/payloadcms-provider.schema.ts | 4 ++- .../schemas/root-config.schema.ts | 5 ++-- .../schemas/strapi-provider.schema.ts | 4 ++- .../src/modules/graphql/GraphQLProvider.tsx | 3 +- .../providers-list.router.ts | 8 ++--- .../builder-io-webhooks-processor.ts | 1 + .../providers/builder.io/builder-io.client.ts | 3 +- .../providers/builder.io/builder-io.tsx | 4 +-- .../contentful-bulk-sync-processor.ts | 3 +- .../contentful/contentful-client.test.ts | 6 ++-- .../contentful-webhooks-processor.test.ts | 8 +++-- .../contentful-webhooks-processor.ts | 1 + .../providers/contentful/contentful.router.ts | 6 ++-- .../providers/contentful/contentful.tsx | 2 +- .../datocms/datocms-bulk-sync-processor.ts | 2 +- .../providers/datocms/datocms-client.ts | 9 +++--- .../datocms/datocms-webhooks-processor.ts | 4 +-- .../providers/datocms/datocms.router.ts | 5 ++-- .../modules/providers/fields-mapper.test.ts | 3 +- .../providers/payloadcms/payloadcms-client.ts | 8 ++--- .../payloadcms-webhooks-processor.ts | 6 ++-- .../providers/payloadcms/payloadcms.tsx | 2 +- .../modules/providers/providers-resolver.tsx | 28 +++++++++--------- .../modules/providers/strapi/strapi-client.ts | 6 ++-- .../strapi/strapi-webhooks-processor.ts | 1 + .../src/modules/providers/strapi/strapi.tsx | 2 +- .../src/modules/shared/generate-id.test.ts | 3 +- .../create-instrumented-graphql-client.ts | 2 +- .../src/modules/trpc/trpc-app-router.ts | 2 +- apps/cms-v2/src/modules/trpc/trpc-client.ts | 2 +- apps/cms-v2/src/modules/trpc/trpc-context.ts | 6 ++-- apps/cms-v2/src/modules/trpc/trpc-server.ts | 5 ++-- .../create-webhook-config-context.ts | 4 ++- .../webhooks-processors-delegator.test.ts | 7 +++-- .../webhooks-processors-delegator.ts | 1 + apps/cms-v2/src/pages/_app.tsx | 10 ++++--- apps/cms-v2/src/pages/_document.tsx | 2 +- apps/cms-v2/src/pages/add-provider/[type].tsx | 8 ++--- apps/cms-v2/src/pages/api/manifest.ts | 6 ++-- apps/cms-v2/src/pages/api/register.ts | 6 ++-- apps/cms-v2/src/pages/api/trpc/[trpc].ts | 10 ++++--- .../src/pages/api/webhooks/product-updated.ts | 18 ++++++------ .../api/webhooks/product-variant-created.ts | 21 ++++++-------- .../api/webhooks/product-variant-deleted.ts | 19 ++++++------ .../api/webhooks/product-variant-updated.ts | 18 ++++++------ .../src/pages/bulk-sync/[connection-id].tsx | 5 ++-- apps/cms-v2/src/pages/configuration.tsx | 9 +++--- .../src/pages/edit-provider/[configId].tsx | 8 ++--- apps/cms-v2/src/pages/index.tsx | 6 ++-- apps/cms-v2/vitest.config.ts | 1 - apps/klaviyo/scripts/deploy.ts | 3 +- apps/klaviyo/src/pages/_app.tsx | 3 +- apps/klaviyo/src/pages/api/manifest.ts | 2 +- .../pages/api/webhooks/customer-created.ts | 4 +-- .../pages/api/webhooks/fulfillment-created.ts | 4 +-- .../src/pages/api/webhooks/order-created.ts | 4 +-- .../pages/api/webhooks/order-fully-paid.ts | 4 +-- apps/klaviyo/src/pages/index.tsx | 6 ++-- apps/products-feed/scripts/deploy.ts | 3 +- .../run-webhooks-migration-dry-run.ts | 1 + .../migrations/run-webhooks-migration.ts | 1 + .../lib/create-instrumented-graphql-client.ts | 2 +- .../products-feed/src/lib/metadata-manager.ts | 1 + .../app-configuration/app-config.test.ts | 1 + .../modules/app-configuration/app-config.ts | 1 + .../app-configuration/attribute-fetcher.ts | 1 + .../attribute-mapping-form.tsx | 15 +++++----- .../channels/channels-fetcher.ts | 1 + .../channels/channels.router.ts | 6 ++-- .../use-channels-existence-checking.ts | 3 +- .../s3-configuration-form.tsx | 15 +++++----- .../categories-fetcher.test.ts | 1 + .../category-mapping/categories-fetcher.ts | 1 + .../ui/category-mapping-form.tsx | 14 ++++----- .../category-mapping/ui/category-mapping.tsx | 6 ++-- .../feed-url/use-get-feed-api-url.test.tsx | 5 ++-- .../s3/create-s3-client-from-configuration.ts | 1 + .../modules/file-storage/s3/upload-file.ts | 3 +- .../file-storage/s3/upload-multi-part.ts | 5 ++-- .../file-storage/s3/upload-single-part.ts | 1 + .../modules/google-feed/fetch-shop-data.ts | 1 + .../get-google-feed-settings.test.ts | 3 +- .../google-feed/get-google-feed-settings.ts | 7 +++-- .../google-feed/get-related-media.test.ts | 3 +- .../get-weight-attribute-value.test.ts | 3 +- .../modules/google-feed/price-mapping.test.ts | 1 + .../product-processing-limit.test.ts | 1 + .../google-feed/product-to-proxy.test.ts | 3 +- .../google-feed/shop-details-to-proxy.test.ts | 1 + .../render-handlebars-template.test.ts | 1 + .../render-handlebars-template.ts | 1 + .../transform-template-format.test.ts | 1 + .../trpc/protected-client-procedure.ts | 15 +++++----- .../src/modules/trpc/trpc-app-router.ts | 4 +-- .../src/modules/trpc/trpc-client.ts | 2 +- .../src/modules/trpc/trpc-context.ts | 2 +- .../src/modules/trpc/trpc-server.ts | 3 +- apps/products-feed/src/pages/_app.tsx | 12 ++++---- apps/products-feed/src/pages/api/register.ts | 6 ++-- .../src/pages/api/trpc/[trpc].ts | 13 +++++---- apps/products-feed/src/pages/categories.tsx | 2 +- apps/products-feed/src/pages/not-ready.tsx | 2 +- apps/search/scripts/deploy.ts | 3 +- .../WebhookActivityToggler.service.test.ts | 1 + .../algolia/algolia-credentials-verifier.ts | 1 + .../src/lib/algolia/algoliaUtils.test.ts | 3 +- apps/search/src/lib/algolia/algoliaUtils.ts | 3 +- .../lib/algolia/getAlgoliaConfiguration.ts | 5 ++-- .../metadata-to-algolia-attribute.test.ts | 1 + .../lib/create-instrumented-graphql-client.ts | 2 +- apps/search/src/lib/useIndicesSetup.tsx | 4 +-- apps/search/src/lib/useWebhooksStatus.tsx | 3 +- apps/search/src/lib/useWebhooksUpdate.tsx | 4 +-- .../app-config-metadata-manager.ts | 6 ++-- .../configuration/configuration.router.ts | 5 ++-- .../modules/configuration/configuration.ts | 1 + .../configuration/legacy-configuration.ts | 1 + apps/search/src/modules/trpc/trpc-client.ts | 5 ++-- apps/search/src/modules/trpc/trpc-context.ts | 2 +- apps/search/src/modules/trpc/trpc-server.ts | 5 ++-- apps/search/src/pages/_app.tsx | 10 ++++--- apps/search/src/pages/api/manifest.ts | 4 +-- apps/search/src/pages/api/register.ts | 5 ++-- apps/search/src/pages/api/trpc/[trpc].ts | 9 +++--- apps/search/src/pages/index.tsx | 3 +- .../handlers/webhooks-status-handler.test.ts | 10 ++++--- .../webhooks/definitions/product-created.ts | 1 + .../webhooks/definitions/product-deleted.ts | 1 + .../webhooks/definitions/product-updated.ts | 1 + .../product-variant-back-in-stock.ts | 1 + .../definitions/product-variant-created.ts | 1 + .../definitions/product-variant-deleted.ts | 1 + .../product-variant-out-of-stock.ts | 1 + .../definitions/product-variant-updated.ts | 1 + apps/search/src/webhooks/webhook-context.ts | 3 +- apps/smtp/scripts/deploy.ts | 3 +- .../manage-permissions-text-link.tsx | 5 ++-- .../lib/create-instrumented-graphql-client.ts | 2 +- apps/smtp/src/lib/fetch-app-permissions.ts | 1 + .../src/lib/get-event-form-status.test.ts | 3 +- apps/smtp/src/lib/metadata-manager.ts | 1 + apps/smtp/src/lib/set-backend-errors.ts | 3 +- .../app-configuration.router.ts | 4 +-- .../filter-configurations.test.ts | 1 + .../src/modules/channels/channels-fetcher.ts | 1 + .../src/modules/channels/channels.router.ts | 6 ++-- .../channels/is-available-in-channel.test.ts | 1 + .../event-handlers/default-payloads.ts | 2 +- .../send-event-messages.use-case.factory.ts | 15 +++++----- .../send-event-messages.use-case.test.ts | 13 +++++---- .../feature-flag-service.test.ts | 4 +-- .../feature-flag-service.ts | 5 ++-- .../fetch-saleor-version.ts | 1 + .../get-feature-flags.test.ts | 1 + .../configuration/smtp-config-input-schema.ts | 3 +- .../smtp/configuration/smtp-config-schema.ts | 3 +- .../smtp-configuration.service.test.ts | 11 +++---- .../smtp-configuration.service.ts | 15 +++++----- .../smtp-default-empty-configurations.ts | 1 - .../smtp/services/email-compiler.test.ts | 3 +- .../modules/smtp/services/email-compiler.ts | 11 +++---- .../handlebars-template-compiler.test.ts | 1 + .../services/handlebars-template-compiler.ts | 6 ++-- .../services/html-to-text-compiler.test.ts | 1 + .../smtp/services/html-to-text-compiler.ts | 4 +-- .../smtp/services/mjml-compiler.test.ts | 1 + apps/smtp/src/modules/smtp/ui/code-editor.tsx | 3 +- .../ui/smtp-basic-information-section.tsx | 21 +++++++------- .../modules/smtp/ui/smtp-channels-section.tsx | 7 +++-- .../modules/smtp/ui/smtp-events-section.tsx | 29 ++++++++++--------- .../smtp/src/modules/smtp/ui/smtp-section.tsx | 17 ++++++----- .../modules/smtp/ui/smtp-sender-section.tsx | 17 ++++++----- ...rotected-client-procedure-with-services.ts | 6 ++-- .../trpc/protected-client-procedure.ts | 1 + apps/smtp/src/modules/trpc/trpc-app-router.ts | 4 +-- apps/smtp/src/modules/trpc/trpc-client.ts | 2 +- apps/smtp/src/modules/trpc/trpc-context.ts | 3 +- apps/smtp/src/modules/trpc/trpc-server.ts | 5 ++-- .../webhook-management/api-operations.ts | 1 + ...bhook-statuses-from-configurations.test.ts | 1 + .../sync-webhook-status.test.ts | 1 + .../webhook-management/sync-webhook-status.ts | 4 +-- .../webhook-management-service.test.ts | 7 +++-- .../webhook-management-service.ts | 15 +++++----- apps/smtp/src/pages/_app.tsx | 6 ++-- apps/smtp/src/pages/api/manifest.ts | 2 +- apps/smtp/src/pages/api/register.ts | 6 ++-- apps/smtp/src/pages/api/trpc/[trpc].ts | 5 ++-- .../src/pages/api/webhooks/gift-card-sent.ts | 15 +++++----- .../src/pages/api/webhooks/invoice-sent.ts | 15 +++++----- apps/smtp/src/pages/api/webhooks/notify.ts | 13 +++++---- .../src/pages/api/webhooks/order-cancelled.ts | 15 +++++----- .../src/pages/api/webhooks/order-confirmed.ts | 15 +++++----- .../src/pages/api/webhooks/order-created.ts | 18 ++++++------ .../src/pages/api/webhooks/order-fulfilled.ts | 15 +++++----- .../pages/api/webhooks/order-fully-paid.ts | 15 +++++----- .../src/pages/api/webhooks/order-refunded.ts | 19 ++++++------ apps/smtp/src/pages/configuration/index.tsx | 7 +++-- apps/smtp/src/pages/index.tsx | 7 +++-- packages/e2e/playwright.config.ts | 3 +- .../klaviyo/klaviyo-configuration.spec.ts | 3 +- .../navigate-to-category-mapping.ts | 2 +- .../product-feed-configuration.spec.ts | 7 +++-- .../tests/assertions/assert-app-available.ts | 3 +- packages/e2e/tests/operations/install-app.ts | 1 + .../tests/operations/log-in-to-dashboard.ts | 3 +- packages/e2e/tests/operations/open-app.ts | 3 +- packages/logger/src/logger-context.test.ts | 6 ++-- .../otel/src/get-attributes-from-request.ts | 2 +- packages/otel/src/otel-exchange.ts | 9 +++--- packages/otel/src/otel-graphql-utils.ts | 1 + packages/otel/src/otel-logs-setup.ts | 3 +- packages/otel/src/otel-traces-setup.ts | 1 + .../src/components/Combobox.stories.tsx | 7 +++-- .../src/components/Input.stories.tsx | 7 +++-- .../src/components/Multiselect.stories.tsx | 7 +++-- .../src/components/Multiselect.tsx | 2 +- .../src/components/Select.stories.tsx | 7 +++-- .../src/components/Select.tsx | 2 +- packages/shared/index.ts | 2 +- packages/shared/src/GraphQLProvider.tsx | 1 + packages/shared/src/create-graphql-client.ts | 2 +- .../editor-js-plaintext-renderer.test.ts | 1 + packages/shared/src/metadata-manager.ts | 2 +- packages/shared/src/no-ssr-wrapper.tsx | 2 +- ...or-version-compatibility-validator.test.ts | 1 + .../shared/src/use-dashboard-notification.ts | 2 +- packages/trpc/src/context.ts | 6 ++-- packages/ui/index.ts | 6 ++-- packages/ui/src/buttons-box.tsx | 2 +- .../src/create-app-webhook-from-manifest.ts | 1 + ...p-webhook-from-webhook-details-fragment.ts | 1 + packages/webhook-utils/src/disable-webhook.ts | 1 + packages/webhook-utils/src/enable-webhook.ts | 1 + ...ebhook-ids-and-manifests-to-update.test.ts | 1 + ...get-webhook-ids-and-manifests-to-update.ts | 1 + .../src/filters/webhooks-to-add.test.ts | 1 + .../src/filters/webhooks-to-add.ts | 1 + .../src/filters/webhooks-to-remove.test.ts | 1 + .../src/filters/webhooks-to-remove.ts | 1 + .../src/modify-app-webhook-from-manifest.ts | 1 + ...modify-app-webhook-from-webhook-details.ts | 1 + 255 files changed, 721 insertions(+), 528 deletions(-) create mode 100644 .changeset/silver-mangos-behave.md diff --git a/.changeset/silver-mangos-behave.md b/.changeset/silver-mangos-behave.md new file mode 100644 index 0000000000..44c3b2a84a --- /dev/null +++ b/.changeset/silver-mangos-behave.md @@ -0,0 +1,19 @@ +--- +"@saleor/react-hook-form-macaw": patch +"@saleor/webhook-utils": patch +"products-feed": patch +"@saleor/apps-logger": patch +"@saleor/apps-shared": patch +"@saleor/apps-otel": patch +"@saleor/trpc": patch +"klaviyo": patch +"segment": patch +"@saleor/e2e": patch +"app-avatax": patch +"cms-v2": patch +"search": patch +"@saleor/apps-ui": patch +"smtp": patch +--- + +Fixed autofixable liniting issues. No functional changes. diff --git a/apps/avatax/src/modules/app/metadata-manager.test.ts b/apps/avatax/src/modules/app/metadata-manager.test.ts index 34c16239c2..ab57ab5cab 100644 --- a/apps/avatax/src/modules/app/metadata-manager.test.ts +++ b/apps/avatax/src/modules/app/metadata-manager.test.ts @@ -1,6 +1,6 @@ import { encrypt } from "@saleor/app-sdk/settings-manager"; import { Client } from "urql"; -import { describe, expect, it, Mock, vi } from "vitest"; +import { describe, expect, it, vi } from "vitest"; import { AppMetadataCache } from "../../lib/app-metadata-cache"; import { createSettingsManager } from "./metadata-manager"; @@ -36,7 +36,8 @@ describe("MetadataManager", () => { const cache = new AppMetadataCache(); const manager = createSettingsManager(mockGqlClient, "test-id", cache); - (mockGqlClient.query as Mock).mockImplementationOnce(() => { + // @ts-expect-error mocking the request for testing + vi.mocked(mockGqlClient.query).mockImplementationOnce(() => { return { async toPromise() { return { diff --git a/apps/cms-v2/scripts/deploy.ts b/apps/cms-v2/scripts/deploy.ts index 337d5271c2..7ba193f82a 100644 --- a/apps/cms-v2/scripts/deploy.ts +++ b/apps/cms-v2/scripts/deploy.ts @@ -1,6 +1,7 @@ -import { exportSentryReleaseEnvironmentVariable } from "@saleor/sentry-utils"; import { execSync } from "node:child_process"; +import { exportSentryReleaseEnvironmentVariable } from "@saleor/sentry-utils"; + import packageJson from "../package.json"; exportSentryReleaseEnvironmentVariable(packageJson.version); diff --git a/apps/cms-v2/src/modules/bulk-sync/use-bulk-sync-products-state.ts b/apps/cms-v2/src/modules/bulk-sync/use-bulk-sync-products-state.ts index c597dd26a0..14d2bae2d5 100644 --- a/apps/cms-v2/src/modules/bulk-sync/use-bulk-sync-products-state.ts +++ b/apps/cms-v2/src/modules/bulk-sync/use-bulk-sync-products-state.ts @@ -1,4 +1,5 @@ import { useCallback, useEffect, useState } from "react"; + import { BulkImportProductFragment } from "../../../generated/graphql"; import { VariantsSyncStatusListItem } from "./variants-sync-status-list"; diff --git a/apps/cms-v2/src/modules/bulk-sync/use-fetch-all-products.tsx b/apps/cms-v2/src/modules/bulk-sync/use-fetch-all-products.tsx index 7e372f1aa7..0b1126d01f 100644 --- a/apps/cms-v2/src/modules/bulk-sync/use-fetch-all-products.tsx +++ b/apps/cms-v2/src/modules/bulk-sync/use-fetch-all-products.tsx @@ -1,7 +1,7 @@ import { useAppBridge } from "@saleor/app-sdk/app-bridge"; +import { createGraphQLClient } from "@saleor/apps-shared"; import { useEffect, useState } from "react"; -import { createGraphQLClient } from "@saleor/apps-shared"; import { BulkImportProductFragment, FetchProductsPaginatedDocument, diff --git a/apps/cms-v2/src/modules/channel-provider-connection/channels-provider-connection-list.tsx b/apps/cms-v2/src/modules/channel-provider-connection/channels-provider-connection-list.tsx index 93b7d1cda0..4c43e569bf 100644 --- a/apps/cms-v2/src/modules/channel-provider-connection/channels-provider-connection-list.tsx +++ b/apps/cms-v2/src/modules/channel-provider-connection/channels-provider-connection-list.tsx @@ -2,6 +2,7 @@ import { useDashboardNotification } from "@saleor/apps-shared"; import { ButtonsBox, Layout, SkeletonLayout } from "@saleor/apps-ui"; import { Box, Button, Text } from "@saleor/macaw-ui"; import { useState } from "react"; + import { trpcClient } from "../trpc/trpc-client"; import { AddConnectionModal } from "./add-connection-modal"; import { ChanelProviderConnectionsSectionHeader } from "./channel-provider-connections-section-header"; diff --git a/apps/cms-v2/src/modules/configuration/app-config-metadata-manager.ts b/apps/cms-v2/src/modules/configuration/app-config-metadata-manager.ts index d975763c9f..4e2a3e45e0 100644 --- a/apps/cms-v2/src/modules/configuration/app-config-metadata-manager.ts +++ b/apps/cms-v2/src/modules/configuration/app-config-metadata-manager.ts @@ -1,8 +1,9 @@ +import { AuthData } from "@saleor/app-sdk/APL"; import { SettingsManager } from "@saleor/app-sdk/settings-manager"; +import { createGraphQLClient } from "@saleor/apps-shared"; + import { AppConfig } from "./app-config"; import { createSettingsManager } from "./metadata-manager"; -import { AuthData } from "@saleor/app-sdk/APL"; -import { createGraphQLClient } from "@saleor/apps-shared"; export class AppConfigMetadataManager { public readonly metadataKey = "app-config-v1"; diff --git a/apps/cms-v2/src/modules/configuration/app-config.test.ts b/apps/cms-v2/src/modules/configuration/app-config.test.ts index 4713e1763f..a21cb50c35 100644 --- a/apps/cms-v2/src/modules/configuration/app-config.test.ts +++ b/apps/cms-v2/src/modules/configuration/app-config.test.ts @@ -1,4 +1,5 @@ -import { describe, it, expect, beforeEach } from "vitest"; +import { beforeEach,describe, expect, it } from "vitest"; + import { AppConfig } from "./app-config"; import { ContentfulProviderConfig } from "./schemas/contentful-provider.schema"; import { DatocmsProviderConfig } from "./schemas/datocms-provider.schema"; diff --git a/apps/cms-v2/src/modules/configuration/index.ts b/apps/cms-v2/src/modules/configuration/index.ts index 4d64875767..00869acecd 100644 --- a/apps/cms-v2/src/modules/configuration/index.ts +++ b/apps/cms-v2/src/modules/configuration/index.ts @@ -4,10 +4,10 @@ export * from "./app-config"; export * from "./app-config-metadata-manager"; export * from "./metadata-manager"; +export * from "./schemas/builder-provider.schema"; export * from "./schemas/channel-provider-connection.schema"; export * from "./schemas/contentful-provider.schema"; -export * from "./schemas/builder-provider.schema"; export * from "./schemas/datocms-provider.schema"; -export * from "./schemas/strapi-provider.schema"; -export * from "./schemas/saleor-provider-fields-mapping.schema"; export * from "./schemas/root-config.schema"; +export * from "./schemas/saleor-provider-fields-mapping.schema"; +export * from "./schemas/strapi-provider.schema"; diff --git a/apps/cms-v2/src/modules/configuration/schemas/builder-provider.schema.ts b/apps/cms-v2/src/modules/configuration/schemas/builder-provider.schema.ts index d144572b6a..f8063f39ba 100644 --- a/apps/cms-v2/src/modules/configuration/schemas/builder-provider.schema.ts +++ b/apps/cms-v2/src/modules/configuration/schemas/builder-provider.schema.ts @@ -1,7 +1,9 @@ import { z } from "zod"; -import { SaleorProviderFieldsMappingSchema } from "./saleor-provider-fields-mapping.schema"; + import { BuilderIo } from "@/modules/providers/builder.io/builder-io"; +import { SaleorProviderFieldsMappingSchema } from "./saleor-provider-fields-mapping.schema"; + const InputSchema = z.object({ type: z.literal(BuilderIo.type), privateApiKey: z.string().min(1), diff --git a/apps/cms-v2/src/modules/configuration/schemas/channel-provider-connection.schema.ts b/apps/cms-v2/src/modules/configuration/schemas/channel-provider-connection.schema.ts index 2b8ce9ea88..b2541bba20 100644 --- a/apps/cms-v2/src/modules/configuration/schemas/channel-provider-connection.schema.ts +++ b/apps/cms-v2/src/modules/configuration/schemas/channel-provider-connection.schema.ts @@ -1,6 +1,7 @@ -import { cmsTypes } from "@/modules/providers/providers-registry"; import { z } from "zod"; +import { cmsTypes } from "@/modules/providers/providers-registry"; + const InputSchema = z.object({ channelSlug: z.string().min(1), providerId: z.string().min(1), diff --git a/apps/cms-v2/src/modules/configuration/schemas/contentful-provider.schema.ts b/apps/cms-v2/src/modules/configuration/schemas/contentful-provider.schema.ts index 94764f7265..bd0d0858b1 100644 --- a/apps/cms-v2/src/modules/configuration/schemas/contentful-provider.schema.ts +++ b/apps/cms-v2/src/modules/configuration/schemas/contentful-provider.schema.ts @@ -1,4 +1,5 @@ import { z } from "zod"; + import { Contentful } from "../../providers/contentful/contentful"; import { SaleorProviderFieldsMappingSchema } from "./saleor-provider-fields-mapping.schema"; diff --git a/apps/cms-v2/src/modules/configuration/schemas/datocms-provider.schema.ts b/apps/cms-v2/src/modules/configuration/schemas/datocms-provider.schema.ts index ca7bb6ebfc..241ea8e718 100644 --- a/apps/cms-v2/src/modules/configuration/schemas/datocms-provider.schema.ts +++ b/apps/cms-v2/src/modules/configuration/schemas/datocms-provider.schema.ts @@ -1,5 +1,7 @@ -import { Datocms } from "@/modules/providers/datocms/datocms"; import { z } from "zod"; + +import { Datocms } from "@/modules/providers/datocms/datocms"; + import { SaleorProviderFieldsMappingSchema } from "./saleor-provider-fields-mapping.schema"; const InputSchema = z.object({ diff --git a/apps/cms-v2/src/modules/configuration/schemas/payloadcms-provider.schema.ts b/apps/cms-v2/src/modules/configuration/schemas/payloadcms-provider.schema.ts index 22197e9bb6..d8623d2da1 100644 --- a/apps/cms-v2/src/modules/configuration/schemas/payloadcms-provider.schema.ts +++ b/apps/cms-v2/src/modules/configuration/schemas/payloadcms-provider.schema.ts @@ -1,5 +1,7 @@ -import { PayloadCMS } from "@/modules/providers/payloadcms/payloadcms"; import { z } from "zod"; + +import { PayloadCMS } from "@/modules/providers/payloadcms/payloadcms"; + import { SaleorProviderFieldsMappingSchema } from "./saleor-provider-fields-mapping.schema"; const InputSchema = z.object({ diff --git a/apps/cms-v2/src/modules/configuration/schemas/root-config.schema.ts b/apps/cms-v2/src/modules/configuration/schemas/root-config.schema.ts index 518297632f..c5e7a43fca 100644 --- a/apps/cms-v2/src/modules/configuration/schemas/root-config.schema.ts +++ b/apps/cms-v2/src/modules/configuration/schemas/root-config.schema.ts @@ -1,10 +1,11 @@ import { z } from "zod"; + +import { BuilderIoProviderConfig } from "./builder-provider.schema"; import { ChannelProviderConnectionConfig } from "./channel-provider-connection.schema"; import { ContentfulProviderConfig } from "./contentful-provider.schema"; -import { BuilderIoProviderConfig } from "./builder-provider.schema"; -import { StrapiProviderConfig } from "./strapi-provider.schema"; import { DatocmsProviderConfig } from "./datocms-provider.schema"; import { PayloadCmsProviderConfig } from "./payloadcms-provider.schema"; +import { StrapiProviderConfig } from "./strapi-provider.schema"; export namespace ProvidersConfig { const AnyFull = z.union([ diff --git a/apps/cms-v2/src/modules/configuration/schemas/strapi-provider.schema.ts b/apps/cms-v2/src/modules/configuration/schemas/strapi-provider.schema.ts index 3b3649827a..6d4017aa41 100644 --- a/apps/cms-v2/src/modules/configuration/schemas/strapi-provider.schema.ts +++ b/apps/cms-v2/src/modules/configuration/schemas/strapi-provider.schema.ts @@ -1,5 +1,7 @@ -import { Strapi } from "@/modules/providers/strapi/strapi"; import { z } from "zod"; + +import { Strapi } from "@/modules/providers/strapi/strapi"; + import { SaleorProviderFieldsMappingSchema } from "./saleor-provider-fields-mapping.schema"; const InputSchema = z.object({ diff --git a/apps/cms-v2/src/modules/graphql/GraphQLProvider.tsx b/apps/cms-v2/src/modules/graphql/GraphQLProvider.tsx index 22b41d4e72..c55a9be8c6 100644 --- a/apps/cms-v2/src/modules/graphql/GraphQLProvider.tsx +++ b/apps/cms-v2/src/modules/graphql/GraphQLProvider.tsx @@ -1,9 +1,8 @@ import { useAppBridge } from "@saleor/app-sdk/app-bridge"; +import { createGraphQLClient } from "@saleor/apps-shared"; import { PropsWithChildren } from "react"; import { Provider } from "urql"; -import { createGraphQLClient } from "@saleor/apps-shared"; - export function GraphQLProvider(props: PropsWithChildren<{}>) { const { appBridgeState } = useAppBridge(); const saleorApiUrl = appBridgeState?.saleorApiUrl!; diff --git a/apps/cms-v2/src/modules/providers-listing/providers-list.router.ts b/apps/cms-v2/src/modules/providers-listing/providers-list.router.ts index e8cec0948e..7d043c1f71 100644 --- a/apps/cms-v2/src/modules/providers-listing/providers-list.router.ts +++ b/apps/cms-v2/src/modules/providers-listing/providers-list.router.ts @@ -1,11 +1,11 @@ -import { createSettingsManager } from "../configuration/metadata-manager"; - import { z } from "zod"; + +import { createLogger } from "../../logger"; +import { ProvidersConfig } from "../configuration"; import { AppConfigMetadataManager } from "../configuration/app-config-metadata-manager"; +import { createSettingsManager } from "../configuration/metadata-manager"; import { protectedClientProcedure } from "../trpc/protected-client-procedure"; import { router } from "../trpc/trpc-server"; -import { ProvidersConfig } from "../configuration"; -import { createLogger } from "../../logger"; const procedure = protectedClientProcedure.use(({ ctx, next }) => { const settingsManager = createSettingsManager(ctx.apiClient, ctx.appId!); diff --git a/apps/cms-v2/src/modules/providers/builder.io/builder-io-webhooks-processor.ts b/apps/cms-v2/src/modules/providers/builder.io/builder-io-webhooks-processor.ts index 53518ebbe2..3681ea8ffe 100644 --- a/apps/cms-v2/src/modules/providers/builder.io/builder-io-webhooks-processor.ts +++ b/apps/cms-v2/src/modules/providers/builder.io/builder-io-webhooks-processor.ts @@ -1,4 +1,5 @@ import { createLogger } from "@/logger"; + import { WebhookProductFragment, WebhookProductVariantFragment, diff --git a/apps/cms-v2/src/modules/providers/builder.io/builder-io.client.ts b/apps/cms-v2/src/modules/providers/builder.io/builder-io.client.ts index 90b99c333f..77a54713f1 100644 --- a/apps/cms-v2/src/modules/providers/builder.io/builder-io.client.ts +++ b/apps/cms-v2/src/modules/providers/builder.io/builder-io.client.ts @@ -1,6 +1,7 @@ +import { createLogger } from "@/logger"; import { BuilderIoProviderConfig } from "@/modules/configuration"; + import { WebhookProductVariantFragment } from "../../../../generated/graphql"; -import { createLogger } from "@/logger"; import { FieldsMapper } from "../fields-mapper"; // https://www.builder.io/c/docs/write-api diff --git a/apps/cms-v2/src/modules/providers/builder.io/builder-io.tsx b/apps/cms-v2/src/modules/providers/builder.io/builder-io.tsx index 3941711f8a..13c96a9a83 100644 --- a/apps/cms-v2/src/modules/providers/builder.io/builder-io.tsx +++ b/apps/cms-v2/src/modules/providers/builder.io/builder-io.tsx @@ -1,8 +1,8 @@ +import { TextLink } from "@saleor/apps-ui"; import { Text } from "@saleor/macaw-ui"; -import logo from "./builder-logo.svg"; import { CMSProviderMeta } from "../cms-provider-meta"; -import { TextLink } from "@saleor/apps-ui"; +import logo from "./builder-logo.svg"; export const BuilderIo = { formSideInfo: ( diff --git a/apps/cms-v2/src/modules/providers/contentful/contentful-bulk-sync-processor.ts b/apps/cms-v2/src/modules/providers/contentful/contentful-bulk-sync-processor.ts index c8f411aa8f..f8b774f338 100644 --- a/apps/cms-v2/src/modules/providers/contentful/contentful-bulk-sync-processor.ts +++ b/apps/cms-v2/src/modules/providers/contentful/contentful-bulk-sync-processor.ts @@ -1,9 +1,10 @@ +import { createLogger } from "@/logger"; + import { BulkImportProductFragment } from "../../../../generated/graphql"; import { BulkSyncProcessor, BulkSyncProcessorHooks } from "../../bulk-sync/bulk-sync-processor"; import { ContentfulProviderConfig } from "../../configuration"; import { ContentfulClient } from "./contentful-client"; import { contentfulRateLimiter } from "./contentful-rate-limiter"; -import { createLogger } from "@/logger"; export class ContentfulBulkSyncProcessor implements BulkSyncProcessor { private logger = createLogger("ContentfulBulkSyncProcessor"); diff --git a/apps/cms-v2/src/modules/providers/contentful/contentful-client.test.ts b/apps/cms-v2/src/modules/providers/contentful/contentful-client.test.ts index 97cae2ed89..af9a9321b7 100644 --- a/apps/cms-v2/src/modules/providers/contentful/contentful-client.test.ts +++ b/apps/cms-v2/src/modules/providers/contentful/contentful-client.test.ts @@ -1,7 +1,9 @@ -import { describe, it, expect, vi, beforeEach } from "vitest"; -import { ContentfulClient, ContentfulApiClientChunk } from "./contentful-client"; +import { beforeEach,describe, expect, it, vi } from "vitest"; + import { ContentfulProviderConfig } from "@/modules/configuration"; + import { WebhookProductVariantFragment } from "../../../../generated/graphql"; +import { ContentfulApiClientChunk,ContentfulClient } from "./contentful-client"; const getMockContenfulConfiguration = (): ContentfulProviderConfig.FullShape => ({ authToken: "test-token", diff --git a/apps/cms-v2/src/modules/providers/contentful/contentful-webhooks-processor.test.ts b/apps/cms-v2/src/modules/providers/contentful/contentful-webhooks-processor.test.ts index 3c78ab9a9f..30d44540c7 100644 --- a/apps/cms-v2/src/modules/providers/contentful/contentful-webhooks-processor.test.ts +++ b/apps/cms-v2/src/modules/providers/contentful/contentful-webhooks-processor.test.ts @@ -1,10 +1,12 @@ -import { describe, expect, vi, it, beforeEach } from "vitest"; +import { beforeEach,describe, expect, it, vi } from "vitest"; + +import { ContentfulProviderConfig } from "@/modules/configuration"; + +import { WebhookProductVariantFragment } from "../../../../generated/graphql"; import { ContentfulClientStrip, ContentfulWebhooksProcessor, } from "./contentful-webhooks-processor"; -import { ContentfulProviderConfig } from "@/modules/configuration"; -import { WebhookProductVariantFragment } from "../../../../generated/graphql"; const getMockContenfulConfiguration = (): ContentfulProviderConfig.FullShape => ({ authToken: "test-token", diff --git a/apps/cms-v2/src/modules/providers/contentful/contentful-webhooks-processor.ts b/apps/cms-v2/src/modules/providers/contentful/contentful-webhooks-processor.ts index b65fdba1dc..e969f43bce 100644 --- a/apps/cms-v2/src/modules/providers/contentful/contentful-webhooks-processor.ts +++ b/apps/cms-v2/src/modules/providers/contentful/contentful-webhooks-processor.ts @@ -1,4 +1,5 @@ import { createLogger } from "@/logger"; + import { WebhookProductFragment, WebhookProductVariantFragment, diff --git a/apps/cms-v2/src/modules/providers/contentful/contentful.router.ts b/apps/cms-v2/src/modules/providers/contentful/contentful.router.ts index 859317de72..f36b59f574 100644 --- a/apps/cms-v2/src/modules/providers/contentful/contentful.router.ts +++ b/apps/cms-v2/src/modules/providers/contentful/contentful.router.ts @@ -1,13 +1,13 @@ import { TRPCError } from "@trpc/server"; import { z } from "zod"; -import { AppConfigMetadataManager } from "../../configuration/app-config-metadata-manager"; +import { createLogger } from "@/logger"; + +import { AppConfigMetadataManager } from "../../configuration/app-config-metadata-manager"; import { createSettingsManager } from "../../configuration/metadata-manager"; import { protectedClientProcedure } from "../../trpc/protected-client-procedure"; import { router } from "../../trpc/trpc-server"; - import { ContentfulClient } from "./contentful-client"; -import { createLogger } from "@/logger"; const procedure = protectedClientProcedure.use(({ ctx, next }) => { const settingsManager = createSettingsManager(ctx.apiClient, ctx.appId!); diff --git a/apps/cms-v2/src/modules/providers/contentful/contentful.tsx b/apps/cms-v2/src/modules/providers/contentful/contentful.tsx index c96d50abb1..f52e8f0151 100644 --- a/apps/cms-v2/src/modules/providers/contentful/contentful.tsx +++ b/apps/cms-v2/src/modules/providers/contentful/contentful.tsx @@ -1,7 +1,7 @@ import { Box, Text } from "@saleor/macaw-ui"; -import logo from "./contentful-logo.svg"; import { CMSProviderMeta } from "../cms-provider-meta"; +import logo from "./contentful-logo.svg"; export const Contentful = { formSideInfo: ( diff --git a/apps/cms-v2/src/modules/providers/datocms/datocms-bulk-sync-processor.ts b/apps/cms-v2/src/modules/providers/datocms/datocms-bulk-sync-processor.ts index 62c6353b0d..d26b55a392 100644 --- a/apps/cms-v2/src/modules/providers/datocms/datocms-bulk-sync-processor.ts +++ b/apps/cms-v2/src/modules/providers/datocms/datocms-bulk-sync-processor.ts @@ -1,7 +1,7 @@ import { DatocmsProviderConfig } from "@/modules/configuration/schemas/datocms-provider.schema"; + import { BulkImportProductFragment } from "../../../../generated/graphql"; import { BulkSyncProcessor, BulkSyncProcessorHooks } from "../../bulk-sync/bulk-sync-processor"; - import { DatoCMSClient } from "./datocms-client"; export class DatocmsBulkSyncProcessor implements BulkSyncProcessor { diff --git a/apps/cms-v2/src/modules/providers/datocms/datocms-client.ts b/apps/cms-v2/src/modules/providers/datocms/datocms-client.ts index 613f4e892e..4091c7a43e 100644 --- a/apps/cms-v2/src/modules/providers/datocms/datocms-client.ts +++ b/apps/cms-v2/src/modules/providers/datocms/datocms-client.ts @@ -1,10 +1,11 @@ -import { buildClient, Client, SimpleSchemaTypes, ApiError } from "@datocms/cma-client-browser"; -import { WebhookProductVariantFragment } from "../../../../generated/graphql"; -import { createLogger } from "@/logger"; +import { ApiError,buildClient, Client, SimpleSchemaTypes } from "@datocms/cma-client-browser"; +import * as Sentry from "@sentry/nextjs"; import { z } from "zod"; -import * as Sentry from "@sentry/nextjs"; +import { createLogger } from "@/logger"; import { DatocmsProviderConfig } from "@/modules/configuration/schemas/datocms-provider.schema"; + +import { WebhookProductVariantFragment } from "../../../../generated/graphql"; import { FieldsMapper } from "../fields-mapper"; type Context = { diff --git a/apps/cms-v2/src/modules/providers/datocms/datocms-webhooks-processor.ts b/apps/cms-v2/src/modules/providers/datocms/datocms-webhooks-processor.ts index 8d15473223..12dfd9a6bf 100644 --- a/apps/cms-v2/src/modules/providers/datocms/datocms-webhooks-processor.ts +++ b/apps/cms-v2/src/modules/providers/datocms/datocms-webhooks-processor.ts @@ -1,12 +1,12 @@ +import { createLogger } from "@/logger"; import { DatocmsProviderConfig } from "@/modules/configuration/schemas/datocms-provider.schema"; + import { WebhookProductFragment, WebhookProductVariantFragment, } from "../../../../generated/graphql"; - import { ProductWebhooksProcessor } from "../../webhooks-operations/product-webhooks-processor"; import { DatoCMSClient } from "./datocms-client"; -import { createLogger } from "@/logger"; /* * todo error handling diff --git a/apps/cms-v2/src/modules/providers/datocms/datocms.router.ts b/apps/cms-v2/src/modules/providers/datocms/datocms.router.ts index 6e2a6529a8..d1d48bb14e 100644 --- a/apps/cms-v2/src/modules/providers/datocms/datocms.router.ts +++ b/apps/cms-v2/src/modules/providers/datocms/datocms.router.ts @@ -1,11 +1,10 @@ +import { TRPCError } from "@trpc/server"; import { z } from "zod"; +import { createLogger } from "../../../logger"; import { protectedClientProcedure } from "../../trpc/protected-client-procedure"; import { router } from "../../trpc/trpc-server"; - import { DatoCMSClient } from "./datocms-client"; -import { TRPCError } from "@trpc/server"; -import { createLogger } from "../../../logger"; /** * Operations specific for Datocms service. diff --git a/apps/cms-v2/src/modules/providers/fields-mapper.test.ts b/apps/cms-v2/src/modules/providers/fields-mapper.test.ts index 72a8933c19..af78c5c321 100644 --- a/apps/cms-v2/src/modules/providers/fields-mapper.test.ts +++ b/apps/cms-v2/src/modules/providers/fields-mapper.test.ts @@ -1,4 +1,5 @@ -import { describe, it, expect } from "vitest"; +import { describe, expect,it } from "vitest"; + import { FieldsMapper } from "./fields-mapper"; describe("FieldsMapper", () => { diff --git a/apps/cms-v2/src/modules/providers/payloadcms/payloadcms-client.ts b/apps/cms-v2/src/modules/providers/payloadcms/payloadcms-client.ts index 83144f7c70..5be78ecfbe 100644 --- a/apps/cms-v2/src/modules/providers/payloadcms/payloadcms-client.ts +++ b/apps/cms-v2/src/modules/providers/payloadcms/payloadcms-client.ts @@ -1,10 +1,10 @@ -import { createLogger } from "@/logger"; -import { WebhookProductVariantFragment } from "../../../../generated/graphql"; +import qs from "qs"; +import { createLogger } from "@/logger"; import { PayloadCmsProviderConfig } from "@/modules/configuration/schemas/payloadcms-provider.schema"; -import { FieldsMapper } from "../fields-mapper"; -import qs from "qs"; +import { WebhookProductVariantFragment } from "../../../../generated/graphql"; +import { FieldsMapper } from "../fields-mapper"; type Context = { configuration: PayloadCmsProviderConfig.FullShape; diff --git a/apps/cms-v2/src/modules/providers/payloadcms/payloadcms-webhooks-processor.ts b/apps/cms-v2/src/modules/providers/payloadcms/payloadcms-webhooks-processor.ts index dcf108426e..456839d0c7 100644 --- a/apps/cms-v2/src/modules/providers/payloadcms/payloadcms-webhooks-processor.ts +++ b/apps/cms-v2/src/modules/providers/payloadcms/payloadcms-webhooks-processor.ts @@ -1,10 +1,10 @@ +import { createLogger } from "@/logger"; +import { PayloadCmsProviderConfig } from "@/modules/configuration/schemas/payloadcms-provider.schema"; + import { WebhookProductFragment, WebhookProductVariantFragment, } from "../../../../generated/graphql"; - -import { PayloadCmsProviderConfig } from "@/modules/configuration/schemas/payloadcms-provider.schema"; -import { createLogger } from "@/logger"; import { ProductWebhooksProcessor } from "../../webhooks-operations/product-webhooks-processor"; import { PayloadCMSClient } from "./payloadcms-client"; diff --git a/apps/cms-v2/src/modules/providers/payloadcms/payloadcms.tsx b/apps/cms-v2/src/modules/providers/payloadcms/payloadcms.tsx index ca3dd036bd..20fdb97b7e 100644 --- a/apps/cms-v2/src/modules/providers/payloadcms/payloadcms.tsx +++ b/apps/cms-v2/src/modules/providers/payloadcms/payloadcms.tsx @@ -1,8 +1,8 @@ +import { TextLink } from "@saleor/apps-ui"; import { Box, Text } from "@saleor/macaw-ui"; import { CMSProviderMeta } from "../cms-provider-meta"; import logo from "./logo.png"; -import { TextLink } from "@saleor/apps-ui"; export const PayloadCMS = { formSideInfo: ( diff --git a/apps/cms-v2/src/modules/providers/providers-resolver.tsx b/apps/cms-v2/src/modules/providers/providers-resolver.tsx index 4477247601..a28c54a078 100644 --- a/apps/cms-v2/src/modules/providers/providers-resolver.tsx +++ b/apps/cms-v2/src/modules/providers/providers-resolver.tsx @@ -1,3 +1,6 @@ +import dynamic from "next/dynamic"; +import { ComponentType, ReactElement } from "react"; + import { BulkSyncProcessor } from "../bulk-sync/bulk-sync-processor"; import { BuilderIoProviderConfig, @@ -5,27 +8,24 @@ import { ProvidersConfig, StrapiProviderConfig, } from "../configuration"; -import { ContentfulBulkSyncProcessor } from "./contentful/contentful-bulk-sync-processor"; -import { DatocmsBulkSyncProcessor } from "./datocms/datocms-bulk-sync-processor"; -import { StrapiBulkSyncProcessor } from "./strapi/strapi-bulk-sync-processor"; - -import dynamic from "next/dynamic"; -import { ComponentType, ReactElement } from "react"; +import { DatocmsProviderConfig } from "../configuration/schemas/datocms-provider.schema"; +import { PayloadCmsProviderConfig } from "../configuration/schemas/payloadcms-provider.schema"; +import { BuilderIo } from "./builder.io/builder-io"; +import { BuilderIoBulkSyncProcessor } from "./builder.io/builder-io-bulk-sync-processor"; +import { BuilderIoWebhooksProcessor } from "./builder.io/builder-io-webhooks-processor"; import { Contentful } from "./contentful/contentful"; +import { ContentfulBulkSyncProcessor } from "./contentful/contentful-bulk-sync-processor"; import { ContentfulWebhooksProcessor } from "./contentful/contentful-webhooks-processor"; import { Datocms } from "./datocms/datocms"; +import { DatocmsBulkSyncProcessor } from "./datocms/datocms-bulk-sync-processor"; import { DatocmsWebhooksProcessor } from "./datocms/datocms-webhooks-processor"; +import { PayloadCMS } from "./payloadcms/payloadcms"; +import { PayloadCmsBulkSyncProcessor } from "./payloadcms/payloadcms-bulk-sync-processor"; +import { PayloadCmsWebhooksProcessor } from "./payloadcms/payloadcms-webhooks-processor"; import { CMS, CMSType } from "./providers-registry"; import { Strapi } from "./strapi/strapi"; +import { StrapiBulkSyncProcessor } from "./strapi/strapi-bulk-sync-processor"; import { StrapiWebhooksProcessor } from "./strapi/strapi-webhooks-processor"; -import { DatocmsProviderConfig } from "../configuration/schemas/datocms-provider.schema"; -import { BuilderIo } from "./builder.io/builder-io"; -import { BuilderIoWebhooksProcessor } from "./builder.io/builder-io-webhooks-processor"; -import { BuilderIoBulkSyncProcessor } from "./builder.io/builder-io-bulk-sync-processor"; -import { PayloadCmsBulkSyncProcessor } from "./payloadcms/payloadcms-bulk-sync-processor"; -import { PayloadCmsProviderConfig } from "../configuration/schemas/payloadcms-provider.schema"; -import { PayloadCMS } from "./payloadcms/payloadcms"; -import { PayloadCmsWebhooksProcessor } from "./payloadcms/payloadcms-webhooks-processor"; /** * Almost-single source of new providers. Every time app will need to resolve a provider, it will use on of these factories. diff --git a/apps/cms-v2/src/modules/providers/strapi/strapi-client.ts b/apps/cms-v2/src/modules/providers/strapi/strapi-client.ts index 9d2759a680..f3888fa974 100644 --- a/apps/cms-v2/src/modules/providers/strapi/strapi-client.ts +++ b/apps/cms-v2/src/modules/providers/strapi/strapi-client.ts @@ -1,8 +1,10 @@ import Strapi from "strapi-sdk-js"; -import { StrapiProviderConfig } from "@/modules/configuration"; -import { WebhookProductVariantFragment } from "../../../../generated/graphql"; import { z } from "zod"; + import { createLogger } from "@/logger"; +import { StrapiProviderConfig } from "@/modules/configuration"; + +import { WebhookProductVariantFragment } from "../../../../generated/graphql"; import { FieldsMapper } from "../fields-mapper"; // partial response diff --git a/apps/cms-v2/src/modules/providers/strapi/strapi-webhooks-processor.ts b/apps/cms-v2/src/modules/providers/strapi/strapi-webhooks-processor.ts index 906a7d73ba..06f15e6321 100644 --- a/apps/cms-v2/src/modules/providers/strapi/strapi-webhooks-processor.ts +++ b/apps/cms-v2/src/modules/providers/strapi/strapi-webhooks-processor.ts @@ -1,4 +1,5 @@ import { createLogger } from "@/logger"; + import { WebhookProductFragment, WebhookProductVariantFragment, diff --git a/apps/cms-v2/src/modules/providers/strapi/strapi.tsx b/apps/cms-v2/src/modules/providers/strapi/strapi.tsx index b6bf14090e..ec3cd092fb 100644 --- a/apps/cms-v2/src/modules/providers/strapi/strapi.tsx +++ b/apps/cms-v2/src/modules/providers/strapi/strapi.tsx @@ -1,7 +1,7 @@ import { Box, Text } from "@saleor/macaw-ui"; -import logo from "./strapi-logo.svg"; import { CMSProviderMeta } from "../cms-provider-meta"; +import logo from "./strapi-logo.svg"; export const Strapi = { formSideInfo: ( diff --git a/apps/cms-v2/src/modules/shared/generate-id.test.ts b/apps/cms-v2/src/modules/shared/generate-id.test.ts index 7c694b33a2..8ff45c706a 100644 --- a/apps/cms-v2/src/modules/shared/generate-id.test.ts +++ b/apps/cms-v2/src/modules/shared/generate-id.test.ts @@ -1,4 +1,5 @@ -import { describe, it, expect } from "vitest"; +import { describe, expect,it } from "vitest"; + import { generateId } from "./generate-id"; describe("generateId", () => { diff --git a/apps/cms-v2/src/modules/trpc/create-instrumented-graphql-client.ts b/apps/cms-v2/src/modules/trpc/create-instrumented-graphql-client.ts index 809a85c71c..0e126dc933 100644 --- a/apps/cms-v2/src/modules/trpc/create-instrumented-graphql-client.ts +++ b/apps/cms-v2/src/modules/trpc/create-instrumented-graphql-client.ts @@ -1,5 +1,5 @@ -import { CreateGraphQLClientArgs, createGraphQLClient } from "@saleor/apps-shared"; import { otelExchange } from "@saleor/apps-otel"; +import { createGraphQLClient,CreateGraphQLClientArgs } from "@saleor/apps-shared"; type CreateGraphQLClientProps = Omit; diff --git a/apps/cms-v2/src/modules/trpc/trpc-app-router.ts b/apps/cms-v2/src/modules/trpc/trpc-app-router.ts index 42ee534af2..a643abd9c9 100644 --- a/apps/cms-v2/src/modules/trpc/trpc-app-router.ts +++ b/apps/cms-v2/src/modules/trpc/trpc-app-router.ts @@ -1,8 +1,8 @@ import { channelProviderConnectionRouter } from "../channel-provider-connection/channel-provider-connection.router"; import { contentfulRouter } from "../providers/contentful/contentful.router"; import { datocmsRouter } from "../providers/datocms/datocms.router"; -import { providersListRouter } from "../providers-listing/providers-list.router"; import { strapiRouter } from "../providers/strapi/strapi.router"; +import { providersListRouter } from "../providers-listing/providers-list.router"; import { router } from "./trpc-server"; export const appRouter = router({ diff --git a/apps/cms-v2/src/modules/trpc/trpc-client.ts b/apps/cms-v2/src/modules/trpc/trpc-client.ts index 9ab28c4169..775880e06b 100644 --- a/apps/cms-v2/src/modules/trpc/trpc-client.ts +++ b/apps/cms-v2/src/modules/trpc/trpc-client.ts @@ -1,7 +1,7 @@ +import { SALEOR_API_URL_HEADER, SALEOR_AUTHORIZATION_BEARER_HEADER } from "@saleor/app-sdk/const"; import { httpBatchLink } from "@trpc/client"; import { createTRPCNext } from "@trpc/next"; -import { SALEOR_API_URL_HEADER, SALEOR_AUTHORIZATION_BEARER_HEADER } from "@saleor/app-sdk/const"; import { appBridgeInstance } from "../../pages/_app"; import { AppRouter } from "./trpc-app-router"; diff --git a/apps/cms-v2/src/modules/trpc/trpc-context.ts b/apps/cms-v2/src/modules/trpc/trpc-context.ts index 82354d75b7..5329639ae0 100644 --- a/apps/cms-v2/src/modules/trpc/trpc-context.ts +++ b/apps/cms-v2/src/modules/trpc/trpc-context.ts @@ -1,7 +1,7 @@ -import * as trpcNext from "@trpc/server/adapters/next"; -import { SALEOR_AUTHORIZATION_BEARER_HEADER, SALEOR_API_URL_HEADER } from "@saleor/app-sdk/const"; -import { inferAsyncReturnType } from "@trpc/server"; +import { SALEOR_API_URL_HEADER,SALEOR_AUTHORIZATION_BEARER_HEADER } from "@saleor/app-sdk/const"; import { getAppBaseUrl } from "@saleor/apps-shared"; +import { inferAsyncReturnType } from "@trpc/server"; +import * as trpcNext from "@trpc/server/adapters/next"; export const createTrpcContext = async ({ res, req }: trpcNext.CreateNextContextOptions) => { const baseUrl = getAppBaseUrl(req.headers); diff --git a/apps/cms-v2/src/modules/trpc/trpc-server.ts b/apps/cms-v2/src/modules/trpc/trpc-server.ts index fc5be26a5b..93e84c1d26 100644 --- a/apps/cms-v2/src/modules/trpc/trpc-server.ts +++ b/apps/cms-v2/src/modules/trpc/trpc-server.ts @@ -1,8 +1,9 @@ -import { initTRPC } from "@trpc/server"; -import { TrpcContext } from "./trpc-context"; import { Permission } from "@saleor/app-sdk/types"; +import { initTRPC } from "@trpc/server"; import { ZodError } from "zod"; +import { TrpcContext } from "./trpc-context"; + interface Meta { requiredClientPermissions?: Permission[]; updateWebhooks?: boolean; diff --git a/apps/cms-v2/src/modules/webhooks-operations/create-webhook-config-context.ts b/apps/cms-v2/src/modules/webhooks-operations/create-webhook-config-context.ts index 3cf9b6dd1d..5b2e6feed1 100644 --- a/apps/cms-v2/src/modules/webhooks-operations/create-webhook-config-context.ts +++ b/apps/cms-v2/src/modules/webhooks-operations/create-webhook-config-context.ts @@ -1,7 +1,9 @@ import { AuthData } from "@saleor/app-sdk/APL"; -import { AppConfigMetadataManager, RootConfig } from "../configuration"; + import { createLogger } from "@/logger"; +import { AppConfigMetadataManager, RootConfig } from "../configuration"; + export type WebhookContext = Pick; const logger = createLogger("createWebhookConfigContext"); diff --git a/apps/cms-v2/src/modules/webhooks-operations/webhooks-processors-delegator.test.ts b/apps/cms-v2/src/modules/webhooks-operations/webhooks-processors-delegator.test.ts index 4a068906b0..01328e9653 100644 --- a/apps/cms-v2/src/modules/webhooks-operations/webhooks-processors-delegator.test.ts +++ b/apps/cms-v2/src/modules/webhooks-operations/webhooks-processors-delegator.test.ts @@ -1,8 +1,9 @@ -import { describe, vi, it, expect, beforeEach } from "vitest"; +import { beforeEach,describe, expect, it, vi } from "vitest"; + +import { WebhookProductVariantFragment } from "../../../generated/graphql"; +import { AppConfig, ContentfulProviderConfig, DatocmsProviderConfig } from "../configuration"; import { ProductWebhooksProcessor } from "./product-webhooks-processor"; import { WebhooksProcessorsDelegator } from "./webhooks-processors-delegator"; -import { AppConfig, ContentfulProviderConfig, DatocmsProviderConfig } from "../configuration"; -import { WebhookProductVariantFragment } from "../../../generated/graphql"; const getMockContentfulInput = (): ContentfulProviderConfig.InputShape => { return { diff --git a/apps/cms-v2/src/modules/webhooks-operations/webhooks-processors-delegator.ts b/apps/cms-v2/src/modules/webhooks-operations/webhooks-processors-delegator.ts index fb1dd994cc..0a371cee09 100644 --- a/apps/cms-v2/src/modules/webhooks-operations/webhooks-processors-delegator.ts +++ b/apps/cms-v2/src/modules/webhooks-operations/webhooks-processors-delegator.ts @@ -1,4 +1,5 @@ import { createLogger } from "@/logger"; + import { WebhookProductFragment, WebhookProductVariantFragment } from "../../../generated/graphql"; import { ProvidersConfig } from "../configuration"; import { ProvidersResolver } from "../providers/providers-resolver"; diff --git a/apps/cms-v2/src/pages/_app.tsx b/apps/cms-v2/src/pages/_app.tsx index aec4586eb8..0c5407b2c5 100644 --- a/apps/cms-v2/src/pages/_app.tsx +++ b/apps/cms-v2/src/pages/_app.tsx @@ -1,12 +1,14 @@ import "@saleor/macaw-ui/style"; import "@/modules/theme/styles.css"; + import { AppBridge, AppBridgeProvider } from "@saleor/app-sdk/app-bridge"; -import React, { useEffect } from "react"; -import { AppProps } from "next/app"; -import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; import { RoutePropagator } from "@saleor/app-sdk/app-bridge/next"; -import { Box, ThemeProvider } from "@saleor/macaw-ui"; import { NoSSRWrapper } from "@saleor/apps-shared"; +import { Box, ThemeProvider } from "@saleor/macaw-ui"; +import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; +import { AppProps } from "next/app"; +import React, { useEffect } from "react"; + import { GraphQLProvider } from "@/modules/graphql/GraphQLProvider"; import { ThemeSynchronizer } from "@/modules/theme/theme-synchronizer"; import { trpcClient } from "@/modules/trpc/trpc-client"; diff --git a/apps/cms-v2/src/pages/_document.tsx b/apps/cms-v2/src/pages/_document.tsx index b2fff8b426..ffc3f3cccf 100644 --- a/apps/cms-v2/src/pages/_document.tsx +++ b/apps/cms-v2/src/pages/_document.tsx @@ -1,4 +1,4 @@ -import { Html, Head, Main, NextScript } from "next/document"; +import { Head, Html, Main, NextScript } from "next/document"; export default function Document() { return ( diff --git a/apps/cms-v2/src/pages/add-provider/[type].tsx b/apps/cms-v2/src/pages/add-provider/[type].tsx index a9c309ebf7..0e90df9cb2 100644 --- a/apps/cms-v2/src/pages/add-provider/[type].tsx +++ b/apps/cms-v2/src/pages/add-provider/[type].tsx @@ -1,13 +1,13 @@ -import { CMSType } from "@/modules/providers/providers-registry"; -import { ProvidersResolver } from "@/modules/providers/providers-resolver"; - -import { AppHeader } from "@/modules/ui/app-header"; import { Breadcrumbs, Layout } from "@saleor/apps-ui"; import { Box, Text } from "@saleor/macaw-ui"; import { NextPage } from "next"; import { useRouter } from "next/router"; import { useMemo } from "react"; +import { CMSType } from "@/modules/providers/providers-registry"; +import { ProvidersResolver } from "@/modules/providers/providers-resolver"; +import { AppHeader } from "@/modules/ui/app-header"; + const AddProviderPage: NextPage = () => { const { query } = useRouter(); diff --git a/apps/cms-v2/src/pages/api/manifest.ts b/apps/cms-v2/src/pages/api/manifest.ts index 5f9d3632e4..9a1c472d28 100644 --- a/apps/cms-v2/src/pages/api/manifest.ts +++ b/apps/cms-v2/src/pages/api/manifest.ts @@ -1,14 +1,14 @@ -import { withOtel } from "@saleor/apps-otel"; import { createManifestHandler } from "@saleor/app-sdk/handlers/next"; import { AppManifest } from "@saleor/app-sdk/types"; -import { loggerContext } from "../../logger-context"; import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; +import { withOtel } from "@saleor/apps-otel"; import packageJson from "../../../package.json"; +import { loggerContext } from "../../logger-context"; +import { productUpdatedWebhook } from "./webhooks/product-updated"; import { productVariantCreatedWebhook } from "./webhooks/product-variant-created"; import { productVariantDeletedWebhook } from "./webhooks/product-variant-deleted"; import { productVariantUpdatedWebhook } from "./webhooks/product-variant-updated"; -import { productUpdatedWebhook } from "./webhooks/product-updated"; const handler = createManifestHandler({ async manifestFactory({ appBaseUrl }) { diff --git a/apps/cms-v2/src/pages/api/register.ts b/apps/cms-v2/src/pages/api/register.ts index 9f1ac9bbd5..c33f123d20 100644 --- a/apps/cms-v2/src/pages/api/register.ts +++ b/apps/cms-v2/src/pages/api/register.ts @@ -1,8 +1,10 @@ +import { createAppRegisterHandler } from "@saleor/app-sdk/handlers/next"; +import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; import { withOtel } from "@saleor/apps-otel"; + import { saleorApp } from "@/saleor-app"; -import { createAppRegisterHandler } from "@saleor/app-sdk/handlers/next"; + import { loggerContext } from "../../logger-context"; -import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; const allowedUrlsPattern = process.env.ALLOWED_DOMAIN_PATTERN; diff --git a/apps/cms-v2/src/pages/api/trpc/[trpc].ts b/apps/cms-v2/src/pages/api/trpc/[trpc].ts index 35cb1b001a..9114eb1595 100644 --- a/apps/cms-v2/src/pages/api/trpc/[trpc].ts +++ b/apps/cms-v2/src/pages/api/trpc/[trpc].ts @@ -1,10 +1,12 @@ +import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; +import { withOtel } from "@saleor/apps-otel"; import * as trpcNext from "@trpc/server/adapters/next"; -import { createTrpcContext } from "../../../modules/trpc/trpc-context"; -import { appRouter } from "../../../modules/trpc/trpc-app-router"; + import { createLogger } from "@/logger"; -import { withOtel } from "@saleor/apps-otel"; + import { loggerContext } from "../../../logger-context"; -import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; +import { appRouter } from "../../../modules/trpc/trpc-app-router"; +import { createTrpcContext } from "../../../modules/trpc/trpc-context"; const logger = createLogger("tRPC error"); diff --git a/apps/cms-v2/src/pages/api/webhooks/product-updated.ts b/apps/cms-v2/src/pages/api/webhooks/product-updated.ts index 47af530d8d..61c5a4516c 100644 --- a/apps/cms-v2/src/pages/api/webhooks/product-updated.ts +++ b/apps/cms-v2/src/pages/api/webhooks/product-updated.ts @@ -1,20 +1,20 @@ -import { withOtel } from "@saleor/apps-otel"; import { NextWebhookApiHandler, SaleorAsyncWebhook } from "@saleor/app-sdk/handlers/next"; +import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; +import { withOtel } from "@saleor/apps-otel"; +import * as Sentry from "@sentry/nextjs"; import { gql } from "urql"; + +import { createLogger } from "@/logger"; +import { createWebhookConfigContext } from "@/modules/webhooks-operations/create-webhook-config-context"; +import { WebhooksProcessorsDelegator } from "@/modules/webhooks-operations/webhooks-processors-delegator"; +import { saleorApp } from "@/saleor-app"; + import { ProductUpdatedWebhookPayloadFragment, ProductUpdatedWebhookPayloadFragmentDoc, WebhookProductFragmentDoc, } from "../../../../generated/graphql"; - -import { saleorApp } from "@/saleor-app"; -import { createWebhookConfigContext } from "@/modules/webhooks-operations/create-webhook-config-context"; -import { WebhooksProcessorsDelegator } from "@/modules/webhooks-operations/webhooks-processors-delegator"; import { loggerContext } from "../../../logger-context"; -import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; - -import * as Sentry from "@sentry/nextjs"; -import { createLogger } from "@/logger"; export const config = { api: { diff --git a/apps/cms-v2/src/pages/api/webhooks/product-variant-created.ts b/apps/cms-v2/src/pages/api/webhooks/product-variant-created.ts index 247772a233..f6c822b810 100644 --- a/apps/cms-v2/src/pages/api/webhooks/product-variant-created.ts +++ b/apps/cms-v2/src/pages/api/webhooks/product-variant-created.ts @@ -1,23 +1,20 @@ -import { withOtel } from "@saleor/apps-otel"; import { NextWebhookApiHandler, SaleorAsyncWebhook } from "@saleor/app-sdk/handlers/next"; +import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; +import { withOtel } from "@saleor/apps-otel"; +import * as Sentry from "@sentry/nextjs"; import { gql } from "urql"; + +import { createLogger } from "@/logger"; +import { createWebhookConfigContext } from "@/modules/webhooks-operations/create-webhook-config-context"; +import { WebhooksProcessorsDelegator } from "@/modules/webhooks-operations/webhooks-processors-delegator"; +import { saleorApp } from "@/saleor-app"; + import { ProductVariantCreatedWebhookPayloadFragment, ProductVariantCreatedWebhookPayloadFragmentDoc, WebhookProductVariantFragmentDoc, } from "../../../../generated/graphql"; - -import { saleorApp } from "@/saleor-app"; - -import { createWebhookConfigContext } from "@/modules/webhooks-operations/create-webhook-config-context"; - -import { WebhooksProcessorsDelegator } from "@/modules/webhooks-operations/webhooks-processors-delegator"; - import { loggerContext } from "../../../logger-context"; -import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; - -import * as Sentry from "@sentry/nextjs"; -import { createLogger } from "@/logger"; export const config = { api: { diff --git a/apps/cms-v2/src/pages/api/webhooks/product-variant-deleted.ts b/apps/cms-v2/src/pages/api/webhooks/product-variant-deleted.ts index 4d33df5320..da4b1506a8 100644 --- a/apps/cms-v2/src/pages/api/webhooks/product-variant-deleted.ts +++ b/apps/cms-v2/src/pages/api/webhooks/product-variant-deleted.ts @@ -1,21 +1,20 @@ -import { withOtel } from "@saleor/apps-otel"; import { NextWebhookApiHandler, SaleorAsyncWebhook } from "@saleor/app-sdk/handlers/next"; +import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; +import { withOtel } from "@saleor/apps-otel"; +import * as Sentry from "@sentry/nextjs"; import { gql } from "urql"; -import { - ProductVariantDeletedWebhookPayloadFragment, - ProductVariantDeletedWebhookPayloadFragmentDoc, - WebhookProductVariantFragmentDoc, -} from "../../../../generated/graphql"; +import { createLogger } from "@/logger"; import { createWebhookConfigContext } from "@/modules/webhooks-operations/create-webhook-config-context"; import { WebhooksProcessorsDelegator } from "@/modules/webhooks-operations/webhooks-processors-delegator"; import { saleorApp } from "@/saleor-app"; +import { + ProductVariantDeletedWebhookPayloadFragment, + ProductVariantDeletedWebhookPayloadFragmentDoc, + WebhookProductVariantFragmentDoc, +} from "../../../../generated/graphql"; import { loggerContext } from "../../../logger-context"; -import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; - -import * as Sentry from "@sentry/nextjs"; -import { createLogger } from "@/logger"; export const config = { api: { diff --git a/apps/cms-v2/src/pages/api/webhooks/product-variant-updated.ts b/apps/cms-v2/src/pages/api/webhooks/product-variant-updated.ts index 0d3850469e..568138da48 100644 --- a/apps/cms-v2/src/pages/api/webhooks/product-variant-updated.ts +++ b/apps/cms-v2/src/pages/api/webhooks/product-variant-updated.ts @@ -1,20 +1,20 @@ -import { withOtel } from "@saleor/apps-otel"; import { NextWebhookApiHandler, SaleorAsyncWebhook } from "@saleor/app-sdk/handlers/next"; +import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; +import { withOtel } from "@saleor/apps-otel"; +import * as Sentry from "@sentry/nextjs"; import { gql } from "urql"; + +import { createLogger } from "@/logger"; +import { createWebhookConfigContext } from "@/modules/webhooks-operations/create-webhook-config-context"; +import { WebhooksProcessorsDelegator } from "@/modules/webhooks-operations/webhooks-processors-delegator"; +import { saleorApp } from "@/saleor-app"; + import { ProductVariantUpdatedWebhookPayloadFragment, ProductVariantUpdatedWebhookPayloadFragmentDoc, WebhookProductVariantFragmentDoc, } from "../../../../generated/graphql"; - -import { createWebhookConfigContext } from "@/modules/webhooks-operations/create-webhook-config-context"; -import { WebhooksProcessorsDelegator } from "@/modules/webhooks-operations/webhooks-processors-delegator"; -import { saleorApp } from "@/saleor-app"; import { loggerContext } from "../../../logger-context"; -import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; - -import * as Sentry from "@sentry/nextjs"; -import { createLogger } from "@/logger"; export const config = { api: { diff --git a/apps/cms-v2/src/pages/bulk-sync/[connection-id].tsx b/apps/cms-v2/src/pages/bulk-sync/[connection-id].tsx index 7eb23b4aa3..778c65c460 100644 --- a/apps/cms-v2/src/pages/bulk-sync/[connection-id].tsx +++ b/apps/cms-v2/src/pages/bulk-sync/[connection-id].tsx @@ -1,10 +1,11 @@ -import { BulkSyncView } from "@/modules/bulk-sync/bulk-sync-view"; -import { trpcClient } from "@/modules/trpc/trpc-client"; import { SkeletonLayout } from "@saleor/apps-ui"; import { NextPage } from "next"; import { useRouter } from "next/router"; import { z } from "zod"; +import { BulkSyncView } from "@/modules/bulk-sync/bulk-sync-view"; +import { trpcClient } from "@/modules/trpc/trpc-client"; + const BulkSyncPage: NextPage = () => { const { query } = useRouter(); const id = query["connection-id"] as string | undefined; diff --git a/apps/cms-v2/src/pages/configuration.tsx b/apps/cms-v2/src/pages/configuration.tsx index 345b81cb00..8f98ecc87a 100644 --- a/apps/cms-v2/src/pages/configuration.tsx +++ b/apps/cms-v2/src/pages/configuration.tsx @@ -1,12 +1,13 @@ -import { BulkSyncSection } from "@/modules/bulk-sync/bulk-sync-section"; -import { ChannelProviderConnectionList } from "@/modules/channel-provider-connection/channels-provider-connection-list"; -import { ProvidersList } from "@/modules/providers-listing/providers-list"; -import { AppHeader } from "@/modules/ui/app-header"; import { useAppBridge } from "@saleor/app-sdk/app-bridge"; import { Layout } from "@saleor/apps-ui"; import { Box, Text } from "@saleor/macaw-ui"; import { NextPage } from "next"; +import { BulkSyncSection } from "@/modules/bulk-sync/bulk-sync-section"; +import { ChannelProviderConnectionList } from "@/modules/channel-provider-connection/channels-provider-connection-list"; +import { ProvidersList } from "@/modules/providers-listing/providers-list"; +import { AppHeader } from "@/modules/ui/app-header"; + const ConfigurationPage: NextPage = () => { const { appBridgeState } = useAppBridge(); diff --git a/apps/cms-v2/src/pages/edit-provider/[configId].tsx b/apps/cms-v2/src/pages/edit-provider/[configId].tsx index 6a7f750bac..054f67a894 100644 --- a/apps/cms-v2/src/pages/edit-provider/[configId].tsx +++ b/apps/cms-v2/src/pages/edit-provider/[configId].tsx @@ -1,13 +1,13 @@ -import { ProvidersResolver } from "@/modules/providers/providers-resolver"; - -import { trpcClient } from "@/modules/trpc/trpc-client"; -import { AppHeader } from "@/modules/ui/app-header"; import { Breadcrumbs, Layout, SkeletonLayout } from "@saleor/apps-ui"; import { Box, Text } from "@saleor/macaw-ui"; import { NextPage } from "next"; import { useRouter } from "next/router"; import { useMemo } from "react"; +import { ProvidersResolver } from "@/modules/providers/providers-resolver"; +import { trpcClient } from "@/modules/trpc/trpc-client"; +import { AppHeader } from "@/modules/ui/app-header"; + const EditProviderPage: NextPage = () => { const { push, query } = useRouter(); const configId = query["configId"] as string; diff --git a/apps/cms-v2/src/pages/index.tsx b/apps/cms-v2/src/pages/index.tsx index f076d63f87..c12cb32305 100644 --- a/apps/cms-v2/src/pages/index.tsx +++ b/apps/cms-v2/src/pages/index.tsx @@ -1,9 +1,9 @@ -import { NextPage } from "next"; import { useAppBridge } from "@saleor/app-sdk/app-bridge"; +import { isInIframe } from "@saleor/apps-shared"; +import { NextPage } from "next"; +import { useRouter } from "next/router"; import { useEffect } from "react"; import { useIsMounted } from "usehooks-ts"; -import { useRouter } from "next/router"; -import { isInIframe } from "@saleor/apps-shared"; const IndexPage: NextPage = () => { const { appBridgeState } = useAppBridge(); diff --git a/apps/cms-v2/vitest.config.ts b/apps/cms-v2/vitest.config.ts index f3845b7866..af5af05a8a 100644 --- a/apps/cms-v2/vitest.config.ts +++ b/apps/cms-v2/vitest.config.ts @@ -1,5 +1,4 @@ import react from "@vitejs/plugin-react"; - import { defineConfig } from "vitest/config"; // https://vitejs.dev/config/ diff --git a/apps/klaviyo/scripts/deploy.ts b/apps/klaviyo/scripts/deploy.ts index 337d5271c2..7ba193f82a 100644 --- a/apps/klaviyo/scripts/deploy.ts +++ b/apps/klaviyo/scripts/deploy.ts @@ -1,6 +1,7 @@ -import { exportSentryReleaseEnvironmentVariable } from "@saleor/sentry-utils"; import { execSync } from "node:child_process"; +import { exportSentryReleaseEnvironmentVariable } from "@saleor/sentry-utils"; + import packageJson from "../package.json"; exportSentryReleaseEnvironmentVariable(packageJson.version); diff --git a/apps/klaviyo/src/pages/_app.tsx b/apps/klaviyo/src/pages/_app.tsx index e042b39574..1e357a3175 100644 --- a/apps/klaviyo/src/pages/_app.tsx +++ b/apps/klaviyo/src/pages/_app.tsx @@ -1,7 +1,8 @@ +import "@saleor/macaw-ui/style"; + import { AppBridge, AppBridgeProvider } from "@saleor/app-sdk/app-bridge"; import { NoSSRWrapper, ThemeSynchronizer } from "@saleor/apps-shared"; import { Box, ThemeProvider } from "@saleor/macaw-ui"; -import "@saleor/macaw-ui/style"; import { AppProps } from "next/app"; /** diff --git a/apps/klaviyo/src/pages/api/manifest.ts b/apps/klaviyo/src/pages/api/manifest.ts index 40a3caa537..8dffb541c2 100644 --- a/apps/klaviyo/src/pages/api/manifest.ts +++ b/apps/klaviyo/src/pages/api/manifest.ts @@ -1,8 +1,8 @@ import { createManifestHandler } from "@saleor/app-sdk/handlers/next"; import { AppManifest } from "@saleor/app-sdk/types"; +import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; import { withOtel } from "@saleor/apps-otel"; -import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; import pkg from "../../../package.json"; import { loggerContext } from "../../logger-context"; import { customerCreatedWebhook } from "./webhooks/customer-created"; diff --git a/apps/klaviyo/src/pages/api/webhooks/customer-created.ts b/apps/klaviyo/src/pages/api/webhooks/customer-created.ts index 6dea0dc58c..783afe1f2f 100644 --- a/apps/klaviyo/src/pages/api/webhooks/customer-created.ts +++ b/apps/klaviyo/src/pages/api/webhooks/customer-created.ts @@ -1,10 +1,10 @@ import { NextWebhookApiHandler, SaleorAsyncWebhook } from "@saleor/app-sdk/handlers/next"; -import { gql } from "urql"; - import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; import { withOtel } from "@saleor/apps-otel"; import { ObservabilityAttributes } from "@saleor/apps-otel/src/lib/observability-attributes"; import { createGraphQLClient } from "@saleor/apps-shared"; +import { gql } from "urql"; + import { CustomerCreatedWebhookPayloadFragment, UntypedCustomerCreatedDocument, diff --git a/apps/klaviyo/src/pages/api/webhooks/fulfillment-created.ts b/apps/klaviyo/src/pages/api/webhooks/fulfillment-created.ts index 54ddfcd1cf..f3ab48ecc1 100644 --- a/apps/klaviyo/src/pages/api/webhooks/fulfillment-created.ts +++ b/apps/klaviyo/src/pages/api/webhooks/fulfillment-created.ts @@ -1,10 +1,10 @@ import { NextWebhookApiHandler, SaleorAsyncWebhook } from "@saleor/app-sdk/handlers/next"; -import { gql } from "urql"; - import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; import { withOtel } from "@saleor/apps-otel"; import { ObservabilityAttributes } from "@saleor/apps-otel/src/lib/observability-attributes"; import { createGraphQLClient } from "@saleor/apps-shared"; +import { gql } from "urql"; + import { FulfillmentCreatedWebhookPayloadFragment, UntypedFulfillmentCreatedDocument, diff --git a/apps/klaviyo/src/pages/api/webhooks/order-created.ts b/apps/klaviyo/src/pages/api/webhooks/order-created.ts index 866d1fb8a2..ab0279c3d0 100644 --- a/apps/klaviyo/src/pages/api/webhooks/order-created.ts +++ b/apps/klaviyo/src/pages/api/webhooks/order-created.ts @@ -1,10 +1,10 @@ import { NextWebhookApiHandler, SaleorAsyncWebhook } from "@saleor/app-sdk/handlers/next"; -import { gql } from "urql"; - import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; import { withOtel } from "@saleor/apps-otel"; import { ObservabilityAttributes } from "@saleor/apps-otel/src/lib/observability-attributes"; import { createGraphQLClient } from "@saleor/apps-shared"; +import { gql } from "urql"; + import { OrderCreatedWebhookPayloadFragment, UntypedOrderCreatedDocument, diff --git a/apps/klaviyo/src/pages/api/webhooks/order-fully-paid.ts b/apps/klaviyo/src/pages/api/webhooks/order-fully-paid.ts index a89c34a1d6..e0e02b04ad 100644 --- a/apps/klaviyo/src/pages/api/webhooks/order-fully-paid.ts +++ b/apps/klaviyo/src/pages/api/webhooks/order-fully-paid.ts @@ -1,10 +1,10 @@ import { NextWebhookApiHandler, SaleorAsyncWebhook } from "@saleor/app-sdk/handlers/next"; -import { gql } from "urql"; - import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; import { withOtel } from "@saleor/apps-otel"; import { ObservabilityAttributes } from "@saleor/apps-otel/src/lib/observability-attributes"; import { createGraphQLClient } from "@saleor/apps-shared"; +import { gql } from "urql"; + import { OrderFullyPaidWebhookPayloadFragment, UntypedOrderFullyPaidDocument, diff --git a/apps/klaviyo/src/pages/index.tsx b/apps/klaviyo/src/pages/index.tsx index 9406c780d7..e7931ec89c 100644 --- a/apps/klaviyo/src/pages/index.tsx +++ b/apps/klaviyo/src/pages/index.tsx @@ -1,9 +1,9 @@ -import { NextPage } from "next"; import { useAppBridge } from "@saleor/app-sdk/app-bridge"; +import { isInIframe } from "@saleor/apps-shared"; +import { NextPage } from "next"; +import { useRouter } from "next/router"; import { useEffect } from "react"; import { useIsMounted } from "usehooks-ts"; -import { useRouter } from "next/router"; -import { isInIframe } from "@saleor/apps-shared"; const IndexPage: NextPage = () => { const { appBridgeState } = useAppBridge(); diff --git a/apps/products-feed/scripts/deploy.ts b/apps/products-feed/scripts/deploy.ts index 337d5271c2..7ba193f82a 100644 --- a/apps/products-feed/scripts/deploy.ts +++ b/apps/products-feed/scripts/deploy.ts @@ -1,6 +1,7 @@ -import { exportSentryReleaseEnvironmentVariable } from "@saleor/sentry-utils"; import { execSync } from "node:child_process"; +import { exportSentryReleaseEnvironmentVariable } from "@saleor/sentry-utils"; + import packageJson from "../package.json"; exportSentryReleaseEnvironmentVariable(packageJson.version); diff --git a/apps/products-feed/scripts/migrations/run-webhooks-migration-dry-run.ts b/apps/products-feed/scripts/migrations/run-webhooks-migration-dry-run.ts index e71b6e7358..9b280b8908 100644 --- a/apps/products-feed/scripts/migrations/run-webhooks-migration-dry-run.ts +++ b/apps/products-feed/scripts/migrations/run-webhooks-migration-dry-run.ts @@ -1,6 +1,7 @@ /* eslint-disable turbo/no-undeclared-env-vars */ import * as dotenv from "dotenv"; + import { fetchCloudAplEnvs, verifyRequiredEnvs } from "./migration-utils"; import { updateWebhooksScript } from "./update-webhooks"; diff --git a/apps/products-feed/scripts/migrations/run-webhooks-migration.ts b/apps/products-feed/scripts/migrations/run-webhooks-migration.ts index 68cafa105d..cbf85678d6 100644 --- a/apps/products-feed/scripts/migrations/run-webhooks-migration.ts +++ b/apps/products-feed/scripts/migrations/run-webhooks-migration.ts @@ -1,6 +1,7 @@ /* eslint-disable turbo/no-undeclared-env-vars */ import * as dotenv from "dotenv"; + import { fetchCloudAplEnvs, verifyRequiredEnvs } from "./migration-utils"; import { updateWebhooksScript } from "./update-webhooks"; diff --git a/apps/products-feed/src/lib/create-instrumented-graphql-client.ts b/apps/products-feed/src/lib/create-instrumented-graphql-client.ts index 809a85c71c..0e126dc933 100644 --- a/apps/products-feed/src/lib/create-instrumented-graphql-client.ts +++ b/apps/products-feed/src/lib/create-instrumented-graphql-client.ts @@ -1,5 +1,5 @@ -import { CreateGraphQLClientArgs, createGraphQLClient } from "@saleor/apps-shared"; import { otelExchange } from "@saleor/apps-otel"; +import { createGraphQLClient,CreateGraphQLClientArgs } from "@saleor/apps-shared"; type CreateGraphQLClientProps = Omit; diff --git a/apps/products-feed/src/lib/metadata-manager.ts b/apps/products-feed/src/lib/metadata-manager.ts index 63c8ccc3a4..616ce021ff 100644 --- a/apps/products-feed/src/lib/metadata-manager.ts +++ b/apps/products-feed/src/lib/metadata-manager.ts @@ -1,5 +1,6 @@ import { EncryptedMetadataManager, MetadataEntry } from "@saleor/app-sdk/settings-manager"; import { Client, gql } from "urql"; + import { FetchAppDetailsDocument, FetchAppDetailsQuery, diff --git a/apps/products-feed/src/modules/app-configuration/app-config.test.ts b/apps/products-feed/src/modules/app-configuration/app-config.test.ts index cb555816d9..84ba42cc69 100644 --- a/apps/products-feed/src/modules/app-configuration/app-config.test.ts +++ b/apps/products-feed/src/modules/app-configuration/app-config.test.ts @@ -1,4 +1,5 @@ import { describe, expect, it } from "vitest"; + import { AppConfig, RootConfig } from "./app-config"; const exampleChannelConfig: RootConfig["channelConfig"] = { diff --git a/apps/products-feed/src/modules/app-configuration/app-config.ts b/apps/products-feed/src/modules/app-configuration/app-config.ts index ffe1da6fbb..729ab9e188 100644 --- a/apps/products-feed/src/modules/app-configuration/app-config.ts +++ b/apps/products-feed/src/modules/app-configuration/app-config.ts @@ -1,4 +1,5 @@ import { z } from "zod"; + import { createLogger } from "../../logger"; const imageSizeFieldSchema = z.coerce.number().gte(256).default(1024); diff --git a/apps/products-feed/src/modules/app-configuration/attribute-fetcher.ts b/apps/products-feed/src/modules/app-configuration/attribute-fetcher.ts index b9f200ceb9..f2d4e11e0c 100644 --- a/apps/products-feed/src/modules/app-configuration/attribute-fetcher.ts +++ b/apps/products-feed/src/modules/app-configuration/attribute-fetcher.ts @@ -1,4 +1,5 @@ import { Client } from "urql"; + import { AttributeWithMappingFragmentFragment, FetchAttributesWithMappingDocument, diff --git a/apps/products-feed/src/modules/app-configuration/attribute-mapping-form.tsx b/apps/products-feed/src/modules/app-configuration/attribute-mapping-form.tsx index 8ac0bf6716..55af026349 100644 --- a/apps/products-feed/src/modules/app-configuration/attribute-mapping-form.tsx +++ b/apps/products-feed/src/modules/app-configuration/attribute-mapping-form.tsx @@ -1,14 +1,13 @@ -import { AppConfigSchema, RootConfig } from "./app-config"; -import { useForm } from "react-hook-form"; - -import { Box, Button, Text } from "@saleor/macaw-ui"; - -import React, { useCallback, useMemo } from "react"; -import { Multiselect } from "@saleor/react-hook-form-macaw"; import { zodResolver } from "@hookform/resolvers/zod"; -import { trpcClient } from "../trpc/trpc-client"; import { useDashboardNotification } from "@saleor/apps-shared"; +import { Box, Button, Text } from "@saleor/macaw-ui"; +import { Multiselect } from "@saleor/react-hook-form-macaw"; +import React, { useCallback, useMemo } from "react"; +import { useForm } from "react-hook-form"; + import { AttributeWithMappingFragmentFragment } from "../../../generated/graphql"; +import { trpcClient } from "../trpc/trpc-client"; +import { AppConfigSchema, RootConfig } from "./app-config"; type AttributeMappingConfiguration = Exclude; diff --git a/apps/products-feed/src/modules/app-configuration/channels/channels-fetcher.ts b/apps/products-feed/src/modules/app-configuration/channels/channels-fetcher.ts index 42317f6304..dda87a6512 100644 --- a/apps/products-feed/src/modules/app-configuration/channels/channels-fetcher.ts +++ b/apps/products-feed/src/modules/app-configuration/channels/channels-fetcher.ts @@ -1,4 +1,5 @@ import { Client, gql } from "urql"; + import { FetchChannelsDocument } from "../../../../generated/graphql"; gql` diff --git a/apps/products-feed/src/modules/app-configuration/channels/channels.router.ts b/apps/products-feed/src/modules/app-configuration/channels/channels.router.ts index 786ef9e12c..50899bd1c5 100644 --- a/apps/products-feed/src/modules/app-configuration/channels/channels.router.ts +++ b/apps/products-feed/src/modules/app-configuration/channels/channels.router.ts @@ -1,8 +1,8 @@ -import { router } from "../../trpc/trpc-server"; -import { protectedClientProcedure } from "../../trpc/protected-client-procedure"; -import { ChannelsFetcher } from "./channels-fetcher"; import { ChannelFragment } from "../../../../generated/graphql"; import { createLogger } from "../../../logger"; +import { protectedClientProcedure } from "../../trpc/protected-client-procedure"; +import { router } from "../../trpc/trpc-server"; +import { ChannelsFetcher } from "./channels-fetcher"; export const channelsRouter = router({ fetch: protectedClientProcedure.query( diff --git a/apps/products-feed/src/modules/app-configuration/channels/use-channels-existence-checking.ts b/apps/products-feed/src/modules/app-configuration/channels/use-channels-existence-checking.ts index 96a4cc3836..d519c31f56 100644 --- a/apps/products-feed/src/modules/app-configuration/channels/use-channels-existence-checking.ts +++ b/apps/products-feed/src/modules/app-configuration/channels/use-channels-existence-checking.ts @@ -1,7 +1,8 @@ -import { trpcClient } from "../../trpc/trpc-client"; import { useRouter } from "next/router"; import { useEffect } from "react"; +import { trpcClient } from "../../trpc/trpc-client"; + /** * This app requires channels to exist, so redirect to error page if channels don't exist */ diff --git a/apps/products-feed/src/modules/app-configuration/s3-configuration-form.tsx b/apps/products-feed/src/modules/app-configuration/s3-configuration-form.tsx index 399525d0f7..8d84e1fe76 100644 --- a/apps/products-feed/src/modules/app-configuration/s3-configuration-form.tsx +++ b/apps/products-feed/src/modules/app-configuration/s3-configuration-form.tsx @@ -1,14 +1,13 @@ -import { AppConfigSchema, RootConfig } from "./app-config"; -import { useForm } from "react-hook-form"; - -import { Box, Button, Text } from "@saleor/macaw-ui"; - -import React, { useCallback, useMemo } from "react"; -import { Input, Select } from "@saleor/react-hook-form-macaw"; import { zodResolver } from "@hookform/resolvers/zod"; -import { trpcClient } from "../trpc/trpc-client"; import { useDashboardNotification } from "@saleor/apps-shared"; +import { Box, Button, Text } from "@saleor/macaw-ui"; +import { Input, Select } from "@saleor/react-hook-form-macaw"; +import React, { useCallback, useMemo } from "react"; +import { useForm } from "react-hook-form"; + import { awsRegionList } from "../file-storage/s3/aws-region-list"; +import { trpcClient } from "../trpc/trpc-client"; +import { AppConfigSchema, RootConfig } from "./app-config"; type S3BucketConfiguration = Exclude; diff --git a/apps/products-feed/src/modules/category-mapping/categories-fetcher.test.ts b/apps/products-feed/src/modules/category-mapping/categories-fetcher.test.ts index 79938b22b4..d19c714fe9 100644 --- a/apps/products-feed/src/modules/category-mapping/categories-fetcher.test.ts +++ b/apps/products-feed/src/modules/category-mapping/categories-fetcher.test.ts @@ -1,5 +1,6 @@ import { Client, OperationResult } from "urql"; import { beforeEach, describe, expect, it, vi } from "vitest"; + import { FetchCategoriesWithMappingQuery } from "../../../generated/graphql"; import { CategoriesFetcher } from "./categories-fetcher"; diff --git a/apps/products-feed/src/modules/category-mapping/categories-fetcher.ts b/apps/products-feed/src/modules/category-mapping/categories-fetcher.ts index 4b196c222a..740347036d 100644 --- a/apps/products-feed/src/modules/category-mapping/categories-fetcher.ts +++ b/apps/products-feed/src/modules/category-mapping/categories-fetcher.ts @@ -1,4 +1,5 @@ import { Client } from "urql"; + import { CategoryWithMappingFragmentFragment, FetchCategoriesWithMappingDocument, diff --git a/apps/products-feed/src/modules/category-mapping/ui/category-mapping-form.tsx b/apps/products-feed/src/modules/category-mapping/ui/category-mapping-form.tsx index bb1cbf7ccd..9d3afa22bd 100644 --- a/apps/products-feed/src/modules/category-mapping/ui/category-mapping-form.tsx +++ b/apps/products-feed/src/modules/category-mapping/ui/category-mapping-form.tsx @@ -1,17 +1,17 @@ +import { zodResolver } from "@hookform/resolvers/zod"; +import { useDashboardNotification } from "@saleor/apps-shared"; +import { Box, Button, PropsWithBox } from "@saleor/macaw-ui"; +import React from "react"; import { Controller, useForm } from "react-hook-form"; -import React from "react"; -import { zodResolver } from "@hookform/resolvers/zod"; +import { CategoryWithMappingFragmentFragment } from "../../../../generated/graphql"; +import { trpcClient } from "../../trpc/trpc-client"; import { SetCategoryMappingInputSchema, SetCategoryMappingInputType, } from "../category-mapping-input-schema"; -import { CategoryWithMappingFragmentFragment } from "../../../../generated/graphql"; -import { trpcClient } from "../../trpc/trpc-client"; -import { useDashboardNotification } from "@saleor/apps-shared"; -import { Box, Button, PropsWithBox } from "@saleor/macaw-ui"; -import { GoogleProductCategories } from "../google-product-categories"; import { CategoryBreadcrumbs } from "../construct-category-breadcrumbs"; +import { GoogleProductCategories } from "../google-product-categories"; type CategoryMappingFormProps = { category: CategoryWithMappingFragmentFragment; diff --git a/apps/products-feed/src/modules/category-mapping/ui/category-mapping.tsx b/apps/products-feed/src/modules/category-mapping/ui/category-mapping.tsx index e44daae49e..9c96cb6747 100644 --- a/apps/products-feed/src/modules/category-mapping/ui/category-mapping.tsx +++ b/apps/products-feed/src/modules/category-mapping/ui/category-mapping.tsx @@ -1,8 +1,8 @@ -import { trpcClient } from "../../trpc/trpc-client"; - +import { Box, Text } from "@saleor/macaw-ui"; import React from "react"; + +import { trpcClient } from "../../trpc/trpc-client"; import { CategoryMappingForm } from "./category-mapping-form"; -import { Box, Text } from "@saleor/macaw-ui"; export const CategoryMapping = () => { const { data: categories, isLoading } = trpcClient.categoryMapping.getCategoryMappings.useQuery(); diff --git a/apps/products-feed/src/modules/feed-url/use-get-feed-api-url.test.tsx b/apps/products-feed/src/modules/feed-url/use-get-feed-api-url.test.tsx index 0c1c1914b6..b795f56ea8 100644 --- a/apps/products-feed/src/modules/feed-url/use-get-feed-api-url.test.tsx +++ b/apps/products-feed/src/modules/feed-url/use-get-feed-api-url.test.tsx @@ -1,8 +1,9 @@ +import { AppBridge, AppBridgeProvider } from "@saleor/app-sdk/app-bridge"; +import { renderHook } from "@testing-library/react"; import React, { PropsWithChildren } from "react"; import { describe, expect, it } from "vitest"; -import { renderHook } from "@testing-library/react"; + import { useGetFeedApiUrl } from "./use-get-feed-api-url"; -import { AppBridge, AppBridgeProvider } from "@saleor/app-sdk/app-bridge"; describe("useGetFeedApiUrl", function () { const appBridge = new AppBridge({ saleorApiUrl: "https://example.com/graphql/" }); diff --git a/apps/products-feed/src/modules/file-storage/s3/create-s3-client-from-configuration.ts b/apps/products-feed/src/modules/file-storage/s3/create-s3-client-from-configuration.ts index 9676b9d033..851d5ba5dc 100644 --- a/apps/products-feed/src/modules/file-storage/s3/create-s3-client-from-configuration.ts +++ b/apps/products-feed/src/modules/file-storage/s3/create-s3-client-from-configuration.ts @@ -1,4 +1,5 @@ import { S3Client } from "@aws-sdk/client-s3"; + import { RootConfig } from "../../app-configuration/app-config"; export const createS3ClientFromConfiguration = ({ diff --git a/apps/products-feed/src/modules/file-storage/s3/upload-file.ts b/apps/products-feed/src/modules/file-storage/s3/upload-file.ts index effb981ab9..3ee104f977 100644 --- a/apps/products-feed/src/modules/file-storage/s3/upload-file.ts +++ b/apps/products-feed/src/modules/file-storage/s3/upload-file.ts @@ -1,7 +1,8 @@ import { S3Client } from "@aws-sdk/client-s3"; + +import { MULTI_PART_SIZE_THRESHOLD } from "./const"; import { UploadMultiPart } from "./upload-multi-part"; import { UploadSinglePart } from "./upload-single-part"; -import { MULTI_PART_SIZE_THRESHOLD } from "./const"; export interface UploadFileArgs { s3Client: S3Client; diff --git a/apps/products-feed/src/modules/file-storage/s3/upload-multi-part.ts b/apps/products-feed/src/modules/file-storage/s3/upload-multi-part.ts index 3502201cd1..6c6dd91f61 100644 --- a/apps/products-feed/src/modules/file-storage/s3/upload-multi-part.ts +++ b/apps/products-feed/src/modules/file-storage/s3/upload-multi-part.ts @@ -4,9 +4,10 @@ import { CreateMultipartUploadCommand, UploadPartCommand, } from "@aws-sdk/client-s3"; -import { UploadFileArgs } from "./upload-file"; -import { MULTI_PART_SIZE_THRESHOLD } from "./const"; + import { createLogger } from "../../../logger"; +import { MULTI_PART_SIZE_THRESHOLD } from "./const"; +import { UploadFileArgs } from "./upload-file"; /* * Code based on S3 docs: diff --git a/apps/products-feed/src/modules/file-storage/s3/upload-single-part.ts b/apps/products-feed/src/modules/file-storage/s3/upload-single-part.ts index a0b29d6dfe..b7ea49b1b5 100644 --- a/apps/products-feed/src/modules/file-storage/s3/upload-single-part.ts +++ b/apps/products-feed/src/modules/file-storage/s3/upload-single-part.ts @@ -1,4 +1,5 @@ import { PutObjectCommand } from "@aws-sdk/client-s3"; + import { UploadFileArgs } from "./upload-file"; export const UploadSinglePart = async ({ diff --git a/apps/products-feed/src/modules/google-feed/fetch-shop-data.ts b/apps/products-feed/src/modules/google-feed/fetch-shop-data.ts index ddab6105e1..7b3d500e58 100644 --- a/apps/products-feed/src/modules/google-feed/fetch-shop-data.ts +++ b/apps/products-feed/src/modules/google-feed/fetch-shop-data.ts @@ -1,5 +1,6 @@ import { url } from "inspector"; import { Client } from "urql"; + import { ShopDetailsDocument } from "../../../generated/graphql"; import { createLogger } from "../../logger"; diff --git a/apps/products-feed/src/modules/google-feed/get-google-feed-settings.test.ts b/apps/products-feed/src/modules/google-feed/get-google-feed-settings.test.ts index 12ccf14f23..96990c0dd1 100644 --- a/apps/products-feed/src/modules/google-feed/get-google-feed-settings.test.ts +++ b/apps/products-feed/src/modules/google-feed/get-google-feed-settings.test.ts @@ -1,6 +1,7 @@ import { describe, expect, it, vi } from "vitest"; -import { GoogleFeedSettingsFetcher } from "./get-google-feed-settings"; + import { AppConfig } from "../app-configuration/app-config"; +import { GoogleFeedSettingsFetcher } from "./get-google-feed-settings"; describe("GoogleFeedSettingsFetcher", () => { it("Fetches channel-specific config with S3 config from Metadata", async () => { diff --git a/apps/products-feed/src/modules/google-feed/get-google-feed-settings.ts b/apps/products-feed/src/modules/google-feed/get-google-feed-settings.ts index 649e312d7c..dbda829011 100644 --- a/apps/products-feed/src/modules/google-feed/get-google-feed-settings.ts +++ b/apps/products-feed/src/modules/google-feed/get-google-feed-settings.ts @@ -1,9 +1,10 @@ import { AuthData } from "@saleor/app-sdk/APL"; -import { AppConfigMetadataManager } from "../app-configuration/app-config-metadata-manager"; -import { createSettingsManager } from "../../lib/metadata-manager"; -import { AppConfig } from "../app-configuration/app-config"; + import { createInstrumentedGraphqlClient } from "../../lib/create-instrumented-graphql-client"; +import { createSettingsManager } from "../../lib/metadata-manager"; import { createLogger } from "../../logger"; +import { AppConfig } from "../app-configuration/app-config"; +import { AppConfigMetadataManager } from "../app-configuration/app-config-metadata-manager"; export class GoogleFeedSettingsFetcher { private logger = createLogger("GoogleFeedSettingsFetcher"); diff --git a/apps/products-feed/src/modules/google-feed/get-related-media.test.ts b/apps/products-feed/src/modules/google-feed/get-related-media.test.ts index f24aa5f9eb..e01b15e319 100644 --- a/apps/products-feed/src/modules/google-feed/get-related-media.test.ts +++ b/apps/products-feed/src/modules/google-feed/get-related-media.test.ts @@ -1,6 +1,7 @@ import { describe, expect, it } from "vitest"; -import { getRelatedMedia } from "./get-related-media"; + import { ProductMediaType } from "../../../generated/graphql"; +import { getRelatedMedia } from "./get-related-media"; describe("getRelatedMedia", () => { it("Returns thumbnail, when set to the product", () => { diff --git a/apps/products-feed/src/modules/google-feed/get-weight-attribute-value.test.ts b/apps/products-feed/src/modules/google-feed/get-weight-attribute-value.test.ts index 27d998e288..db2d535b34 100644 --- a/apps/products-feed/src/modules/google-feed/get-weight-attribute-value.test.ts +++ b/apps/products-feed/src/modules/google-feed/get-weight-attribute-value.test.ts @@ -1,6 +1,7 @@ import { describe, expect, it } from "vitest"; -import { getWeightAttributeValue } from "./get-weight-attribute-value"; + import { WeightUnitsEnum } from "../../../generated/graphql"; +import { getWeightAttributeValue } from "./get-weight-attribute-value"; describe("getWeightAttributeValueTest", () => { it("Returns undefined, when weight is not provided", () => { diff --git a/apps/products-feed/src/modules/google-feed/price-mapping.test.ts b/apps/products-feed/src/modules/google-feed/price-mapping.test.ts index d12a2d3231..03be3018c9 100644 --- a/apps/products-feed/src/modules/google-feed/price-mapping.test.ts +++ b/apps/products-feed/src/modules/google-feed/price-mapping.test.ts @@ -1,4 +1,5 @@ import { describe, expect, it } from "vitest"; + import { priceMapping } from "./price-mapping"; describe("priceMapping", () => { diff --git a/apps/products-feed/src/modules/google-feed/product-processing-limit.test.ts b/apps/products-feed/src/modules/google-feed/product-processing-limit.test.ts index d154a6daa4..b49f7a811e 100644 --- a/apps/products-feed/src/modules/google-feed/product-processing-limit.test.ts +++ b/apps/products-feed/src/modules/google-feed/product-processing-limit.test.ts @@ -1,4 +1,5 @@ import { describe, expect, it } from "vitest"; + import { ProductProcessingLimit } from "./product-processing-limit"; describe("ProductProcessingLimit", () => { diff --git a/apps/products-feed/src/modules/google-feed/product-to-proxy.test.ts b/apps/products-feed/src/modules/google-feed/product-to-proxy.test.ts index a0b3029b9d..b53a5ac759 100644 --- a/apps/products-feed/src/modules/google-feed/product-to-proxy.test.ts +++ b/apps/products-feed/src/modules/google-feed/product-to-proxy.test.ts @@ -1,4 +1,5 @@ -import { describe, it, expect } from "vitest"; +import { describe, expect,it } from "vitest"; + import { productToProxy } from "./product-to-proxy"; describe("productToProxy", () => { diff --git a/apps/products-feed/src/modules/google-feed/shop-details-to-proxy.test.ts b/apps/products-feed/src/modules/google-feed/shop-details-to-proxy.test.ts index 515969321d..b701535570 100644 --- a/apps/products-feed/src/modules/google-feed/shop-details-to-proxy.test.ts +++ b/apps/products-feed/src/modules/google-feed/shop-details-to-proxy.test.ts @@ -1,4 +1,5 @@ import { describe, expect, it } from "vitest"; + import { shopDetailsToProxy } from "./shop-details-to-proxy"; describe("shopDetailsToProxy", () => { diff --git a/apps/products-feed/src/modules/handlebarsTemplates/render-handlebars-template.test.ts b/apps/products-feed/src/modules/handlebarsTemplates/render-handlebars-template.test.ts index 56e292e1c6..fd7713795d 100644 --- a/apps/products-feed/src/modules/handlebarsTemplates/render-handlebars-template.test.ts +++ b/apps/products-feed/src/modules/handlebarsTemplates/render-handlebars-template.test.ts @@ -1,4 +1,5 @@ import { describe, expect, it } from "vitest"; + import { renderHandlebarsTemplate } from "./render-handlebars-template"; describe("renderHandlebarsTemplate", () => { diff --git a/apps/products-feed/src/modules/handlebarsTemplates/render-handlebars-template.ts b/apps/products-feed/src/modules/handlebarsTemplates/render-handlebars-template.ts index ffb18bd4f4..bebd9a1ca2 100644 --- a/apps/products-feed/src/modules/handlebarsTemplates/render-handlebars-template.ts +++ b/apps/products-feed/src/modules/handlebarsTemplates/render-handlebars-template.ts @@ -1,6 +1,7 @@ // TODO: PF and EAM apps use handlebars. Extract this module to shared package. import Handlebars from "handlebars"; + import { createLogger } from "../../logger"; const logger = createLogger("renderHandlebarsTemplate"); diff --git a/apps/products-feed/src/modules/handlebarsTemplates/transform-template-format.test.ts b/apps/products-feed/src/modules/handlebarsTemplates/transform-template-format.test.ts index 41e1ebdcd3..fe2130fb69 100644 --- a/apps/products-feed/src/modules/handlebarsTemplates/transform-template-format.test.ts +++ b/apps/products-feed/src/modules/handlebarsTemplates/transform-template-format.test.ts @@ -1,4 +1,5 @@ import { describe, expect, it } from "vitest"; + import { transformTemplateFormat } from "./transform-template-format"; describe("templateTransformer", () => { diff --git a/apps/products-feed/src/modules/trpc/protected-client-procedure.ts b/apps/products-feed/src/modules/trpc/protected-client-procedure.ts index 0e2ec46d92..ab0201adfd 100644 --- a/apps/products-feed/src/modules/trpc/protected-client-procedure.ts +++ b/apps/products-feed/src/modules/trpc/protected-client-procedure.ts @@ -1,15 +1,16 @@ +import { ProtectedHandlerError } from "@saleor/app-sdk/handlers/next"; import { verifyJWT } from "@saleor/app-sdk/verify-jwt"; -import { middleware, procedure } from "./trpc-server"; +import { REQUIRED_SALEOR_PERMISSIONS } from "@saleor/apps-shared"; import { TRPCError } from "@trpc/server"; -import { ProtectedHandlerError } from "@saleor/app-sdk/handlers/next"; -import { saleorApp } from "../../saleor-app"; -import { AppConfigMetadataManager } from "../app-configuration/app-config-metadata-manager"; + +import { createInstrumentedGraphqlClient } from "../../lib/create-instrumented-graphql-client"; import { createSettingsManager } from "../../lib/metadata-manager"; +import { createLogger } from "../../logger"; +import { saleorApp } from "../../saleor-app"; import { AppConfig } from "../app-configuration/app-config"; +import { AppConfigMetadataManager } from "../app-configuration/app-config-metadata-manager"; import { attachLogger } from "./middlewares"; -import { createLogger } from "../../logger"; -import { createInstrumentedGraphqlClient } from "../../lib/create-instrumented-graphql-client"; -import { REQUIRED_SALEOR_PERMISSIONS } from "@saleor/apps-shared"; +import { middleware, procedure } from "./trpc-server"; const attachAppToken = middleware(async ({ ctx, next }) => { const logger = createLogger("attachAppToken"); diff --git a/apps/products-feed/src/modules/trpc/trpc-app-router.ts b/apps/products-feed/src/modules/trpc/trpc-app-router.ts index 155fc47767..695757a418 100644 --- a/apps/products-feed/src/modules/trpc/trpc-app-router.ts +++ b/apps/products-feed/src/modules/trpc/trpc-app-router.ts @@ -1,7 +1,7 @@ -import { channelsRouter } from "../app-configuration/channels/channels.router"; -import { router } from "./trpc-server"; import { appConfigurationRouter } from "../app-configuration/app-configuration.router"; +import { channelsRouter } from "../app-configuration/channels/channels.router"; import { categoryMappingRouter } from "../category-mapping/category-mapping.router"; +import { router } from "./trpc-server"; export const appRouter = router({ channels: channelsRouter, diff --git a/apps/products-feed/src/modules/trpc/trpc-client.ts b/apps/products-feed/src/modules/trpc/trpc-client.ts index 7411da98e9..e7a5488a08 100644 --- a/apps/products-feed/src/modules/trpc/trpc-client.ts +++ b/apps/products-feed/src/modules/trpc/trpc-client.ts @@ -1,7 +1,7 @@ +import { SALEOR_API_URL_HEADER, SALEOR_AUTHORIZATION_BEARER_HEADER } from "@saleor/app-sdk/const"; import { httpBatchLink } from "@trpc/client"; import { createTRPCNext } from "@trpc/next"; -import { SALEOR_API_URL_HEADER, SALEOR_AUTHORIZATION_BEARER_HEADER } from "@saleor/app-sdk/const"; import { appBridgeInstance } from "../../pages/_app"; import { AppRouter } from "./trpc-app-router"; diff --git a/apps/products-feed/src/modules/trpc/trpc-context.ts b/apps/products-feed/src/modules/trpc/trpc-context.ts index b5240843c0..ed38662887 100644 --- a/apps/products-feed/src/modules/trpc/trpc-context.ts +++ b/apps/products-feed/src/modules/trpc/trpc-context.ts @@ -1,6 +1,6 @@ -import * as trpcNext from "@trpc/server/adapters/next"; import { SALEOR_API_URL_HEADER, SALEOR_AUTHORIZATION_BEARER_HEADER } from "@saleor/app-sdk/const"; import { inferAsyncReturnType } from "@trpc/server"; +import * as trpcNext from "@trpc/server/adapters/next"; export const createTrpcContext = async ({ res, req }: trpcNext.CreateNextContextOptions) => { return { diff --git a/apps/products-feed/src/modules/trpc/trpc-server.ts b/apps/products-feed/src/modules/trpc/trpc-server.ts index 9a930bde9a..1729a7e1aa 100644 --- a/apps/products-feed/src/modules/trpc/trpc-server.ts +++ b/apps/products-feed/src/modules/trpc/trpc-server.ts @@ -1,6 +1,7 @@ +import { Permission } from "@saleor/app-sdk/types"; import { initTRPC } from "@trpc/server"; + import { TrpcContext } from "./trpc-context"; -import { Permission } from "@saleor/app-sdk/types"; interface Meta { requiredClientPermissions?: Permission[]; diff --git a/apps/products-feed/src/pages/_app.tsx b/apps/products-feed/src/pages/_app.tsx index 59af86651d..30796e65bd 100644 --- a/apps/products-feed/src/pages/_app.tsx +++ b/apps/products-feed/src/pages/_app.tsx @@ -1,12 +1,14 @@ import "@saleor/macaw-ui/style"; + import { AppBridge, AppBridgeProvider } from "@saleor/app-sdk/app-bridge"; -import React from "react"; -import { AppProps } from "next/app"; -import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; import { RoutePropagator } from "@saleor/app-sdk/app-bridge/next"; -import { ThemeSynchronizer } from "../lib/theme-synchronizer"; -import { Box, ThemeProvider } from "@saleor/macaw-ui"; import { NoSSRWrapper } from "@saleor/apps-shared"; +import { Box, ThemeProvider } from "@saleor/macaw-ui"; +import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; +import { AppProps } from "next/app"; +import React from "react"; + +import { ThemeSynchronizer } from "../lib/theme-synchronizer"; import { trpcClient } from "../modules/trpc/trpc-client"; /** diff --git a/apps/products-feed/src/pages/api/register.ts b/apps/products-feed/src/pages/api/register.ts index 5f4b93cb19..679df77a60 100644 --- a/apps/products-feed/src/pages/api/register.ts +++ b/apps/products-feed/src/pages/api/register.ts @@ -1,10 +1,10 @@ import { createAppRegisterHandler } from "@saleor/app-sdk/handlers/next"; -import { createLogger } from "../../logger"; - import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; -import { saleorApp } from "../../saleor-app"; import { withOtel } from "@saleor/apps-otel"; + +import { createLogger } from "../../logger"; import { loggerContext } from "../../logger-context"; +import { saleorApp } from "../../saleor-app"; const allowedUrlsPattern = process.env.ALLOWED_DOMAIN_PATTERN; diff --git a/apps/products-feed/src/pages/api/trpc/[trpc].ts b/apps/products-feed/src/pages/api/trpc/[trpc].ts index 5c5dcd02f6..13e8b98c5f 100644 --- a/apps/products-feed/src/pages/api/trpc/[trpc].ts +++ b/apps/products-feed/src/pages/api/trpc/[trpc].ts @@ -1,11 +1,12 @@ -import * as trpcNext from "@trpc/server/adapters/next"; -import { createTrpcContext } from "../../../modules/trpc/trpc-context"; -import { appRouter } from "../../../modules/trpc/trpc-app-router"; -import { withOtel } from "@saleor/apps-otel"; +import { createProtectedHandler } from "@saleor/app-sdk/handlers/next"; import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; -import { loggerContext } from "../../../logger-context"; +import { withOtel } from "@saleor/apps-otel"; +import * as trpcNext from "@trpc/server/adapters/next"; + import { createLogger } from "../../../logger"; -import { createProtectedHandler } from "@saleor/app-sdk/handlers/next"; +import { loggerContext } from "../../../logger-context"; +import { appRouter } from "../../../modules/trpc/trpc-app-router"; +import { createTrpcContext } from "../../../modules/trpc/trpc-context"; import { saleorApp } from "../../../saleor-app"; const logger = createLogger("tRPC error"); diff --git a/apps/products-feed/src/pages/categories.tsx b/apps/products-feed/src/pages/categories.tsx index 2a806a7d46..84b6ffbe77 100644 --- a/apps/products-feed/src/pages/categories.tsx +++ b/apps/products-feed/src/pages/categories.tsx @@ -1,6 +1,6 @@ -import { NextPage } from "next"; import { Breadcrumbs } from "@saleor/apps-ui"; import { Box, Text } from "@saleor/macaw-ui"; +import { NextPage } from "next"; import dynamic from "next/dynamic"; const DynamicCategoryMapping = dynamic( diff --git a/apps/products-feed/src/pages/not-ready.tsx b/apps/products-feed/src/pages/not-ready.tsx index bdeda5b08d..7e49b949b1 100644 --- a/apps/products-feed/src/pages/not-ready.tsx +++ b/apps/products-feed/src/pages/not-ready.tsx @@ -1,6 +1,6 @@ +import { actions, useAppBridge } from "@saleor/app-sdk/app-bridge"; import { Box, Button, Text } from "@saleor/macaw-ui"; import React from "react"; -import { actions, useAppBridge } from "@saleor/app-sdk/app-bridge"; const NotReadyPage = () => { const { appBridge } = useAppBridge(); diff --git a/apps/search/scripts/deploy.ts b/apps/search/scripts/deploy.ts index 3fe73586c6..dfec93f9ef 100644 --- a/apps/search/scripts/deploy.ts +++ b/apps/search/scripts/deploy.ts @@ -1,6 +1,7 @@ -import { exportSentryReleaseEnvironmentVariable } from "@saleor/sentry-utils"; import { execSync } from "node:child_process"; +import { exportSentryReleaseEnvironmentVariable } from "@saleor/sentry-utils"; + import packageJson from "../package.json"; exportSentryReleaseEnvironmentVariable(packageJson.version); diff --git a/apps/search/src/domain/WebhookActivityToggler.service.test.ts b/apps/search/src/domain/WebhookActivityToggler.service.test.ts index 08e68efcb3..cead5db581 100644 --- a/apps/search/src/domain/WebhookActivityToggler.service.test.ts +++ b/apps/search/src/domain/WebhookActivityToggler.service.test.ts @@ -1,5 +1,6 @@ import { Client } from "urql"; import { beforeEach, describe, expect, it, vi } from "vitest"; + import { IWebhooksActivityClient, WebhookActivityTogglerService, diff --git a/apps/search/src/lib/algolia/algolia-credentials-verifier.ts b/apps/search/src/lib/algolia/algolia-credentials-verifier.ts index d6a3f9e208..17621afcb7 100644 --- a/apps/search/src/lib/algolia/algolia-credentials-verifier.ts +++ b/apps/search/src/lib/algolia/algolia-credentials-verifier.ts @@ -1,4 +1,5 @@ import Algolia from "algoliasearch"; + import { createLogger } from "../logger"; export interface IAlgoliaCredentialsVerifier { diff --git a/apps/search/src/lib/algolia/algoliaUtils.test.ts b/apps/search/src/lib/algolia/algoliaUtils.test.ts index e76616e316..7603ba8327 100644 --- a/apps/search/src/lib/algolia/algoliaUtils.test.ts +++ b/apps/search/src/lib/algolia/algoliaUtils.test.ts @@ -1,6 +1,7 @@ import { describe, expect, it } from "vitest"; -import { channelListingToAlgoliaIndexId, productAndVariantToAlgolia } from "./algoliaUtils"; + import { AttributeInputTypeEnum } from "../../../generated/graphql"; +import { channelListingToAlgoliaIndexId, productAndVariantToAlgolia } from "./algoliaUtils"; describe("algoliaUtils", function () { describe("channelListingToAlgoliaIndexId", function () { diff --git a/apps/search/src/lib/algolia/algoliaUtils.ts b/apps/search/src/lib/algolia/algoliaUtils.ts index e8dc5f71fd..f7b33a8dea 100644 --- a/apps/search/src/lib/algolia/algoliaUtils.ts +++ b/apps/search/src/lib/algolia/algoliaUtils.ts @@ -1,13 +1,14 @@ import { EditorJsPlaintextRenderer } from "@saleor/apps-shared"; + import { AttributeInputTypeEnum, ProductAttributesDataFragment, ProductVariantWebhookPayloadFragment, } from "../../../generated/graphql"; +import { AlgoliaRootFields, AlgoliaRootFieldsKeys } from "../algolia-fields"; import { isNotNil } from "../isNotNil"; import { safeParseJson } from "../safe-parse-json"; import { metadataToAlgoliaAttribute } from "./metadata-to-algolia-attribute"; -import { AlgoliaRootFields, AlgoliaRootFieldsKeys } from "../algolia-fields"; type PartialChannelListing = { channel: { diff --git a/apps/search/src/lib/algolia/getAlgoliaConfiguration.ts b/apps/search/src/lib/algolia/getAlgoliaConfiguration.ts index 5da7a13ac2..c8a4fa3e1b 100644 --- a/apps/search/src/lib/algolia/getAlgoliaConfiguration.ts +++ b/apps/search/src/lib/algolia/getAlgoliaConfiguration.ts @@ -1,8 +1,9 @@ import { AuthData } from "@saleor/app-sdk/APL"; -import { createSettingsManager } from "../metadata"; + import { AppConfigMetadataManager } from "../../modules/configuration/app-config-metadata-manager"; -import { createLogger } from "../logger"; import { createInstrumentedGraphqlClient } from "../create-instrumented-graphql-client"; +import { createLogger } from "../logger"; +import { createSettingsManager } from "../metadata"; interface GetAlgoliaConfigurationArgs { authData: AuthData; diff --git a/apps/search/src/lib/algolia/metadata-to-algolia-attribute.test.ts b/apps/search/src/lib/algolia/metadata-to-algolia-attribute.test.ts index 96e0e803c0..849f2e8960 100644 --- a/apps/search/src/lib/algolia/metadata-to-algolia-attribute.test.ts +++ b/apps/search/src/lib/algolia/metadata-to-algolia-attribute.test.ts @@ -1,4 +1,5 @@ import { describe, expect, it } from "vitest"; + import { metadataToAlgoliaAttribute } from "./metadata-to-algolia-attribute"; describe("metadataToAlgoliaAttribute", () => { diff --git a/apps/search/src/lib/create-instrumented-graphql-client.ts b/apps/search/src/lib/create-instrumented-graphql-client.ts index cceadaff26..f43a9921d6 100644 --- a/apps/search/src/lib/create-instrumented-graphql-client.ts +++ b/apps/search/src/lib/create-instrumented-graphql-client.ts @@ -1,5 +1,5 @@ -import { createGraphQLClient, CreateGraphQLClientArgs } from "@saleor/apps-shared"; import { otelExchange } from "@saleor/apps-otel"; +import { createGraphQLClient, CreateGraphQLClientArgs } from "@saleor/apps-shared"; type CreateGraphQLClientProps = Omit; diff --git a/apps/search/src/lib/useIndicesSetup.tsx b/apps/search/src/lib/useIndicesSetup.tsx index 65d39fdd05..94ff6b683c 100644 --- a/apps/search/src/lib/useIndicesSetup.tsx +++ b/apps/search/src/lib/useIndicesSetup.tsx @@ -1,7 +1,7 @@ -import { useMutation } from "@tanstack/react-query"; import { useAuthenticatedFetch } from "@saleor/app-sdk/app-bridge"; -import { useCallback } from "react"; import { useDashboardNotification } from "@saleor/apps-shared"; +import { useMutation } from "@tanstack/react-query"; +import { useCallback } from "react"; export const useIndicesSetupMutation = () => { const fetch: typeof window.fetch = useAuthenticatedFetch(); diff --git a/apps/search/src/lib/useWebhooksStatus.tsx b/apps/search/src/lib/useWebhooksStatus.tsx index 80eda6f5a9..b4159bd427 100644 --- a/apps/search/src/lib/useWebhooksStatus.tsx +++ b/apps/search/src/lib/useWebhooksStatus.tsx @@ -1,6 +1,7 @@ -import { useQuery } from "@tanstack/react-query"; import { useAuthenticatedFetch } from "@saleor/app-sdk/app-bridge"; +import { useQuery } from "@tanstack/react-query"; import { useCallback } from "react"; + import { WebhooksStatusResponse } from "../pages/api/webhooks-status"; export const useWebhooksStatus = () => { diff --git a/apps/search/src/lib/useWebhooksUpdate.tsx b/apps/search/src/lib/useWebhooksUpdate.tsx index bf16d8a103..af27c61200 100644 --- a/apps/search/src/lib/useWebhooksUpdate.tsx +++ b/apps/search/src/lib/useWebhooksUpdate.tsx @@ -1,7 +1,7 @@ -import { useMutation, useQueryClient } from "@tanstack/react-query"; import { useAuthenticatedFetch } from "@saleor/app-sdk/app-bridge"; -import { useCallback } from "react"; import { useDashboardNotification } from "@saleor/apps-shared"; +import { useMutation, useQueryClient } from "@tanstack/react-query"; +import { useCallback } from "react"; export const useWebhooksUpdateMutation = () => { const fetch: typeof window.fetch = useAuthenticatedFetch(); diff --git a/apps/search/src/modules/configuration/app-config-metadata-manager.ts b/apps/search/src/modules/configuration/app-config-metadata-manager.ts index 2cb5fc9cc1..901100e675 100644 --- a/apps/search/src/modules/configuration/app-config-metadata-manager.ts +++ b/apps/search/src/modules/configuration/app-config-metadata-manager.ts @@ -1,9 +1,9 @@ +import { AuthData } from "@saleor/app-sdk/APL"; import { SettingsManager } from "@saleor/app-sdk/settings-manager"; - import { createGraphQLClient } from "@saleor/apps-shared"; -import { AuthData } from "@saleor/app-sdk/APL"; -import { AppConfig } from "./configuration"; + import { createSettingsManager } from "../../lib/metadata"; +import { AppConfig } from "./configuration"; export class AppConfigMetadataManager { public readonly metadataKey = "app-config-v2"; diff --git a/apps/search/src/modules/configuration/configuration.router.ts b/apps/search/src/modules/configuration/configuration.router.ts index 1826c31552..f121bd6efe 100644 --- a/apps/search/src/modules/configuration/configuration.router.ts +++ b/apps/search/src/modules/configuration/configuration.router.ts @@ -1,13 +1,14 @@ import { TRPCError } from "@trpc/server"; + import { WebhookActivityTogglerService } from "../../domain/WebhookActivityToggler.service"; +import { algoliaCredentialsVerifier } from "../../lib/algolia/algolia-credentials-verifier"; +import { createLogger } from "../../lib/logger"; import { createSettingsManager } from "../../lib/metadata"; import { protectedClientProcedure } from "../trpc/protected-client-procedure"; import { router } from "../trpc/trpc-server"; import { AppConfigMetadataManager } from "./app-config-metadata-manager"; import { AppConfigurationSchema, FieldsConfigSchema } from "./configuration"; import { fetchLegacyConfiguration } from "./legacy-configuration"; -import { createLogger } from "../../lib/logger"; -import { algoliaCredentialsVerifier } from "../../lib/algolia/algolia-credentials-verifier"; const logger = createLogger("configuration.router"); diff --git a/apps/search/src/modules/configuration/configuration.ts b/apps/search/src/modules/configuration/configuration.ts index 2323d25387..3b8281f904 100644 --- a/apps/search/src/modules/configuration/configuration.ts +++ b/apps/search/src/modules/configuration/configuration.ts @@ -1,4 +1,5 @@ import { z } from "zod"; + import { AlgoliaRootFieldsKeys } from "../../lib/algolia-fields"; export const AppConfigurationSchema = z.object({ diff --git a/apps/search/src/modules/configuration/legacy-configuration.ts b/apps/search/src/modules/configuration/legacy-configuration.ts index cf4cff8522..8ba8fa6a5d 100644 --- a/apps/search/src/modules/configuration/legacy-configuration.ts +++ b/apps/search/src/modules/configuration/legacy-configuration.ts @@ -1,4 +1,5 @@ import { SettingsManager } from "@saleor/app-sdk/settings-manager"; + import { AppConfigurationFields } from "./configuration"; /** diff --git a/apps/search/src/modules/trpc/trpc-client.ts b/apps/search/src/modules/trpc/trpc-client.ts index 9cce5af6b3..8f0e71a0c8 100644 --- a/apps/search/src/modules/trpc/trpc-client.ts +++ b/apps/search/src/modules/trpc/trpc-client.ts @@ -1,10 +1,9 @@ +import { SALEOR_API_URL_HEADER, SALEOR_AUTHORIZATION_BEARER_HEADER } from "@saleor/app-sdk/const"; import { httpBatchLink } from "@trpc/client"; import { createTRPCNext } from "@trpc/next"; -import { SALEOR_API_URL_HEADER, SALEOR_AUTHORIZATION_BEARER_HEADER } from "@saleor/app-sdk/const"; - -import { AppRouter } from "./trpc-app-router"; import { appBridgeInstance } from "../../pages/_app"; +import { AppRouter } from "./trpc-app-router"; function getBaseUrl() { if (typeof window !== "undefined") return ""; diff --git a/apps/search/src/modules/trpc/trpc-context.ts b/apps/search/src/modules/trpc/trpc-context.ts index edad11659d..401b68d6a0 100644 --- a/apps/search/src/modules/trpc/trpc-context.ts +++ b/apps/search/src/modules/trpc/trpc-context.ts @@ -1,6 +1,6 @@ -import * as trpcNext from "@trpc/server/adapters/next"; import { SALEOR_API_URL_HEADER, SALEOR_AUTHORIZATION_BEARER_HEADER } from "@saleor/app-sdk/const"; import { inferAsyncReturnType } from "@trpc/server"; +import * as trpcNext from "@trpc/server/adapters/next"; const getBaseUrl = (headers: { [name: string]: string | string[] | undefined }): string => { const { host, "x-forwarded-proto": xForwardedProto = "http" } = headers; diff --git a/apps/search/src/modules/trpc/trpc-server.ts b/apps/search/src/modules/trpc/trpc-server.ts index fc5be26a5b..93e84c1d26 100644 --- a/apps/search/src/modules/trpc/trpc-server.ts +++ b/apps/search/src/modules/trpc/trpc-server.ts @@ -1,8 +1,9 @@ -import { initTRPC } from "@trpc/server"; -import { TrpcContext } from "./trpc-context"; import { Permission } from "@saleor/app-sdk/types"; +import { initTRPC } from "@trpc/server"; import { ZodError } from "zod"; +import { TrpcContext } from "./trpc-context"; + interface Meta { requiredClientPermissions?: Permission[]; updateWebhooks?: boolean; diff --git a/apps/search/src/pages/_app.tsx b/apps/search/src/pages/_app.tsx index 800ab17252..15c501f5e6 100644 --- a/apps/search/src/pages/_app.tsx +++ b/apps/search/src/pages/_app.tsx @@ -1,12 +1,14 @@ import "../styles/globals.css"; import "@saleor/macaw-ui/style"; + import { AppBridge, AppBridgeProvider } from "@saleor/app-sdk/app-bridge"; -import React from "react"; -import { AppProps } from "next/app"; -import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; import { RoutePropagator } from "@saleor/app-sdk/app-bridge/next"; -import { Box, ThemeProvider } from "@saleor/macaw-ui"; import { GraphQLProvider, NoSSRWrapper, ThemeSynchronizer } from "@saleor/apps-shared"; +import { Box, ThemeProvider } from "@saleor/macaw-ui"; +import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; +import { AppProps } from "next/app"; +import React from "react"; + import { trpcClient } from "../modules/trpc/trpc-client"; /** diff --git a/apps/search/src/pages/api/manifest.ts b/apps/search/src/pages/api/manifest.ts index ee7abc7715..6018c43503 100644 --- a/apps/search/src/pages/api/manifest.ts +++ b/apps/search/src/pages/api/manifest.ts @@ -1,10 +1,10 @@ import { createManifestHandler } from "@saleor/app-sdk/handlers/next"; import { AppManifest } from "@saleor/app-sdk/types"; +import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; +import { withOtel } from "@saleor/apps-otel"; import packageJson from "../../../package.json"; import { appWebhooks } from "../../../webhooks"; -import { withOtel } from "@saleor/apps-otel"; -import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; import { loggerContext } from "../../lib/logger-context"; export default wrapWithLoggerContext( diff --git a/apps/search/src/pages/api/register.ts b/apps/search/src/pages/api/register.ts index 539f28cdc0..5576e30232 100644 --- a/apps/search/src/pages/api/register.ts +++ b/apps/search/src/pages/api/register.ts @@ -1,7 +1,8 @@ import { createAppRegisterHandler } from "@saleor/app-sdk/handlers/next"; -import { saleorApp } from "../../../saleor-app"; -import { withOtel } from "@saleor/apps-otel"; import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; +import { withOtel } from "@saleor/apps-otel"; + +import { saleorApp } from "../../../saleor-app"; import { loggerContext } from "../../lib/logger-context"; const allowedUrlsPattern = process.env.ALLOWED_DOMAIN_PATTERN; diff --git a/apps/search/src/pages/api/trpc/[trpc].ts b/apps/search/src/pages/api/trpc/[trpc].ts index af59ad0dca..4d9ea22d87 100644 --- a/apps/search/src/pages/api/trpc/[trpc].ts +++ b/apps/search/src/pages/api/trpc/[trpc].ts @@ -1,9 +1,10 @@ -import * as trpcNext from "@trpc/server/adapters/next"; -import { createTrpcContext } from "../../../modules/trpc/trpc-context"; -import { appRouter } from "../../../modules/trpc/trpc-app-router"; +import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; import { withOtel } from "@saleor/apps-otel"; +import * as trpcNext from "@trpc/server/adapters/next"; + import { loggerContext } from "../../../lib/logger-context"; -import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; +import { appRouter } from "../../../modules/trpc/trpc-app-router"; +import { createTrpcContext } from "../../../modules/trpc/trpc-context"; export default wrapWithLoggerContext( withOtel( diff --git a/apps/search/src/pages/index.tsx b/apps/search/src/pages/index.tsx index c355f9a139..9fb3be6ec1 100644 --- a/apps/search/src/pages/index.tsx +++ b/apps/search/src/pages/index.tsx @@ -1,8 +1,9 @@ import { useAppBridge, withAuthorization } from "@saleor/app-sdk/app-bridge"; -import { ConfigurationView } from "../views/configuration/configuration.view"; import { isInIframe } from "@saleor/apps-shared"; import { Text } from "@saleor/macaw-ui"; +import { ConfigurationView } from "../views/configuration/configuration.view"; + const IndexPage = () => { const { appBridgeState } = useAppBridge(); diff --git a/apps/search/src/test/handlers/webhooks-status-handler.test.ts b/apps/search/src/test/handlers/webhooks-status-handler.test.ts index 51d0511b3b..e7bb5370f8 100644 --- a/apps/search/src/test/handlers/webhooks-status-handler.test.ts +++ b/apps/search/src/test/handlers/webhooks-status-handler.test.ts @@ -2,11 +2,10 @@ import { NextProtectedApiHandler } from "@saleor/app-sdk/handlers/next"; import { SettingsManager } from "@saleor/app-sdk/settings-manager"; import { createMocks } from "node-mocks-http"; import { Client, OperationResult } from "urql"; -import { beforeEach, describe, expect, it, Mock, vi } from "vitest"; +import { beforeEach, describe, expect, it, vi } from "vitest"; import { FetchOwnWebhooksQuery, WebhookEventTypeAsyncEnum } from "../../../generated/graphql"; import { IWebhookActivityTogglerService } from "../../domain/WebhookActivityToggler.service"; -import { algoliaCredentialsVerifier } from "../../lib/algolia/algolia-credentials-verifier"; import { AppConfig } from "../../modules/configuration/configuration"; import { webhooksStatusHandlerFactory } from "../../pages/api/webhooks-status"; @@ -70,7 +69,8 @@ describe("webhooksStatusHandler", () => { graphqlClientFactory: () => client, }); - (client.query as Mock).mockImplementationOnce(() => { + // @ts-expect-error mocking the request for testing + vi.mocked(client.query).mockImplementationOnce(() => { return { async toPromise() { return appWebhooksResponseData; @@ -88,7 +88,9 @@ describe("webhooksStatusHandler", () => { indexNamePrefix: "test", }); - (settingsManagerMock.get as Mock).mockReturnValueOnce(validConfig.serialize()); + vi.mocked(settingsManagerMock.get).mockImplementation(() => { + return Promise.resolve(validConfig.serialize()); + }); const { req, res } = createMocks({}); diff --git a/apps/search/src/webhooks/definitions/product-created.ts b/apps/search/src/webhooks/definitions/product-created.ts index b67253a9ee..2ef4817fca 100644 --- a/apps/search/src/webhooks/definitions/product-created.ts +++ b/apps/search/src/webhooks/definitions/product-created.ts @@ -1,4 +1,5 @@ import { SaleorAsyncWebhook } from "@saleor/app-sdk/handlers/next"; + import { ProductCreated, ProductCreatedDocument } from "../../../generated/graphql"; import { saleorApp } from "../../../saleor-app"; diff --git a/apps/search/src/webhooks/definitions/product-deleted.ts b/apps/search/src/webhooks/definitions/product-deleted.ts index a9066169ff..6c357b7c91 100644 --- a/apps/search/src/webhooks/definitions/product-deleted.ts +++ b/apps/search/src/webhooks/definitions/product-deleted.ts @@ -1,4 +1,5 @@ import { SaleorAsyncWebhook } from "@saleor/app-sdk/handlers/next"; + import { ProductDeleted, ProductDeletedDocument } from "../../../generated/graphql"; import { saleorApp } from "../../../saleor-app"; diff --git a/apps/search/src/webhooks/definitions/product-updated.ts b/apps/search/src/webhooks/definitions/product-updated.ts index 7384e02694..e3f1df1d7d 100644 --- a/apps/search/src/webhooks/definitions/product-updated.ts +++ b/apps/search/src/webhooks/definitions/product-updated.ts @@ -1,4 +1,5 @@ import { SaleorAsyncWebhook } from "@saleor/app-sdk/handlers/next"; + import { ProductUpdated, ProductUpdatedDocument } from "../../../generated/graphql"; import { saleorApp } from "../../../saleor-app"; diff --git a/apps/search/src/webhooks/definitions/product-variant-back-in-stock.ts b/apps/search/src/webhooks/definitions/product-variant-back-in-stock.ts index 798d522dfc..1370356f59 100644 --- a/apps/search/src/webhooks/definitions/product-variant-back-in-stock.ts +++ b/apps/search/src/webhooks/definitions/product-variant-back-in-stock.ts @@ -1,4 +1,5 @@ import { SaleorAsyncWebhook } from "@saleor/app-sdk/handlers/next"; + import { ProductVariantBackInStock, ProductVariantBackInStockDocument, diff --git a/apps/search/src/webhooks/definitions/product-variant-created.ts b/apps/search/src/webhooks/definitions/product-variant-created.ts index e8d53575ec..ca08bd6598 100644 --- a/apps/search/src/webhooks/definitions/product-variant-created.ts +++ b/apps/search/src/webhooks/definitions/product-variant-created.ts @@ -1,4 +1,5 @@ import { SaleorAsyncWebhook } from "@saleor/app-sdk/handlers/next"; + import { ProductVariantCreated, ProductVariantCreatedDocument } from "../../../generated/graphql"; import { saleorApp } from "../../../saleor-app"; diff --git a/apps/search/src/webhooks/definitions/product-variant-deleted.ts b/apps/search/src/webhooks/definitions/product-variant-deleted.ts index d5457551e4..d2837746ec 100644 --- a/apps/search/src/webhooks/definitions/product-variant-deleted.ts +++ b/apps/search/src/webhooks/definitions/product-variant-deleted.ts @@ -1,4 +1,5 @@ import { SaleorAsyncWebhook } from "@saleor/app-sdk/handlers/next"; + import { ProductVariantDeleted, ProductVariantDeletedDocument } from "../../../generated/graphql"; import { saleorApp } from "../../../saleor-app"; diff --git a/apps/search/src/webhooks/definitions/product-variant-out-of-stock.ts b/apps/search/src/webhooks/definitions/product-variant-out-of-stock.ts index a530038a6c..b8137a1e88 100644 --- a/apps/search/src/webhooks/definitions/product-variant-out-of-stock.ts +++ b/apps/search/src/webhooks/definitions/product-variant-out-of-stock.ts @@ -1,4 +1,5 @@ import { SaleorAsyncWebhook } from "@saleor/app-sdk/handlers/next"; + import { ProductVariantOutOfStock, ProductVariantOutOfStockDocument, diff --git a/apps/search/src/webhooks/definitions/product-variant-updated.ts b/apps/search/src/webhooks/definitions/product-variant-updated.ts index 2391be41d8..07d6e4147f 100644 --- a/apps/search/src/webhooks/definitions/product-variant-updated.ts +++ b/apps/search/src/webhooks/definitions/product-variant-updated.ts @@ -1,4 +1,5 @@ import { SaleorAsyncWebhook } from "@saleor/app-sdk/handlers/next"; + import { ProductVariantUpdated, ProductVariantUpdatedDocument } from "../../../generated/graphql"; import { saleorApp } from "../../../saleor-app"; diff --git a/apps/search/src/webhooks/webhook-context.ts b/apps/search/src/webhooks/webhook-context.ts index 60b7a13191..9b341595d8 100644 --- a/apps/search/src/webhooks/webhook-context.ts +++ b/apps/search/src/webhooks/webhook-context.ts @@ -1,7 +1,8 @@ import { AuthData } from "@saleor/app-sdk/APL"; -import { getAlgoliaConfiguration } from "../lib/algolia/getAlgoliaConfiguration"; + import { ChannelsDocument } from "../../generated/graphql"; import { AlgoliaSearchProvider } from "../lib/algolia/algoliaSearchProvider"; +import { getAlgoliaConfiguration } from "../lib/algolia/getAlgoliaConfiguration"; import { createInstrumentedGraphqlClient } from "../lib/create-instrumented-graphql-client"; /** diff --git a/apps/smtp/scripts/deploy.ts b/apps/smtp/scripts/deploy.ts index 337d5271c2..7ba193f82a 100644 --- a/apps/smtp/scripts/deploy.ts +++ b/apps/smtp/scripts/deploy.ts @@ -1,6 +1,7 @@ -import { exportSentryReleaseEnvironmentVariable } from "@saleor/sentry-utils"; import { execSync } from "node:child_process"; +import { exportSentryReleaseEnvironmentVariable } from "@saleor/sentry-utils"; + import packageJson from "../package.json"; exportSentryReleaseEnvironmentVariable(packageJson.version); diff --git a/apps/smtp/src/components/manage-permissions-text-link.tsx b/apps/smtp/src/components/manage-permissions-text-link.tsx index 4661cc0eb1..29baf6b2f7 100644 --- a/apps/smtp/src/components/manage-permissions-text-link.tsx +++ b/apps/smtp/src/components/manage-permissions-text-link.tsx @@ -1,8 +1,9 @@ import { actions, useAppBridge } from "@saleor/app-sdk/app-bridge"; import { SaleorVersionCompatibilityValidator } from "@saleor/apps-shared"; -import { PermissionEnum } from "../../generated/graphql"; -import { Text } from "@saleor/macaw-ui"; import { TextLink } from "@saleor/apps-ui"; +import { Text } from "@saleor/macaw-ui"; + +import { PermissionEnum } from "../../generated/graphql"; interface ManagePermissionsTextLinkProps { missingPermission: PermissionEnum; diff --git a/apps/smtp/src/lib/create-instrumented-graphql-client.ts b/apps/smtp/src/lib/create-instrumented-graphql-client.ts index cceadaff26..f43a9921d6 100644 --- a/apps/smtp/src/lib/create-instrumented-graphql-client.ts +++ b/apps/smtp/src/lib/create-instrumented-graphql-client.ts @@ -1,5 +1,5 @@ -import { createGraphQLClient, CreateGraphQLClientArgs } from "@saleor/apps-shared"; import { otelExchange } from "@saleor/apps-otel"; +import { createGraphQLClient, CreateGraphQLClientArgs } from "@saleor/apps-shared"; type CreateGraphQLClientProps = Omit; diff --git a/apps/smtp/src/lib/fetch-app-permissions.ts b/apps/smtp/src/lib/fetch-app-permissions.ts index 9a935b7af1..5e64037023 100644 --- a/apps/smtp/src/lib/fetch-app-permissions.ts +++ b/apps/smtp/src/lib/fetch-app-permissions.ts @@ -1,4 +1,5 @@ import { Client, gql } from "urql"; + import { FetchAppPermissionsDocument, FetchAppPermissionsQuery, diff --git a/apps/smtp/src/lib/get-event-form-status.test.ts b/apps/smtp/src/lib/get-event-form-status.test.ts index 62b8df3bd9..a482f59e5e 100644 --- a/apps/smtp/src/lib/get-event-form-status.test.ts +++ b/apps/smtp/src/lib/get-event-form-status.test.ts @@ -1,6 +1,7 @@ import { describe, expect, it } from "vitest"; -import { getEventFormStatus } from "./get-event-form-status"; + import { PermissionEnum } from "../../generated/graphql"; +import { getEventFormStatus } from "./get-event-form-status"; describe("getEventFormStatus", function () { it("No message or disable flag, when event other than GIFT_CARD_SENT is passed", () => { diff --git a/apps/smtp/src/lib/metadata-manager.ts b/apps/smtp/src/lib/metadata-manager.ts index e40ef68ff8..ebb062bf26 100644 --- a/apps/smtp/src/lib/metadata-manager.ts +++ b/apps/smtp/src/lib/metadata-manager.ts @@ -1,5 +1,6 @@ import { EncryptedMetadataManager, MetadataEntry } from "@saleor/app-sdk/settings-manager"; import { Client, gql } from "urql"; + import { FetchAppDetailsDocument, FetchAppDetailsQuery, diff --git a/apps/smtp/src/lib/set-backend-errors.ts b/apps/smtp/src/lib/set-backend-errors.ts index 847f439813..43487753f3 100644 --- a/apps/smtp/src/lib/set-backend-errors.ts +++ b/apps/smtp/src/lib/set-backend-errors.ts @@ -1,7 +1,8 @@ import { TRPCClientErrorLike } from "@trpc/client"; -import { AppRouter } from "../modules/trpc/trpc-app-router"; import { FieldValues, UseFormSetError } from "react-hook-form"; +import { AppRouter } from "../modules/trpc/trpc-app-router"; + type SetBackendErrorsProps = { error: TRPCClientErrorLike; setError?: UseFormSetError; diff --git a/apps/smtp/src/modules/app-configuration/app-configuration.router.ts b/apps/smtp/src/modules/app-configuration/app-configuration.router.ts index 40c4cc437c..174082d1d4 100644 --- a/apps/smtp/src/modules/app-configuration/app-configuration.router.ts +++ b/apps/smtp/src/modules/app-configuration/app-configuration.router.ts @@ -1,7 +1,7 @@ -import { router } from "../trpc/trpc-server"; -import { protectedWithConfigurationServices } from "../trpc/protected-client-procedure-with-services"; import { fetchAppPermissions } from "../../lib/fetch-app-permissions"; import { createLogger } from "../../logger"; +import { protectedWithConfigurationServices } from "../trpc/protected-client-procedure-with-services"; +import { router } from "../trpc/trpc-server"; export const appConfigurationRouter = router({ featureFlags: protectedWithConfigurationServices.query(async ({ ctx }) => { diff --git a/apps/smtp/src/modules/app-configuration/filter-configurations.test.ts b/apps/smtp/src/modules/app-configuration/filter-configurations.test.ts index 6f48f24e65..8aad669932 100644 --- a/apps/smtp/src/modules/app-configuration/filter-configurations.test.ts +++ b/apps/smtp/src/modules/app-configuration/filter-configurations.test.ts @@ -1,4 +1,5 @@ import { describe, expect, it } from "vitest"; + import { FilterableConfiguration, filterConfigurations } from "./filter-configurations"; const enabledConfiguration: FilterableConfiguration = { diff --git a/apps/smtp/src/modules/channels/channels-fetcher.ts b/apps/smtp/src/modules/channels/channels-fetcher.ts index 49eeb93126..cbda8b631f 100644 --- a/apps/smtp/src/modules/channels/channels-fetcher.ts +++ b/apps/smtp/src/modules/channels/channels-fetcher.ts @@ -1,4 +1,5 @@ import { Client, gql } from "urql"; + import { FetchChannelsDocument } from "../../../generated/graphql"; gql` diff --git a/apps/smtp/src/modules/channels/channels.router.ts b/apps/smtp/src/modules/channels/channels.router.ts index fc3f42d9c7..e329410f78 100644 --- a/apps/smtp/src/modules/channels/channels.router.ts +++ b/apps/smtp/src/modules/channels/channels.router.ts @@ -1,7 +1,7 @@ -import { ChannelsFetcher } from "./channels-fetcher"; -import { router } from "../trpc/trpc-server"; -import { protectedClientProcedure } from "../trpc/protected-client-procedure"; import { createInstrumentedGraphqlClient } from "../../lib/create-instrumented-graphql-client"; +import { protectedClientProcedure } from "../trpc/protected-client-procedure"; +import { router } from "../trpc/trpc-server"; +import { ChannelsFetcher } from "./channels-fetcher"; export const channelsRouter = router({ fetch: protectedClientProcedure.query(async ({ ctx }) => { diff --git a/apps/smtp/src/modules/channels/is-available-in-channel.test.ts b/apps/smtp/src/modules/channels/is-available-in-channel.test.ts index 329ecb38fa..f932ad3409 100644 --- a/apps/smtp/src/modules/channels/is-available-in-channel.test.ts +++ b/apps/smtp/src/modules/channels/is-available-in-channel.test.ts @@ -1,4 +1,5 @@ import { describe, expect, it } from "vitest"; + import { isAvailableInChannel } from "./is-available-in-channel"; describe("isAvailableInChannel", function () { diff --git a/apps/smtp/src/modules/event-handlers/default-payloads.ts b/apps/smtp/src/modules/event-handlers/default-payloads.ts index 4d5d0a1d93..7f3dd2bc5c 100644 --- a/apps/smtp/src/modules/event-handlers/default-payloads.ts +++ b/apps/smtp/src/modules/event-handlers/default-payloads.ts @@ -1,4 +1,3 @@ -import { MessageEventTypes } from "./message-event-types"; import { GiftCardSentWebhookPayloadFragment, InvoiceSentWebhookPayloadFragment, @@ -19,6 +18,7 @@ import { NotifyPayloadAccountPasswordReset, NotifyPayloadFulfillmentUpdate, } from "../../lib/notify-event-types"; +import { MessageEventTypes } from "./message-event-types"; const exampleOrderPayload: OrderDetailsFragment = { id: "T3JkZXI6NTdiNTBhNDAtYzRmYi00YjQzLWIxODgtM2JhZmRlMTc3MGQ5", diff --git a/apps/smtp/src/modules/event-handlers/use-case/send-event-messages.use-case.factory.ts b/apps/smtp/src/modules/event-handlers/use-case/send-event-messages.use-case.factory.ts index 2a94d73c43..51f2d8db5b 100644 --- a/apps/smtp/src/modules/event-handlers/use-case/send-event-messages.use-case.factory.ts +++ b/apps/smtp/src/modules/event-handlers/use-case/send-event-messages.use-case.factory.ts @@ -1,15 +1,16 @@ import { AuthData } from "@saleor/app-sdk/APL"; -import { SendEventMessagesUseCase } from "./send-event-messages.use-case"; -import { SmtpEmailSender } from "../../smtp/services/smtp-email-sender"; + +import { createInstrumentedGraphqlClient } from "../../../lib/create-instrumented-graphql-client"; +import { createSettingsManager } from "../../../lib/metadata-manager"; +import { FeatureFlagService } from "../../feature-flag-service/feature-flag-service"; +import { SmtpConfigurationService } from "../../smtp/configuration/smtp-configuration.service"; +import { SmtpMetadataManager } from "../../smtp/configuration/smtp-metadata-manager"; import { EmailCompiler } from "../../smtp/services/email-compiler"; import { HandlebarsTemplateCompiler } from "../../smtp/services/handlebars-template-compiler"; import { HtmlToTextCompiler } from "../../smtp/services/html-to-text-compiler"; import { MjmlCompiler } from "../../smtp/services/mjml-compiler"; -import { SmtpConfigurationService } from "../../smtp/configuration/smtp-configuration.service"; -import { FeatureFlagService } from "../../feature-flag-service/feature-flag-service"; -import { SmtpMetadataManager } from "../../smtp/configuration/smtp-metadata-manager"; -import { createSettingsManager } from "../../../lib/metadata-manager"; -import { createInstrumentedGraphqlClient } from "../../../lib/create-instrumented-graphql-client"; +import { SmtpEmailSender } from "../../smtp/services/smtp-email-sender"; +import { SendEventMessagesUseCase } from "./send-event-messages.use-case"; export class SendEventMessagesUseCaseFactory { createFromAuthData(authData: AuthData): SendEventMessagesUseCase { diff --git a/apps/smtp/src/modules/event-handlers/use-case/send-event-messages.use-case.test.ts b/apps/smtp/src/modules/event-handlers/use-case/send-event-messages.use-case.test.ts index ea0449e61d..eca47ffb87 100644 --- a/apps/smtp/src/modules/event-handlers/use-case/send-event-messages.use-case.test.ts +++ b/apps/smtp/src/modules/event-handlers/use-case/send-event-messages.use-case.test.ts @@ -1,13 +1,14 @@ -import { beforeEach, describe, expect, it, vi } from "vitest"; -import { SendEventMessagesUseCase } from "./send-event-messages.use-case"; -import { SendEventMessagesUseCaseFactory } from "./send-event-messages.use-case.factory"; import { err, errAsync, ok, okAsync, Result } from "neverthrow"; -import { CompiledEmail, IEmailCompiler } from "../../smtp/services/email-compiler"; +import { beforeEach, describe, expect, it, vi } from "vitest"; + import { BaseError } from "../../../errors"; -import { ISMTPEmailSender } from "../../smtp/services/smtp-email-sender"; -import { IGetSmtpConfiguration } from "../../smtp/configuration/smtp-configuration.service"; import { SmtpConfiguration } from "../../smtp/configuration/smtp-config-schema"; +import { IGetSmtpConfiguration } from "../../smtp/configuration/smtp-configuration.service"; +import { CompiledEmail, IEmailCompiler } from "../../smtp/services/email-compiler"; +import { ISMTPEmailSender } from "../../smtp/services/smtp-email-sender"; import { MessageEventTypes } from "../message-event-types"; +import { SendEventMessagesUseCase } from "./send-event-messages.use-case"; +import { SendEventMessagesUseCaseFactory } from "./send-event-messages.use-case.factory"; const EVENT_TYPE = "ACCOUNT_DELETE" satisfies MessageEventTypes; diff --git a/apps/smtp/src/modules/feature-flag-service/feature-flag-service.test.ts b/apps/smtp/src/modules/feature-flag-service/feature-flag-service.test.ts index 1ebf404094..47bedd75d6 100644 --- a/apps/smtp/src/modules/feature-flag-service/feature-flag-service.test.ts +++ b/apps/smtp/src/modules/feature-flag-service/feature-flag-service.test.ts @@ -1,9 +1,9 @@ +import { Client } from "urql"; import { afterEach, describe, expect, it, vi } from "vitest"; + import { FeatureFlagService } from "./feature-flag-service"; import * as fetchSaleorVersionExports from "./fetch-saleor-version"; -import { Client } from "urql"; - describe("FeatureFlagService", function () { const createMockedClient = () => ({}) as Client; diff --git a/apps/smtp/src/modules/feature-flag-service/feature-flag-service.ts b/apps/smtp/src/modules/feature-flag-service/feature-flag-service.ts index 5f5b07f28d..9ae5fea714 100644 --- a/apps/smtp/src/modules/feature-flag-service/feature-flag-service.ts +++ b/apps/smtp/src/modules/feature-flag-service/feature-flag-service.ts @@ -1,7 +1,8 @@ import { Client } from "urql"; -import { FeatureFlagsState, getFeatureFlags } from "./get-feature-flags"; -import { fetchSaleorVersion } from "./fetch-saleor-version"; + import { createLogger } from "../../logger"; +import { fetchSaleorVersion } from "./fetch-saleor-version"; +import { FeatureFlagsState, getFeatureFlags } from "./get-feature-flags"; const logger = createLogger("FeatureFlagService"); diff --git a/apps/smtp/src/modules/feature-flag-service/fetch-saleor-version.ts b/apps/smtp/src/modules/feature-flag-service/fetch-saleor-version.ts index ac7177fe5e..c5a6cc86df 100644 --- a/apps/smtp/src/modules/feature-flag-service/fetch-saleor-version.ts +++ b/apps/smtp/src/modules/feature-flag-service/fetch-saleor-version.ts @@ -1,4 +1,5 @@ import { Client, gql } from "urql"; + import { FetchSaleorVersionDocument, FetchSaleorVersionQuery } from "../../../generated/graphql"; gql` diff --git a/apps/smtp/src/modules/feature-flag-service/get-feature-flags.test.ts b/apps/smtp/src/modules/feature-flag-service/get-feature-flags.test.ts index 66daaeeac9..79f6244386 100644 --- a/apps/smtp/src/modules/feature-flag-service/get-feature-flags.test.ts +++ b/apps/smtp/src/modules/feature-flag-service/get-feature-flags.test.ts @@ -1,4 +1,5 @@ import { describe, expect, it } from "vitest"; + import { getFeatureFlags } from "./get-feature-flags"; describe("getFeatureFlags", function () { diff --git a/apps/smtp/src/modules/smtp/configuration/smtp-config-input-schema.ts b/apps/smtp/src/modules/smtp/configuration/smtp-config-input-schema.ts index e41a6505c4..282b1ea237 100644 --- a/apps/smtp/src/modules/smtp/configuration/smtp-config-input-schema.ts +++ b/apps/smtp/src/modules/smtp/configuration/smtp-config-input-schema.ts @@ -1,7 +1,8 @@ import { z } from "zod"; + +import { channelConfigurationSchema } from "../../channels/channel-configuration-schema"; import { messageEventTypes } from "../../event-handlers/message-event-types"; import { smtpConfigurationEventSchema, smtpConfigurationSchema } from "./smtp-config-schema"; -import { channelConfigurationSchema } from "../../channels/channel-configuration-schema"; export const smtpCreateConfigurationInputSchema = smtpConfigurationSchema.pick({ name: true, diff --git a/apps/smtp/src/modules/smtp/configuration/smtp-config-schema.ts b/apps/smtp/src/modules/smtp/configuration/smtp-config-schema.ts index 244c82ac1c..cffcdbd6cf 100644 --- a/apps/smtp/src/modules/smtp/configuration/smtp-config-schema.ts +++ b/apps/smtp/src/modules/smtp/configuration/smtp-config-schema.ts @@ -1,6 +1,7 @@ import { z } from "zod"; -import { messageEventTypes } from "../../event-handlers/message-event-types"; + import { channelConfigurationSchema } from "../../channels/channel-configuration-schema"; +import { messageEventTypes } from "../../event-handlers/message-event-types"; export const smtpEncryptionTypes = ["NONE", "TLS", "SSL"] as const; export type SmtpEncryptionType = (typeof smtpEncryptionTypes)[number]; diff --git a/apps/smtp/src/modules/smtp/configuration/smtp-configuration.service.test.ts b/apps/smtp/src/modules/smtp/configuration/smtp-configuration.service.test.ts index 330655a008..885991cd35 100644 --- a/apps/smtp/src/modules/smtp/configuration/smtp-configuration.service.test.ts +++ b/apps/smtp/src/modules/smtp/configuration/smtp-configuration.service.test.ts @@ -1,11 +1,12 @@ +import { SettingsManager } from "@saleor/app-sdk/settings-manager"; +import { okAsync } from "neverthrow"; +import { Client } from "urql"; import { describe, expect, it, vi } from "vitest"; + +import { FeatureFlagService } from "../../feature-flag-service/feature-flag-service"; +import { SmtpConfig } from "./smtp-config-schema"; import { SmtpConfigurationService } from "./smtp-configuration.service"; -import { SettingsManager } from "@saleor/app-sdk/settings-manager"; import { SmtpMetadataManager } from "./smtp-metadata-manager"; -import { SmtpConfig } from "./smtp-config-schema"; -import { FeatureFlagService } from "../../feature-flag-service/feature-flag-service"; -import { Client } from "urql"; -import { okAsync } from "neverthrow"; const mockSaleorApiUrl = "https://demo.saleor.io/graphql/"; diff --git a/apps/smtp/src/modules/smtp/configuration/smtp-configuration.service.ts b/apps/smtp/src/modules/smtp/configuration/smtp-configuration.service.ts index 2f37580888..5d3fc03e01 100644 --- a/apps/smtp/src/modules/smtp/configuration/smtp-configuration.service.ts +++ b/apps/smtp/src/modules/smtp/configuration/smtp-configuration.service.ts @@ -1,13 +1,14 @@ -import { SmtpMetadataManager } from "./smtp-metadata-manager"; -import { SmtpConfig, SmtpConfiguration, SmtpEventConfiguration } from "./smtp-config-schema"; -import { MessageEventTypes } from "../../event-handlers/message-event-types"; +import { err, errAsync, fromAsyncThrowable, ok, okAsync, ResultAsync } from "neverthrow"; + +import { BaseError } from "../../../errors"; import { generateRandomId } from "../../../lib/generate-random-id"; -import { smtpDefaultEmptyConfigurations } from "./smtp-default-empty-configurations"; +import { createLogger } from "../../../logger"; import { filterConfigurations } from "../../app-configuration/filter-configurations"; +import { MessageEventTypes } from "../../event-handlers/message-event-types"; import { FeatureFlagService } from "../../feature-flag-service/feature-flag-service"; -import { createLogger } from "../../../logger"; -import { BaseError } from "../../../errors"; -import { err, errAsync, fromAsyncThrowable, ok, okAsync, ResultAsync } from "neverthrow"; +import { SmtpConfig, SmtpConfiguration, SmtpEventConfiguration } from "./smtp-config-schema"; +import { smtpDefaultEmptyConfigurations } from "./smtp-default-empty-configurations"; +import { SmtpMetadataManager } from "./smtp-metadata-manager"; const logger = createLogger("SmtpConfigurationService"); diff --git a/apps/smtp/src/modules/smtp/configuration/smtp-default-empty-configurations.ts b/apps/smtp/src/modules/smtp/configuration/smtp-default-empty-configurations.ts index a07760bddd..965a30166f 100644 --- a/apps/smtp/src/modules/smtp/configuration/smtp-default-empty-configurations.ts +++ b/apps/smtp/src/modules/smtp/configuration/smtp-default-empty-configurations.ts @@ -1,5 +1,4 @@ import { messageEventTypes } from "../../event-handlers/message-event-types"; - import { defaultMjmlSubjectTemplates, defaultMjmlTemplates } from "../default-templates"; import { SmtpConfiguration, diff --git a/apps/smtp/src/modules/smtp/services/email-compiler.test.ts b/apps/smtp/src/modules/smtp/services/email-compiler.test.ts index 228d98e1d1..7e9bb3ab0e 100644 --- a/apps/smtp/src/modules/smtp/services/email-compiler.test.ts +++ b/apps/smtp/src/modules/smtp/services/email-compiler.test.ts @@ -1,7 +1,8 @@ +import { err, Result } from "neverthrow"; import { beforeEach, describe, expect, it, vi } from "vitest"; + import { EmailCompiler } from "./email-compiler"; import { HandlebarsTemplateCompiler } from "./handlebars-template-compiler"; -import { err, Result } from "neverthrow"; import { HtmlToTextCompiler } from "./html-to-text-compiler"; import { MjmlCompiler } from "./mjml-compiler"; diff --git a/apps/smtp/src/modules/smtp/services/email-compiler.ts b/apps/smtp/src/modules/smtp/services/email-compiler.ts index b8431bb599..c97215b850 100644 --- a/apps/smtp/src/modules/smtp/services/email-compiler.ts +++ b/apps/smtp/src/modules/smtp/services/email-compiler.ts @@ -1,10 +1,11 @@ -import { IMjmlCompiler } from "./mjml-compiler"; -import { ITemplateCompiler } from "./handlebars-template-compiler"; +import { err, ok, Result } from "neverthrow"; + +import { BaseError } from "../../../errors"; +import { createLogger } from "../../../logger"; import { MessageEventTypes } from "../../event-handlers/message-event-types"; +import { ITemplateCompiler } from "./handlebars-template-compiler"; import { IHtmlToTextCompiler } from "./html-to-text-compiler"; -import { createLogger } from "../../../logger"; -import { BaseError } from "../../../errors"; -import { err, ok, Result } from "neverthrow"; +import { IMjmlCompiler } from "./mjml-compiler"; interface CompileArgs { recipientEmail: string; diff --git a/apps/smtp/src/modules/smtp/services/handlebars-template-compiler.test.ts b/apps/smtp/src/modules/smtp/services/handlebars-template-compiler.test.ts index 6b74f640b7..37d17861d6 100644 --- a/apps/smtp/src/modules/smtp/services/handlebars-template-compiler.test.ts +++ b/apps/smtp/src/modules/smtp/services/handlebars-template-compiler.test.ts @@ -1,4 +1,5 @@ import { describe, expect, it } from "vitest"; + import { HandlebarsTemplateCompiler } from "./handlebars-template-compiler"; describe("HandlebarsTemplateCompiler", () => { diff --git a/apps/smtp/src/modules/smtp/services/handlebars-template-compiler.ts b/apps/smtp/src/modules/smtp/services/handlebars-template-compiler.ts index 9c940fc9b7..699c1f75e4 100644 --- a/apps/smtp/src/modules/smtp/services/handlebars-template-compiler.ts +++ b/apps/smtp/src/modules/smtp/services/handlebars-template-compiler.ts @@ -1,9 +1,9 @@ import Handlebars from "handlebars"; -import { createLogger } from "../../../logger"; +import handlebars_helpers from "handlebars-helpers"; import { err, ok, Result } from "neverthrow"; -import { BaseError } from "../../../errors"; -import handlebars_helpers from "handlebars-helpers"; +import { BaseError } from "../../../errors"; +import { createLogger } from "../../../logger"; const logger = createLogger("compileHandlebarsTemplate"); diff --git a/apps/smtp/src/modules/smtp/services/html-to-text-compiler.test.ts b/apps/smtp/src/modules/smtp/services/html-to-text-compiler.test.ts index 5d6d3d82cc..c20b695b3a 100644 --- a/apps/smtp/src/modules/smtp/services/html-to-text-compiler.test.ts +++ b/apps/smtp/src/modules/smtp/services/html-to-text-compiler.test.ts @@ -1,4 +1,5 @@ import { describe, expect, it } from "vitest"; + import { HtmlToTextCompiler } from "./html-to-text-compiler"; describe("HtmlToTextCompiler", () => { diff --git a/apps/smtp/src/modules/smtp/services/html-to-text-compiler.ts b/apps/smtp/src/modules/smtp/services/html-to-text-compiler.ts index 30669a3163..94672ce461 100644 --- a/apps/smtp/src/modules/smtp/services/html-to-text-compiler.ts +++ b/apps/smtp/src/modules/smtp/services/html-to-text-compiler.ts @@ -1,8 +1,8 @@ import { convert } from "html-to-text"; - -import { createLogger } from "../../../logger"; import { fromThrowable, Result } from "neverthrow"; + import { BaseError } from "../../../errors"; +import { createLogger } from "../../../logger"; export interface IHtmlToTextCompiler { compile(html: string): Result>; diff --git a/apps/smtp/src/modules/smtp/services/mjml-compiler.test.ts b/apps/smtp/src/modules/smtp/services/mjml-compiler.test.ts index 42d0ada8d9..93c6e2e4a6 100644 --- a/apps/smtp/src/modules/smtp/services/mjml-compiler.test.ts +++ b/apps/smtp/src/modules/smtp/services/mjml-compiler.test.ts @@ -1,4 +1,5 @@ import { describe, expect, it } from "vitest"; + import { MjmlCompiler } from "./mjml-compiler"; describe("MjmlCompiler", () => { diff --git a/apps/smtp/src/modules/smtp/ui/code-editor.tsx b/apps/smtp/src/modules/smtp/ui/code-editor.tsx index 84c812110d..c970e0bcc3 100644 --- a/apps/smtp/src/modules/smtp/ui/code-editor.tsx +++ b/apps/smtp/src/modules/smtp/ui/code-editor.tsx @@ -1,7 +1,6 @@ -import React, { useCallback, useRef } from "react"; - import Editor from "@monaco-editor/react"; import { useTheme } from "@saleor/macaw-ui"; +import React, { useCallback, useRef } from "react"; type Props = { onChange(value: string): void; diff --git a/apps/smtp/src/modules/smtp/ui/smtp-basic-information-section.tsx b/apps/smtp/src/modules/smtp/ui/smtp-basic-information-section.tsx index 8ec2d62308..7ad30ea0a8 100644 --- a/apps/smtp/src/modules/smtp/ui/smtp-basic-information-section.tsx +++ b/apps/smtp/src/modules/smtp/ui/smtp-basic-information-section.tsx @@ -1,21 +1,22 @@ -import { SmtpConfiguration } from "../configuration/smtp-config-schema"; -import { BoxWithBorder } from "../../../components/box-with-border"; -import { Box, Button, Text } from "@saleor/macaw-ui"; -import { defaultPadding } from "../../../components/ui-defaults"; +import { zodResolver } from "@hookform/resolvers/zod"; import { useDashboardNotification } from "@saleor/apps-shared"; -import { trpcClient } from "../../trpc/trpc-client"; +import { Box, Button, Text } from "@saleor/macaw-ui"; +import { Input } from "@saleor/react-hook-form-macaw"; import { useForm } from "react-hook-form"; + import { BoxFooter } from "../../../components/box-footer"; +import { BoxWithBorder } from "../../../components/box-with-border"; import { SectionWithDescription } from "../../../components/section-with-description"; +import { defaultPadding } from "../../../components/ui-defaults"; +import { setBackendErrors } from "../../../lib/set-backend-errors"; +import { ConfigurationActiveDescriptionText } from "../../app-configuration/ui/configuration-active-description-text"; +import { ConfigurationNameDescriptionText } from "../../app-configuration/ui/configuration-name-description-text"; +import { trpcClient } from "../../trpc/trpc-client"; import { SmtpUpdateBasicInformation, smtpUpdateBasicInformationSchema, } from "../configuration/smtp-config-input-schema"; -import { zodResolver } from "@hookform/resolvers/zod"; -import { setBackendErrors } from "../../../lib/set-backend-errors"; -import { Input } from "@saleor/react-hook-form-macaw"; -import { ConfigurationNameDescriptionText } from "../../app-configuration/ui/configuration-name-description-text"; -import { ConfigurationActiveDescriptionText } from "../../app-configuration/ui/configuration-active-description-text"; +import { SmtpConfiguration } from "../configuration/smtp-config-schema"; interface SmtpBasicInformationSectionProps { configuration: SmtpConfiguration; diff --git a/apps/smtp/src/modules/smtp/ui/smtp-channels-section.tsx b/apps/smtp/src/modules/smtp/ui/smtp-channels-section.tsx index c5a226fc47..75cc9fbfcc 100644 --- a/apps/smtp/src/modules/smtp/ui/smtp-channels-section.tsx +++ b/apps/smtp/src/modules/smtp/ui/smtp-channels-section.tsx @@ -1,9 +1,10 @@ -import { SmtpConfiguration } from "../configuration/smtp-config-schema"; import { useDashboardNotification } from "@saleor/apps-shared"; -import { trpcClient } from "../../trpc/trpc-client"; + import { setBackendErrors } from "../../../lib/set-backend-errors"; -import { UniversalChannelsSection } from "../../channels/ui/universal-channels-section"; import { UpdateChannelsInput } from "../../channels/channel-configuration-schema"; +import { UniversalChannelsSection } from "../../channels/ui/universal-channels-section"; +import { trpcClient } from "../../trpc/trpc-client"; +import { SmtpConfiguration } from "../configuration/smtp-config-schema"; interface SmtpChannelsSectionProps { configuration: SmtpConfiguration; diff --git a/apps/smtp/src/modules/smtp/ui/smtp-events-section.tsx b/apps/smtp/src/modules/smtp/ui/smtp-events-section.tsx index 7391971d17..297ec6189c 100644 --- a/apps/smtp/src/modules/smtp/ui/smtp-events-section.tsx +++ b/apps/smtp/src/modules/smtp/ui/smtp-events-section.tsx @@ -1,26 +1,27 @@ -import { SmtpConfiguration } from "../configuration/smtp-config-schema"; -import { BoxWithBorder } from "../../../components/box-with-border"; +import { zodResolver } from "@hookform/resolvers/zod"; +import { useDashboardNotification } from "@saleor/apps-shared"; +import { TextLink } from "@saleor/apps-ui"; import { Box, Button, Text, Tooltip } from "@saleor/macaw-ui"; -import { defaultPadding } from "../../../components/ui-defaults"; -import { SectionWithDescription } from "../../../components/section-with-description"; import { useRouter } from "next/router"; -import { smtpUrls } from "../urls"; -import { TextLink } from "@saleor/apps-ui"; import React from "react"; -import { messageEventTypesLabels } from "../../event-handlers/message-event-types"; +import { useForm } from "react-hook-form"; + import { BoxFooter } from "../../../components/box-footer"; +import { BoxWithBorder } from "../../../components/box-with-border"; +import { ManagePermissionsTextLink } from "../../../components/manage-permissions-text-link"; +import { SectionWithDescription } from "../../../components/section-with-description"; import { Table } from "../../../components/table"; -import { useDashboardNotification } from "@saleor/apps-shared"; +import { defaultPadding } from "../../../components/ui-defaults"; +import { getEventFormStatus } from "../../../lib/get-event-form-status"; +import { setBackendErrors } from "../../../lib/set-backend-errors"; +import { messageEventTypesLabels } from "../../event-handlers/message-event-types"; +import { trpcClient } from "../../trpc/trpc-client"; import { SmtpUpdateEventArray, smtpUpdateEventArraySchema, } from "../configuration/smtp-config-input-schema"; -import { zodResolver } from "@hookform/resolvers/zod"; -import { trpcClient } from "../../trpc/trpc-client"; -import { useForm } from "react-hook-form"; -import { setBackendErrors } from "../../../lib/set-backend-errors"; -import { getEventFormStatus } from "../../../lib/get-event-form-status"; -import { ManagePermissionsTextLink } from "../../../components/manage-permissions-text-link"; +import { SmtpConfiguration } from "../configuration/smtp-config-schema"; +import { smtpUrls } from "../urls"; interface SmtpEventsSectionProps { configuration: SmtpConfiguration; diff --git a/apps/smtp/src/modules/smtp/ui/smtp-section.tsx b/apps/smtp/src/modules/smtp/ui/smtp-section.tsx index a750e2723f..0ac3635290 100644 --- a/apps/smtp/src/modules/smtp/ui/smtp-section.tsx +++ b/apps/smtp/src/modules/smtp/ui/smtp-section.tsx @@ -1,16 +1,17 @@ -import { SmtpConfiguration } from "../configuration/smtp-config-schema"; -import { BoxWithBorder } from "../../../components/box-with-border"; -import { Box, Button, Text } from "@saleor/macaw-ui"; -import { defaultPadding } from "../../../components/ui-defaults"; +import { zodResolver } from "@hookform/resolvers/zod"; import { useDashboardNotification } from "@saleor/apps-shared"; -import { trpcClient } from "../../trpc/trpc-client"; +import { Box, Button, Text } from "@saleor/macaw-ui"; +import { Input } from "@saleor/react-hook-form-macaw"; import { useForm } from "react-hook-form"; + import { BoxFooter } from "../../../components/box-footer"; +import { BoxWithBorder } from "../../../components/box-with-border"; import { SectionWithDescription } from "../../../components/section-with-description"; -import { SmtpUpdateSmtp, smtpUpdateSmtpSchema } from "../configuration/smtp-config-input-schema"; -import { zodResolver } from "@hookform/resolvers/zod"; +import { defaultPadding } from "../../../components/ui-defaults"; import { setBackendErrors } from "../../../lib/set-backend-errors"; -import { Input } from "@saleor/react-hook-form-macaw"; +import { trpcClient } from "../../trpc/trpc-client"; +import { SmtpUpdateSmtp, smtpUpdateSmtpSchema } from "../configuration/smtp-config-input-schema"; +import { SmtpConfiguration } from "../configuration/smtp-config-schema"; interface SmtpSectionProps { configuration: SmtpConfiguration; diff --git a/apps/smtp/src/modules/smtp/ui/smtp-sender-section.tsx b/apps/smtp/src/modules/smtp/ui/smtp-sender-section.tsx index e8b1f4d27a..bb9bc5f11a 100644 --- a/apps/smtp/src/modules/smtp/ui/smtp-sender-section.tsx +++ b/apps/smtp/src/modules/smtp/ui/smtp-sender-section.tsx @@ -1,19 +1,20 @@ -import { SmtpConfiguration } from "../configuration/smtp-config-schema"; -import { BoxWithBorder } from "../../../components/box-with-border"; -import { Box, Button, Text } from "@saleor/macaw-ui"; -import { defaultPadding } from "../../../components/ui-defaults"; +import { zodResolver } from "@hookform/resolvers/zod"; import { useDashboardNotification } from "@saleor/apps-shared"; -import { trpcClient } from "../../trpc/trpc-client"; +import { Box, Button, Text } from "@saleor/macaw-ui"; +import { Input } from "@saleor/react-hook-form-macaw"; import { useForm } from "react-hook-form"; + import { BoxFooter } from "../../../components/box-footer"; +import { BoxWithBorder } from "../../../components/box-with-border"; import { SectionWithDescription } from "../../../components/section-with-description"; +import { defaultPadding } from "../../../components/ui-defaults"; +import { setBackendErrors } from "../../../lib/set-backend-errors"; +import { trpcClient } from "../../trpc/trpc-client"; import { SmtpUpdateSender, smtpUpdateSenderSchema, } from "../configuration/smtp-config-input-schema"; -import { zodResolver } from "@hookform/resolvers/zod"; -import { setBackendErrors } from "../../../lib/set-backend-errors"; -import { Input } from "@saleor/react-hook-form-macaw"; +import { SmtpConfiguration } from "../configuration/smtp-config-schema"; interface SmtpSenderSectionProps { configuration: SmtpConfiguration; diff --git a/apps/smtp/src/modules/trpc/protected-client-procedure-with-services.ts b/apps/smtp/src/modules/trpc/protected-client-procedure-with-services.ts index e552535ff0..1a51c2df01 100644 --- a/apps/smtp/src/modules/trpc/protected-client-procedure-with-services.ts +++ b/apps/smtp/src/modules/trpc/protected-client-procedure-with-services.ts @@ -1,11 +1,11 @@ import { createSettingsManager } from "../../lib/metadata-manager"; +import { createLogger } from "../../logger"; +import { FeatureFlagService } from "../feature-flag-service/feature-flag-service"; import { SmtpConfigurationService } from "../smtp/configuration/smtp-configuration.service"; import { SmtpMetadataManager } from "../smtp/configuration/smtp-metadata-manager"; import { syncWebhookStatus } from "../webhook-management/sync-webhook-status"; -import { protectedClientProcedure } from "./protected-client-procedure"; import { WebhookManagementService } from "../webhook-management/webhook-management-service"; -import { FeatureFlagService } from "../feature-flag-service/feature-flag-service"; -import { createLogger } from "../../logger"; +import { protectedClientProcedure } from "./protected-client-procedure"; const logger = createLogger("protectedWithConfigurationServices middleware"); diff --git a/apps/smtp/src/modules/trpc/protected-client-procedure.ts b/apps/smtp/src/modules/trpc/protected-client-procedure.ts index ac30d5b93a..34654ae5d6 100644 --- a/apps/smtp/src/modules/trpc/protected-client-procedure.ts +++ b/apps/smtp/src/modules/trpc/protected-client-procedure.ts @@ -2,6 +2,7 @@ import { ProtectedHandlerError } from "@saleor/app-sdk/handlers/next"; import { verifyJWT } from "@saleor/app-sdk/verify-jwt"; import { REQUIRED_SALEOR_PERMISSIONS } from "@saleor/apps-shared"; import { TRPCError } from "@trpc/server"; + import { createInstrumentedGraphqlClient } from "../../lib/create-instrumented-graphql-client"; import { createLogger } from "../../logger"; import { saleorApp } from "../../saleor-app"; diff --git a/apps/smtp/src/modules/trpc/trpc-app-router.ts b/apps/smtp/src/modules/trpc/trpc-app-router.ts index 1181f39070..4b5bd0ae52 100644 --- a/apps/smtp/src/modules/trpc/trpc-app-router.ts +++ b/apps/smtp/src/modules/trpc/trpc-app-router.ts @@ -1,7 +1,7 @@ +import { appConfigurationRouter } from "../app-configuration/app-configuration.router"; import { channelsRouter } from "../channels/channels.router"; -import { router } from "./trpc-server"; import { smtpConfigurationRouter } from "../smtp/configuration/smtp-configuration.router"; -import { appConfigurationRouter } from "../app-configuration/app-configuration.router"; +import { router } from "./trpc-server"; export const appRouter = router({ app: appConfigurationRouter, diff --git a/apps/smtp/src/modules/trpc/trpc-client.ts b/apps/smtp/src/modules/trpc/trpc-client.ts index 5e5e3c22cb..4a62668e8d 100644 --- a/apps/smtp/src/modules/trpc/trpc-client.ts +++ b/apps/smtp/src/modules/trpc/trpc-client.ts @@ -1,7 +1,7 @@ +import { SALEOR_API_URL_HEADER, SALEOR_AUTHORIZATION_BEARER_HEADER } from "@saleor/app-sdk/const"; import { httpBatchLink } from "@trpc/client"; import { createTRPCNext } from "@trpc/next"; -import { SALEOR_API_URL_HEADER, SALEOR_AUTHORIZATION_BEARER_HEADER } from "@saleor/app-sdk/const"; import { appBridgeInstance } from "../../pages/_app"; import type { AppRouter } from "./trpc-app-router"; diff --git a/apps/smtp/src/modules/trpc/trpc-context.ts b/apps/smtp/src/modules/trpc/trpc-context.ts index b1e3a11b47..bcaf5d091c 100644 --- a/apps/smtp/src/modules/trpc/trpc-context.ts +++ b/apps/smtp/src/modules/trpc/trpc-context.ts @@ -1,6 +1,7 @@ -import * as trpcNext from "@trpc/server/adapters/next"; import { SALEOR_API_URL_HEADER, SALEOR_AUTHORIZATION_BEARER_HEADER } from "@saleor/app-sdk/const"; import { inferAsyncReturnType } from "@trpc/server"; +import * as trpcNext from "@trpc/server/adapters/next"; + import { getBaseUrl } from "../../lib/get-base-url"; export const createTrpcContext = async ({ res, req }: trpcNext.CreateNextContextOptions) => { diff --git a/apps/smtp/src/modules/trpc/trpc-server.ts b/apps/smtp/src/modules/trpc/trpc-server.ts index fc5be26a5b..93e84c1d26 100644 --- a/apps/smtp/src/modules/trpc/trpc-server.ts +++ b/apps/smtp/src/modules/trpc/trpc-server.ts @@ -1,8 +1,9 @@ -import { initTRPC } from "@trpc/server"; -import { TrpcContext } from "./trpc-context"; import { Permission } from "@saleor/app-sdk/types"; +import { initTRPC } from "@trpc/server"; import { ZodError } from "zod"; +import { TrpcContext } from "./trpc-context"; + interface Meta { requiredClientPermissions?: Permission[]; updateWebhooks?: boolean; diff --git a/apps/smtp/src/modules/webhook-management/api-operations.ts b/apps/smtp/src/modules/webhook-management/api-operations.ts index 4010ff086d..bc018edc2d 100644 --- a/apps/smtp/src/modules/webhook-management/api-operations.ts +++ b/apps/smtp/src/modules/webhook-management/api-operations.ts @@ -1,4 +1,5 @@ import { Client, gql } from "urql"; + import { AppWebhooksDocument, CreateAppWebhookDocument, diff --git a/apps/smtp/src/modules/webhook-management/get-webhook-statuses-from-configurations.test.ts b/apps/smtp/src/modules/webhook-management/get-webhook-statuses-from-configurations.test.ts index eb1f05f2b8..309fbcce70 100644 --- a/apps/smtp/src/modules/webhook-management/get-webhook-statuses-from-configurations.test.ts +++ b/apps/smtp/src/modules/webhook-management/get-webhook-statuses-from-configurations.test.ts @@ -1,4 +1,5 @@ import { describe, expect, it } from "vitest"; + import { SmtpConfiguration } from "../smtp/configuration/smtp-config-schema"; import { getWebhookStatusesFromConfigurations } from "./get-webhook-statuses-from-configurations"; import { webhookStatusesFactory } from "./webhook-status-dict"; diff --git a/apps/smtp/src/modules/webhook-management/sync-webhook-status.test.ts b/apps/smtp/src/modules/webhook-management/sync-webhook-status.test.ts index 4c99ac2064..961354a981 100644 --- a/apps/smtp/src/modules/webhook-management/sync-webhook-status.test.ts +++ b/apps/smtp/src/modules/webhook-management/sync-webhook-status.test.ts @@ -1,6 +1,7 @@ import { SettingsManager } from "@saleor/app-sdk/settings-manager"; import { Client } from "urql"; import { afterEach, describe, expect, it, vi } from "vitest"; + import { FeatureFlagService } from "../feature-flag-service/feature-flag-service"; import { SmtpConfigurationService } from "../smtp/configuration/smtp-configuration.service"; import { SmtpMetadataManager } from "../smtp/configuration/smtp-metadata-manager"; diff --git a/apps/smtp/src/modules/webhook-management/sync-webhook-status.ts b/apps/smtp/src/modules/webhook-management/sync-webhook-status.ts index 635556ba81..580712d43f 100644 --- a/apps/smtp/src/modules/webhook-management/sync-webhook-status.ts +++ b/apps/smtp/src/modules/webhook-management/sync-webhook-status.ts @@ -1,7 +1,7 @@ +import { createLogger } from "../../logger"; import { SmtpConfigurationService } from "../smtp/configuration/smtp-configuration.service"; -import { AppWebhook, WebhookManagementService } from "./webhook-management-service"; import { getWebhookStatusesFromConfigurations } from "./get-webhook-statuses-from-configurations"; -import { createLogger } from "../../logger"; +import { AppWebhook, WebhookManagementService } from "./webhook-management-service"; const logger = createLogger("SyncWebhooksStatus"); diff --git a/apps/smtp/src/modules/webhook-management/webhook-management-service.test.ts b/apps/smtp/src/modules/webhook-management/webhook-management-service.test.ts index bff6639904..897c56f705 100644 --- a/apps/smtp/src/modules/webhook-management/webhook-management-service.test.ts +++ b/apps/smtp/src/modules/webhook-management/webhook-management-service.test.ts @@ -1,11 +1,12 @@ -import { afterEach, describe, expect, it, vi } from "vitest"; -import { WebhookManagementService } from "./webhook-management-service"; import { Client } from "urql"; -import * as operationExports from "./api-operations"; +import { afterEach, describe, expect, it, vi } from "vitest"; + import { WebhookEventTypeAsyncEnum } from "../../../generated/graphql"; import { invoiceSentWebhook } from "../../pages/api/webhooks/invoice-sent"; import { orderCancelledWebhook } from "../../pages/api/webhooks/order-cancelled"; import { FeatureFlagService } from "../feature-flag-service/feature-flag-service"; +import * as operationExports from "./api-operations"; +import { WebhookManagementService } from "./webhook-management-service"; import { webhookStatusesFactory } from "./webhook-status-dict"; describe("WebhookManagementService", function () { diff --git a/apps/smtp/src/modules/webhook-management/webhook-management-service.ts b/apps/smtp/src/modules/webhook-management/webhook-management-service.ts index 614c6c028e..fab27bc13a 100644 --- a/apps/smtp/src/modules/webhook-management/webhook-management-service.ts +++ b/apps/smtp/src/modules/webhook-management/webhook-management-service.ts @@ -1,18 +1,19 @@ +import { Client } from "urql"; + +import { WebhookEventTypeAsyncEnum } from "../../../generated/graphql"; +import { createLogger } from "../../logger"; +import { giftCardSentWebhook } from "../../pages/api/webhooks/gift-card-sent"; import { invoiceSentWebhook } from "../../pages/api/webhooks/invoice-sent"; +import { notifyWebhook } from "../../pages/api/webhooks/notify"; import { orderCancelledWebhook } from "../../pages/api/webhooks/order-cancelled"; import { orderConfirmedWebhook } from "../../pages/api/webhooks/order-confirmed"; import { orderCreatedWebhook } from "../../pages/api/webhooks/order-created"; import { orderFulfilledWebhook } from "../../pages/api/webhooks/order-fulfilled"; import { orderFullyPaidWebhook } from "../../pages/api/webhooks/order-fully-paid"; -import { Client } from "urql"; -import { createAppWebhook, deleteAppWebhook, fetchAppWebhooks } from "./api-operations"; -import { notifyWebhook } from "../../pages/api/webhooks/notify"; +import { orderRefundedWebhook } from "../../pages/api/webhooks/order-refunded"; import { MessageEventTypes } from "../event-handlers/message-event-types"; -import { WebhookEventTypeAsyncEnum } from "../../../generated/graphql"; -import { giftCardSentWebhook } from "../../pages/api/webhooks/gift-card-sent"; import { FeatureFlagService } from "../feature-flag-service/feature-flag-service"; -import { orderRefundedWebhook } from "../../pages/api/webhooks/order-refunded"; -import { createLogger } from "../../logger"; +import { createAppWebhook, deleteAppWebhook, fetchAppWebhooks } from "./api-operations"; export const AppWebhooks = { giftCardSentWebhook, diff --git a/apps/smtp/src/pages/_app.tsx b/apps/smtp/src/pages/_app.tsx index 5b847e6329..4e2c64b36f 100644 --- a/apps/smtp/src/pages/_app.tsx +++ b/apps/smtp/src/pages/_app.tsx @@ -3,12 +3,12 @@ import "../styles/globals.css"; import { AppBridge, AppBridgeProvider } from "@saleor/app-sdk/app-bridge"; import { RoutePropagator } from "@saleor/app-sdk/app-bridge/next"; -import React from "react"; -import { AppProps } from "next/app"; +import { NoSSRWrapper } from "@saleor/apps-shared"; import { ThemeProvider } from "@saleor/macaw-ui"; +import { AppProps } from "next/app"; +import React from "react"; import { ThemeSynchronizer } from "../lib/theme-synchronizer"; -import { NoSSRWrapper } from "@saleor/apps-shared"; import { trpcClient } from "../modules/trpc/trpc-client"; /** diff --git a/apps/smtp/src/pages/api/manifest.ts b/apps/smtp/src/pages/api/manifest.ts index 9f96e0eeda..da797a5156 100644 --- a/apps/smtp/src/pages/api/manifest.ts +++ b/apps/smtp/src/pages/api/manifest.ts @@ -1,8 +1,8 @@ import { createManifestHandler } from "@saleor/app-sdk/handlers/next"; import { AppManifest } from "@saleor/app-sdk/types"; +import { withOtel } from "@saleor/apps-otel"; import packageJson from "../../../package.json"; -import { withOtel } from "@saleor/apps-otel"; export default withOtel( createManifestHandler({ diff --git a/apps/smtp/src/pages/api/register.ts b/apps/smtp/src/pages/api/register.ts index 712f670c7a..e76954e9a6 100644 --- a/apps/smtp/src/pages/api/register.ts +++ b/apps/smtp/src/pages/api/register.ts @@ -1,13 +1,13 @@ import { createAppRegisterHandler } from "@saleor/app-sdk/handlers/next"; - +import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; import { withOtel } from "@saleor/apps-otel"; import { SaleorVersionCompatibilityValidator } from "@saleor/apps-shared"; + import { createInstrumentedGraphqlClient } from "../../lib/create-instrumented-graphql-client"; import { createLogger } from "../../logger"; +import { loggerContext } from "../../logger-context"; import { fetchSaleorVersion } from "../../modules/feature-flag-service/fetch-saleor-version"; import { REQUIRED_SALEOR_VERSION, saleorApp } from "../../saleor-app"; -import { loggerContext } from "../../logger-context"; -import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; const allowedUrlsPattern = process.env.ALLOWED_DOMAIN_PATTERN; diff --git a/apps/smtp/src/pages/api/trpc/[trpc].ts b/apps/smtp/src/pages/api/trpc/[trpc].ts index aaf9cb21ea..a22b2e89e7 100644 --- a/apps/smtp/src/pages/api/trpc/[trpc].ts +++ b/apps/smtp/src/pages/api/trpc/[trpc].ts @@ -1,10 +1,11 @@ +import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; import { withOtel } from "@saleor/apps-otel"; import * as trpcNext from "@trpc/server/adapters/next"; + import { createLogger } from "../../../logger"; +import { loggerContext } from "../../../logger-context"; import { appRouter } from "../../../modules/trpc/trpc-app-router"; import { createTrpcContext } from "../../../modules/trpc/trpc-context"; -import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; -import { loggerContext } from "../../../logger-context"; const logger = createLogger("tRPC wrapper"); diff --git a/apps/smtp/src/pages/api/webhooks/gift-card-sent.ts b/apps/smtp/src/pages/api/webhooks/gift-card-sent.ts index 6de3e42825..91869e9851 100644 --- a/apps/smtp/src/pages/api/webhooks/gift-card-sent.ts +++ b/apps/smtp/src/pages/api/webhooks/gift-card-sent.ts @@ -1,15 +1,16 @@ import { NextWebhookApiHandler, SaleorAsyncWebhook } from "@saleor/app-sdk/handlers/next"; +import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; +import { withOtel } from "@saleor/apps-otel"; +import { ObservabilityAttributes } from "@saleor/apps-otel/src/lib/observability-attributes"; +import { captureException } from "@sentry/nextjs"; import { gql } from "urql"; -import { saleorApp } from "../../../saleor-app"; + import { GiftCardSentWebhookPayloadFragment } from "../../../../generated/graphql"; -import { withOtel } from "@saleor/apps-otel"; import { createLogger } from "../../../logger"; -import { SendEventMessagesUseCaseFactory } from "../../../modules/event-handlers/use-case/send-event-messages.use-case.factory"; -import { SendEventMessagesUseCase } from "../../../modules/event-handlers/use-case/send-event-messages.use-case"; -import { captureException } from "@sentry/nextjs"; -import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; import { loggerContext } from "../../../logger-context"; -import { ObservabilityAttributes } from "@saleor/apps-otel/src/lib/observability-attributes"; +import { SendEventMessagesUseCase } from "../../../modules/event-handlers/use-case/send-event-messages.use-case"; +import { SendEventMessagesUseCaseFactory } from "../../../modules/event-handlers/use-case/send-event-messages.use-case.factory"; +import { saleorApp } from "../../../saleor-app"; const GiftCardSentWebhookPayload = gql` fragment GiftCardSentWebhookPayload on GiftCardSent { diff --git a/apps/smtp/src/pages/api/webhooks/invoice-sent.ts b/apps/smtp/src/pages/api/webhooks/invoice-sent.ts index 6fc20661bd..1c52c8d025 100644 --- a/apps/smtp/src/pages/api/webhooks/invoice-sent.ts +++ b/apps/smtp/src/pages/api/webhooks/invoice-sent.ts @@ -1,18 +1,19 @@ import { NextWebhookApiHandler, SaleorAsyncWebhook } from "@saleor/app-sdk/handlers/next"; +import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; +import { withOtel } from "@saleor/apps-otel"; +import { ObservabilityAttributes } from "@saleor/apps-otel/src/lib/observability-attributes"; +import { captureException } from "@sentry/nextjs"; import { gql } from "urql"; -import { saleorApp } from "../../../saleor-app"; + import { InvoiceSentWebhookPayloadFragment, OrderDetailsFragmentDoc, } from "../../../../generated/graphql"; -import { withOtel } from "@saleor/apps-otel"; import { createLogger } from "../../../logger"; -import { SendEventMessagesUseCaseFactory } from "../../../modules/event-handlers/use-case/send-event-messages.use-case.factory"; -import { SendEventMessagesUseCase } from "../../../modules/event-handlers/use-case/send-event-messages.use-case"; -import { captureException } from "@sentry/nextjs"; -import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; import { loggerContext } from "../../../logger-context"; -import { ObservabilityAttributes } from "@saleor/apps-otel/src/lib/observability-attributes"; +import { SendEventMessagesUseCase } from "../../../modules/event-handlers/use-case/send-event-messages.use-case"; +import { SendEventMessagesUseCaseFactory } from "../../../modules/event-handlers/use-case/send-event-messages.use-case.factory"; +import { saleorApp } from "../../../saleor-app"; const InvoiceSentWebhookPayload = gql` ${OrderDetailsFragmentDoc} diff --git a/apps/smtp/src/pages/api/webhooks/notify.ts b/apps/smtp/src/pages/api/webhooks/notify.ts index 7c8885c476..529cf72a49 100644 --- a/apps/smtp/src/pages/api/webhooks/notify.ts +++ b/apps/smtp/src/pages/api/webhooks/notify.ts @@ -1,13 +1,14 @@ import { NextWebhookApiHandler, SaleorAsyncWebhook } from "@saleor/app-sdk/handlers/next"; -import { saleorApp } from "../../../saleor-app"; -import { notifyEventMapping, NotifySubscriptionPayload } from "../../../lib/notify-event-types"; +import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; import { withOtel } from "@saleor/apps-otel"; -import { createLogger } from "../../../logger"; -import { SendEventMessagesUseCaseFactory } from "../../../modules/event-handlers/use-case/send-event-messages.use-case.factory"; -import { SendEventMessagesUseCase } from "../../../modules/event-handlers/use-case/send-event-messages.use-case"; import { captureException } from "@sentry/nextjs"; -import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; + +import { notifyEventMapping, NotifySubscriptionPayload } from "../../../lib/notify-event-types"; +import { createLogger } from "../../../logger"; import { loggerContext } from "../../../logger-context"; +import { SendEventMessagesUseCase } from "../../../modules/event-handlers/use-case/send-event-messages.use-case"; +import { SendEventMessagesUseCaseFactory } from "../../../modules/event-handlers/use-case/send-event-messages.use-case.factory"; +import { saleorApp } from "../../../saleor-app"; /* * The Notify webhook is triggered on multiple Saleor events. diff --git a/apps/smtp/src/pages/api/webhooks/order-cancelled.ts b/apps/smtp/src/pages/api/webhooks/order-cancelled.ts index 2200a72103..bd25f24d74 100644 --- a/apps/smtp/src/pages/api/webhooks/order-cancelled.ts +++ b/apps/smtp/src/pages/api/webhooks/order-cancelled.ts @@ -1,18 +1,19 @@ import { NextWebhookApiHandler, SaleorAsyncWebhook } from "@saleor/app-sdk/handlers/next"; +import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; +import { withOtel } from "@saleor/apps-otel"; +import { ObservabilityAttributes } from "@saleor/apps-otel/src/lib/observability-attributes"; +import { captureException } from "@sentry/nextjs"; import { gql } from "urql"; -import { saleorApp } from "../../../saleor-app"; + import { OrderCancelledWebhookPayloadFragment, OrderDetailsFragmentDoc, } from "../../../../generated/graphql"; -import { withOtel } from "@saleor/apps-otel"; import { createLogger } from "../../../logger"; -import { SendEventMessagesUseCaseFactory } from "../../../modules/event-handlers/use-case/send-event-messages.use-case.factory"; -import { SendEventMessagesUseCase } from "../../../modules/event-handlers/use-case/send-event-messages.use-case"; -import { captureException } from "@sentry/nextjs"; -import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; import { loggerContext } from "../../../logger-context"; -import { ObservabilityAttributes } from "@saleor/apps-otel/src/lib/observability-attributes"; +import { SendEventMessagesUseCase } from "../../../modules/event-handlers/use-case/send-event-messages.use-case"; +import { SendEventMessagesUseCaseFactory } from "../../../modules/event-handlers/use-case/send-event-messages.use-case.factory"; +import { saleorApp } from "../../../saleor-app"; const OrderCancelledWebhookPayload = gql` ${OrderDetailsFragmentDoc} diff --git a/apps/smtp/src/pages/api/webhooks/order-confirmed.ts b/apps/smtp/src/pages/api/webhooks/order-confirmed.ts index 251e4723bb..1c3d4a0d26 100644 --- a/apps/smtp/src/pages/api/webhooks/order-confirmed.ts +++ b/apps/smtp/src/pages/api/webhooks/order-confirmed.ts @@ -1,18 +1,19 @@ import { NextWebhookApiHandler, SaleorAsyncWebhook } from "@saleor/app-sdk/handlers/next"; +import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; +import { withOtel } from "@saleor/apps-otel"; +import { ObservabilityAttributes } from "@saleor/apps-otel/src/lib/observability-attributes"; +import { captureException } from "@sentry/nextjs"; import { gql } from "urql"; -import { saleorApp } from "../../../saleor-app"; + import { OrderConfirmedWebhookPayloadFragment, OrderDetailsFragmentDoc, } from "../../../../generated/graphql"; -import { withOtel } from "@saleor/apps-otel"; import { createLogger } from "../../../logger"; -import { SendEventMessagesUseCaseFactory } from "../../../modules/event-handlers/use-case/send-event-messages.use-case.factory"; -import { SendEventMessagesUseCase } from "../../../modules/event-handlers/use-case/send-event-messages.use-case"; -import { captureException } from "@sentry/nextjs"; -import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; import { loggerContext } from "../../../logger-context"; -import { ObservabilityAttributes } from "@saleor/apps-otel/src/lib/observability-attributes"; +import { SendEventMessagesUseCase } from "../../../modules/event-handlers/use-case/send-event-messages.use-case"; +import { SendEventMessagesUseCaseFactory } from "../../../modules/event-handlers/use-case/send-event-messages.use-case.factory"; +import { saleorApp } from "../../../saleor-app"; const OrderConfirmedWebhookPayload = gql` ${OrderDetailsFragmentDoc} diff --git a/apps/smtp/src/pages/api/webhooks/order-created.ts b/apps/smtp/src/pages/api/webhooks/order-created.ts index 86d297f0a8..47c77bdf02 100644 --- a/apps/smtp/src/pages/api/webhooks/order-created.ts +++ b/apps/smtp/src/pages/api/webhooks/order-created.ts @@ -1,16 +1,16 @@ -import { OrderDetailsFragmentDoc } from "./../../../../generated/graphql"; import { NextWebhookApiHandler, SaleorAsyncWebhook } from "@saleor/app-sdk/handlers/next"; -import { gql } from "urql"; -import { saleorApp } from "../../../saleor-app"; -import { OrderCreatedWebhookPayloadFragment } from "../../../../generated/graphql"; +import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; import { withOtel } from "@saleor/apps-otel"; -import { createLogger } from "../../../logger"; -import { SendEventMessagesUseCaseFactory } from "../../../modules/event-handlers/use-case/send-event-messages.use-case.factory"; -import { SendEventMessagesUseCase } from "../../../modules/event-handlers/use-case/send-event-messages.use-case"; +import { ObservabilityAttributes } from "@saleor/apps-otel/src/lib/observability-attributes"; import { captureException } from "@sentry/nextjs"; -import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; +import { gql } from "urql"; + +import { OrderCreatedWebhookPayloadFragment , OrderDetailsFragmentDoc } from "../../../../generated/graphql"; +import { createLogger } from "../../../logger"; import { loggerContext } from "../../../logger-context"; -import { ObservabilityAttributes } from "@saleor/apps-otel/src/lib/observability-attributes"; +import { SendEventMessagesUseCase } from "../../../modules/event-handlers/use-case/send-event-messages.use-case"; +import { SendEventMessagesUseCaseFactory } from "../../../modules/event-handlers/use-case/send-event-messages.use-case.factory"; +import { saleorApp } from "../../../saleor-app"; const OrderCreatedWebhookPayload = gql` ${OrderDetailsFragmentDoc} diff --git a/apps/smtp/src/pages/api/webhooks/order-fulfilled.ts b/apps/smtp/src/pages/api/webhooks/order-fulfilled.ts index 35ea01528d..e1c0f28ee2 100644 --- a/apps/smtp/src/pages/api/webhooks/order-fulfilled.ts +++ b/apps/smtp/src/pages/api/webhooks/order-fulfilled.ts @@ -1,18 +1,19 @@ import { NextWebhookApiHandler, SaleorAsyncWebhook } from "@saleor/app-sdk/handlers/next"; +import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; +import { withOtel } from "@saleor/apps-otel"; +import { ObservabilityAttributes } from "@saleor/apps-otel/src/lib/observability-attributes"; +import { captureException } from "@sentry/nextjs"; import { gql } from "urql"; -import { saleorApp } from "../../../saleor-app"; + import { OrderDetailsFragmentDoc, OrderFulfilledWebhookPayloadFragment, } from "../../../../generated/graphql"; -import { withOtel } from "@saleor/apps-otel"; import { createLogger } from "../../../logger"; -import { SendEventMessagesUseCaseFactory } from "../../../modules/event-handlers/use-case/send-event-messages.use-case.factory"; -import { SendEventMessagesUseCase } from "../../../modules/event-handlers/use-case/send-event-messages.use-case"; -import { captureException } from "@sentry/nextjs"; -import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; import { loggerContext } from "../../../logger-context"; -import { ObservabilityAttributes } from "@saleor/apps-otel/src/lib/observability-attributes"; +import { SendEventMessagesUseCase } from "../../../modules/event-handlers/use-case/send-event-messages.use-case"; +import { SendEventMessagesUseCaseFactory } from "../../../modules/event-handlers/use-case/send-event-messages.use-case.factory"; +import { saleorApp } from "../../../saleor-app"; const OrderFulfilledWebhookPayload = gql` ${OrderDetailsFragmentDoc} diff --git a/apps/smtp/src/pages/api/webhooks/order-fully-paid.ts b/apps/smtp/src/pages/api/webhooks/order-fully-paid.ts index 56e522fb4b..75135d6faf 100644 --- a/apps/smtp/src/pages/api/webhooks/order-fully-paid.ts +++ b/apps/smtp/src/pages/api/webhooks/order-fully-paid.ts @@ -1,18 +1,19 @@ import { NextWebhookApiHandler, SaleorAsyncWebhook } from "@saleor/app-sdk/handlers/next"; +import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; +import { withOtel } from "@saleor/apps-otel"; +import { ObservabilityAttributes } from "@saleor/apps-otel/src/lib/observability-attributes"; +import { captureException } from "@sentry/nextjs"; import { gql } from "urql"; -import { saleorApp } from "../../../saleor-app"; + import { OrderDetailsFragmentDoc, OrderFullyPaidWebhookPayloadFragment, } from "../../../../generated/graphql"; -import { withOtel } from "@saleor/apps-otel"; import { createLogger } from "../../../logger"; -import { SendEventMessagesUseCaseFactory } from "../../../modules/event-handlers/use-case/send-event-messages.use-case.factory"; -import { SendEventMessagesUseCase } from "../../../modules/event-handlers/use-case/send-event-messages.use-case"; -import { captureException } from "@sentry/nextjs"; -import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; import { loggerContext } from "../../../logger-context"; -import { ObservabilityAttributes } from "@saleor/apps-otel/src/lib/observability-attributes"; +import { SendEventMessagesUseCase } from "../../../modules/event-handlers/use-case/send-event-messages.use-case"; +import { SendEventMessagesUseCaseFactory } from "../../../modules/event-handlers/use-case/send-event-messages.use-case.factory"; +import { saleorApp } from "../../../saleor-app"; const OrderFullyPaidWebhookPayload = gql` ${OrderDetailsFragmentDoc} diff --git a/apps/smtp/src/pages/api/webhooks/order-refunded.ts b/apps/smtp/src/pages/api/webhooks/order-refunded.ts index 0fd0f7c363..d03ce563c6 100644 --- a/apps/smtp/src/pages/api/webhooks/order-refunded.ts +++ b/apps/smtp/src/pages/api/webhooks/order-refunded.ts @@ -1,18 +1,19 @@ +import { NextWebhookApiHandler, SaleorAsyncWebhook } from "@saleor/app-sdk/handlers/next"; +import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; +import { withOtel } from "@saleor/apps-otel"; +import { ObservabilityAttributes } from "@saleor/apps-otel/src/lib/observability-attributes"; +import { captureException } from "@sentry/nextjs"; +import { gql } from "urql"; + import { OrderDetailsFragmentDoc, OrderRefundedWebhookPayloadFragment, } from "../../../../generated/graphql"; -import { NextWebhookApiHandler, SaleorAsyncWebhook } from "@saleor/app-sdk/handlers/next"; -import { gql } from "urql"; -import { saleorApp } from "../../../saleor-app"; -import { withOtel } from "@saleor/apps-otel"; import { createLogger } from "../../../logger"; -import { SendEventMessagesUseCaseFactory } from "../../../modules/event-handlers/use-case/send-event-messages.use-case.factory"; -import { SendEventMessagesUseCase } from "../../../modules/event-handlers/use-case/send-event-messages.use-case"; -import { captureException } from "@sentry/nextjs"; -import { wrapWithLoggerContext } from "@saleor/apps-logger/node"; import { loggerContext } from "../../../logger-context"; -import { ObservabilityAttributes } from "@saleor/apps-otel/src/lib/observability-attributes"; +import { SendEventMessagesUseCase } from "../../../modules/event-handlers/use-case/send-event-messages.use-case"; +import { SendEventMessagesUseCaseFactory } from "../../../modules/event-handlers/use-case/send-event-messages.use-case.factory"; +import { saleorApp } from "../../../saleor-app"; const OrderRefundedWebhookPayload = gql` ${OrderDetailsFragmentDoc} diff --git a/apps/smtp/src/pages/configuration/index.tsx b/apps/smtp/src/pages/configuration/index.tsx index ad50b2b8ca..62ba37aad2 100644 --- a/apps/smtp/src/pages/configuration/index.tsx +++ b/apps/smtp/src/pages/configuration/index.tsx @@ -1,14 +1,15 @@ +import { useAppBridge } from "@saleor/app-sdk/app-bridge"; import { Box, Text } from "@saleor/macaw-ui"; import { NextPage } from "next"; + +import { BasicLayout } from "../../components/basic-layout"; import { SectionWithDescription } from "../../components/section-with-description"; import { ConfigurationListItem, MessagingProvidersBox, } from "../../modules/app-configuration/ui/messaging-providers-box"; -import { trpcClient } from "../../modules/trpc/trpc-client"; import { appUrls } from "../../modules/app-configuration/urls"; -import { BasicLayout } from "../../components/basic-layout"; -import { useAppBridge } from "@saleor/app-sdk/app-bridge"; +import { trpcClient } from "../../modules/trpc/trpc-client"; const ConfigurationPage: NextPage = () => { const { appBridgeState } = useAppBridge(); diff --git a/apps/smtp/src/pages/index.tsx b/apps/smtp/src/pages/index.tsx index 4134d5ef09..aedf79d24e 100644 --- a/apps/smtp/src/pages/index.tsx +++ b/apps/smtp/src/pages/index.tsx @@ -1,9 +1,10 @@ -import { NextPage } from "next"; import { useAppBridge } from "@saleor/app-sdk/app-bridge"; +import { isInIframe } from "@saleor/apps-shared"; +import { NextPage } from "next"; +import { useRouter } from "next/router"; import { useEffect } from "react"; import { useIsMounted } from "usehooks-ts"; -import { useRouter } from "next/router"; -import { isInIframe } from "@saleor/apps-shared"; + import { appName } from "../const"; import { appUrls } from "../modules/app-configuration/urls"; diff --git a/packages/e2e/playwright.config.ts b/packages/e2e/playwright.config.ts index 58b1126f51..e0babc3a9a 100644 --- a/packages/e2e/playwright.config.ts +++ b/packages/e2e/playwright.config.ts @@ -1,10 +1,11 @@ -import { defineConfig, devices } from "@playwright/test"; /** * Read environment variables from file. * Check setup/configuration */ import "dotenv/config"; +import { defineConfig, devices } from "@playwright/test"; + /** * See https://playwright.dev/docs/test-configuration. */ diff --git a/packages/e2e/tests/apps/klaviyo/klaviyo-configuration.spec.ts b/packages/e2e/tests/apps/klaviyo/klaviyo-configuration.spec.ts index 8748f5f84c..b76e6d8dcd 100644 --- a/packages/e2e/tests/apps/klaviyo/klaviyo-configuration.spec.ts +++ b/packages/e2e/tests/apps/klaviyo/klaviyo-configuration.spec.ts @@ -1,4 +1,5 @@ -import { Page, test, expect } from "@playwright/test"; +import { expect,Page, test } from "@playwright/test"; + import { logInIntoDashboard } from "../../operations/log-in-to-dashboard"; import { openTheApp } from "../../operations/open-app"; diff --git a/packages/e2e/tests/apps/product-feed/operations/navigate-to-category-mapping.ts b/packages/e2e/tests/apps/product-feed/operations/navigate-to-category-mapping.ts index 884fe45ec5..e22ae471d5 100644 --- a/packages/e2e/tests/apps/product-feed/operations/navigate-to-category-mapping.ts +++ b/packages/e2e/tests/apps/product-feed/operations/navigate-to-category-mapping.ts @@ -1,4 +1,4 @@ -import { FrameLocator, expect } from "@playwright/test"; +import { expect,FrameLocator } from "@playwright/test"; export const navigateToCategoryMapping = async (iframeLocator: FrameLocator) => { await iframeLocator.getByText("Map categories").click({ force: true }); diff --git a/packages/e2e/tests/apps/product-feed/product-feed-configuration.spec.ts b/packages/e2e/tests/apps/product-feed/product-feed-configuration.spec.ts index a63f52e7e2..46c8961ae9 100644 --- a/packages/e2e/tests/apps/product-feed/product-feed-configuration.spec.ts +++ b/packages/e2e/tests/apps/product-feed/product-feed-configuration.spec.ts @@ -1,11 +1,12 @@ -import { Page, test, expect } from "@playwright/test"; +import { expect,Page, test } from "@playwright/test"; + import { logInIntoDashboard } from "../../operations/log-in-to-dashboard"; import { openTheApp } from "../../operations/open-app"; -import { fillAwsS3Form } from "./operations/fill-aws-s3-form"; import { assertAppRender } from "./assertions/assert-app-render"; +import { fillAwsS3Form } from "./operations/fill-aws-s3-form"; import { fillChannelConfig } from "./operations/fill-channel-config"; -import { setCategoryMapping } from "./operations/set-category-mapping"; import { navigateToCategoryMapping } from "./operations/navigate-to-category-mapping"; +import { setCategoryMapping } from "./operations/set-category-mapping"; test.describe("Product Feed Configuration", () => { let page: Page; diff --git a/packages/e2e/tests/assertions/assert-app-available.ts b/packages/e2e/tests/assertions/assert-app-available.ts index c1410c51d0..3550319e91 100644 --- a/packages/e2e/tests/assertions/assert-app-available.ts +++ b/packages/e2e/tests/assertions/assert-app-available.ts @@ -1,6 +1,7 @@ import { expect, Page } from "@playwright/test"; -import { routing } from "../../setup/routing"; + import { configuration } from "../../setup/configuration"; +import { routing } from "../../setup/routing"; interface checkIfAppIsAvailableArgs { page: Page; diff --git a/packages/e2e/tests/operations/install-app.ts b/packages/e2e/tests/operations/install-app.ts index e7e24b2578..2506ad10f0 100644 --- a/packages/e2e/tests/operations/install-app.ts +++ b/packages/e2e/tests/operations/install-app.ts @@ -1,4 +1,5 @@ import { Page } from "@playwright/test"; + import { routing } from "../../setup/routing"; interface InstallTheAppArgs { diff --git a/packages/e2e/tests/operations/log-in-to-dashboard.ts b/packages/e2e/tests/operations/log-in-to-dashboard.ts index 148089a2de..3a7e76e0aa 100644 --- a/packages/e2e/tests/operations/log-in-to-dashboard.ts +++ b/packages/e2e/tests/operations/log-in-to-dashboard.ts @@ -1,4 +1,5 @@ -import { Page, expect } from "@playwright/test"; +import { expect,Page } from "@playwright/test"; + import { configuration } from "../../setup/configuration"; import { routing } from "../../setup/routing"; diff --git a/packages/e2e/tests/operations/open-app.ts b/packages/e2e/tests/operations/open-app.ts index 69f673c26b..76716930f4 100644 --- a/packages/e2e/tests/operations/open-app.ts +++ b/packages/e2e/tests/operations/open-app.ts @@ -1,4 +1,5 @@ -import { Page, expect } from "@playwright/test"; +import { expect,Page } from "@playwright/test"; + import { routing } from "../../setup/routing"; interface InstallTheAppArgs { diff --git a/packages/logger/src/logger-context.test.ts b/packages/logger/src/logger-context.test.ts index 3aa3fcc41f..982f063b1a 100644 --- a/packages/logger/src/logger-context.test.ts +++ b/packages/logger/src/logger-context.test.ts @@ -1,9 +1,10 @@ -import { describe, expect, it } from "vitest"; +import { describe, expect, it, vi } from "vitest"; import { LoggerContext } from "./logger-context"; describe("LoggerContext", () => { it("Wraps context and shares context globally", () => { + vi.stubEnv("OTEL_SERVICE_NAME", "logger-context-test-service"); expect.assertions(1); const loggerContext = new LoggerContext(); @@ -11,10 +12,11 @@ describe("LoggerContext", () => { const assertFunction = () => { loggerContext.set("baz", "1"); - expect(loggerContext.getRawContext()).toEqual({ + expect(loggerContext.getRawContext()).toStrictEqual({ foo: "bar", initialState: "exists", baz: "1", + project_name: "logger-context-test-service", }); }; diff --git a/packages/otel/src/get-attributes-from-request.ts b/packages/otel/src/get-attributes-from-request.ts index 0143569735..30f888d5b6 100644 --- a/packages/otel/src/get-attributes-from-request.ts +++ b/packages/otel/src/get-attributes-from-request.ts @@ -1,6 +1,6 @@ -import { NextApiRequest } from "next"; import { SemanticAttributes } from "@opentelemetry/semantic-conventions"; import { SALEOR_API_URL_HEADER } from "@saleor/app-sdk/const"; +import { NextApiRequest } from "next"; const pruneEmptyKeys = (obj: Record): Record => { const clonedObj = { ...obj }; diff --git a/packages/otel/src/otel-exchange.ts b/packages/otel/src/otel-exchange.ts index 8bae1d92ef..bbd7f49fed 100644 --- a/packages/otel/src/otel-exchange.ts +++ b/packages/otel/src/otel-exchange.ts @@ -1,9 +1,10 @@ -import { type Span, SpanKind, SpanStatusCode, context } from "@opentelemetry/api"; -import { type CombinedError, type Operation, makeOperation, mapExchange } from "urql"; -import { getOtelTracer } from "./otel-tracer"; +import { context,type Span, SpanKind, SpanStatusCode } from "@opentelemetry/api"; +import { SemanticAttributes } from "@opentelemetry/semantic-conventions"; +import { type CombinedError, makeOperation, mapExchange,type Operation } from "urql"; + import { GraphQLAttributeNames, ObservabilityAttributes } from "./lib/observability-attributes"; import { addInputVariableAttributes, addRequestHeaderAttributes } from "./otel-graphql-utils"; -import { SemanticAttributes } from "@opentelemetry/semantic-conventions"; +import { getOtelTracer } from "./otel-tracer"; type Definition = { name: { diff --git a/packages/otel/src/otel-graphql-utils.ts b/packages/otel/src/otel-graphql-utils.ts index 37c94ab959..f5f77c96ea 100644 --- a/packages/otel/src/otel-graphql-utils.ts +++ b/packages/otel/src/otel-graphql-utils.ts @@ -1,4 +1,5 @@ import { type Span } from "@opentelemetry/api"; + import { GraphQLAttributeNames } from "./lib/observability-attributes"; export const addRequestHeaderAttributes = ( diff --git a/packages/otel/src/otel-logs-setup.ts b/packages/otel/src/otel-logs-setup.ts index 7685cfb3cd..fa056396bf 100644 --- a/packages/otel/src/otel-logs-setup.ts +++ b/packages/otel/src/otel-logs-setup.ts @@ -1,5 +1,4 @@ import { logs } from "@opentelemetry/api-logs"; -import { BatchLogRecordProcessor, LoggerProvider } from "@opentelemetry/sdk-logs"; import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-http"; import { detectResourcesSync, @@ -8,6 +7,8 @@ import { osDetectorSync, processDetector, } from "@opentelemetry/resources"; +import { BatchLogRecordProcessor, LoggerProvider } from "@opentelemetry/sdk-logs"; + import { sharedOtelConfig } from "./shared-config"; const batchLogRecordProcessor = new BatchLogRecordProcessor( diff --git a/packages/otel/src/otel-traces-setup.ts b/packages/otel/src/otel-traces-setup.ts index dfd64d9af1..deaf3e9f42 100644 --- a/packages/otel/src/otel-traces-setup.ts +++ b/packages/otel/src/otel-traces-setup.ts @@ -1,5 +1,6 @@ import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http"; import { BatchSpanProcessor, ReadableSpan } from "@opentelemetry/sdk-trace-base"; + import { sharedOtelConfig } from "./shared-config"; class CustomSpanProcessor extends BatchSpanProcessor { diff --git a/packages/react-hook-form-macaw/src/components/Combobox.stories.tsx b/packages/react-hook-form-macaw/src/components/Combobox.stories.tsx index f45cc55b82..d3b04f83f2 100644 --- a/packages/react-hook-form-macaw/src/components/Combobox.stories.tsx +++ b/packages/react-hook-form-macaw/src/components/Combobox.stories.tsx @@ -1,8 +1,9 @@ -import { useEffect } from "react"; +import { action } from "@storybook/addon-actions"; import { Meta, StoryObj } from "@storybook/react"; -import { Combobox } from "./Combobox"; +import { useEffect } from "react"; import { useForm } from "react-hook-form"; -import { action } from "@storybook/addon-actions"; + +import { Combobox } from "./Combobox"; const meta: Meta = { title: "Components / Combobox", diff --git a/packages/react-hook-form-macaw/src/components/Input.stories.tsx b/packages/react-hook-form-macaw/src/components/Input.stories.tsx index eaf68c82d0..14ebde4ce4 100644 --- a/packages/react-hook-form-macaw/src/components/Input.stories.tsx +++ b/packages/react-hook-form-macaw/src/components/Input.stories.tsx @@ -1,8 +1,9 @@ -import { useEffect } from "react"; +import { action } from "@storybook/addon-actions"; import { Meta, StoryObj } from "@storybook/react"; -import { Input } from "./Input"; +import { useEffect } from "react"; import { useForm } from "react-hook-form"; -import { action } from "@storybook/addon-actions"; + +import { Input } from "./Input"; const meta: Meta = { title: "Components / Input", diff --git a/packages/react-hook-form-macaw/src/components/Multiselect.stories.tsx b/packages/react-hook-form-macaw/src/components/Multiselect.stories.tsx index bf7bfd7946..4cc986642e 100644 --- a/packages/react-hook-form-macaw/src/components/Multiselect.stories.tsx +++ b/packages/react-hook-form-macaw/src/components/Multiselect.stories.tsx @@ -1,8 +1,9 @@ -import { useEffect } from "react"; +import { action } from "@storybook/addon-actions"; import { Meta, StoryObj } from "@storybook/react"; -import { Multiselect } from "./Multiselect"; +import { useEffect } from "react"; import { useForm } from "react-hook-form"; -import { action } from "@storybook/addon-actions"; + +import { Multiselect } from "./Multiselect"; const meta: Meta = { title: "Components / Multiselect", diff --git a/packages/react-hook-form-macaw/src/components/Multiselect.tsx b/packages/react-hook-form-macaw/src/components/Multiselect.tsx index 00ee90909f..7527cc2460 100644 --- a/packages/react-hook-form-macaw/src/components/Multiselect.tsx +++ b/packages/react-hook-form-macaw/src/components/Multiselect.tsx @@ -1,7 +1,7 @@ import { Multiselect as $Multiselect, - Option, type MultiselectProps as $MultiselectProps, + Option, } from "@saleor/macaw-ui"; import { Control, Controller, FieldPath, FieldValues } from "react-hook-form"; diff --git a/packages/react-hook-form-macaw/src/components/Select.stories.tsx b/packages/react-hook-form-macaw/src/components/Select.stories.tsx index 026febc977..80d3835c73 100644 --- a/packages/react-hook-form-macaw/src/components/Select.stories.tsx +++ b/packages/react-hook-form-macaw/src/components/Select.stories.tsx @@ -1,8 +1,9 @@ -import { useEffect } from "react"; +import { action } from "@storybook/addon-actions"; import { Meta, StoryObj } from "@storybook/react"; -import { Select } from "./Select"; +import { useEffect } from "react"; import { useForm } from "react-hook-form"; -import { action } from "@storybook/addon-actions"; + +import { Select } from "./Select"; const meta: Meta = { title: "Components / Select", diff --git a/packages/react-hook-form-macaw/src/components/Select.tsx b/packages/react-hook-form-macaw/src/components/Select.tsx index 7ff1477741..3de2d6c783 100644 --- a/packages/react-hook-form-macaw/src/components/Select.tsx +++ b/packages/react-hook-form-macaw/src/components/Select.tsx @@ -1,4 +1,4 @@ -import { Select as $Select, type SelectProps as $SelectProps, Option } from "@saleor/macaw-ui"; +import { Option,Select as $Select, type SelectProps as $SelectProps } from "@saleor/macaw-ui"; import { Control, Controller, FieldPath, FieldValues } from "react-hook-form"; export type SelectProps = Omit< diff --git a/packages/shared/index.ts b/packages/shared/index.ts index 847870750c..d79e48f241 100644 --- a/packages/shared/index.ts +++ b/packages/shared/index.ts @@ -1,7 +1,7 @@ -export * from "./src/GraphQLProvider"; export * from "./src/create-graphql-client"; export * from "./src/editor-js/editor-js-plaintext-renderer"; export * from "./src/get-app-base-url"; +export * from "./src/GraphQLProvider"; export * from "./src/is-in-iframe"; export * from "./src/metadata-manager"; export * from "./src/no-ssr-wrapper"; diff --git a/packages/shared/src/GraphQLProvider.tsx b/packages/shared/src/GraphQLProvider.tsx index 4607abffc0..c55ef96045 100644 --- a/packages/shared/src/GraphQLProvider.tsx +++ b/packages/shared/src/GraphQLProvider.tsx @@ -1,6 +1,7 @@ import { useAppBridge } from "@saleor/app-sdk/app-bridge"; import { PropsWithChildren } from "react"; import { Provider } from "urql"; + import { createGraphQLClient } from "./create-graphql-client"; export function GraphQLProvider(props: PropsWithChildren<{}>) { diff --git a/packages/shared/src/create-graphql-client.ts b/packages/shared/src/create-graphql-client.ts index 65b701c7a9..a80aeb33d2 100644 --- a/packages/shared/src/create-graphql-client.ts +++ b/packages/shared/src/create-graphql-client.ts @@ -1,5 +1,5 @@ import { authExchange } from "@urql/exchange-auth"; -import { cacheExchange, createClient as urqlCreateClient, fetchExchange, Exchange } from "urql"; +import { cacheExchange, createClient as urqlCreateClient, Exchange,fetchExchange } from "urql"; export interface CreateGraphQLClientArgs { saleorApiUrl: string; diff --git a/packages/shared/src/editor-js/editor-js-plaintext-renderer.test.ts b/packages/shared/src/editor-js/editor-js-plaintext-renderer.test.ts index bf80730646..37b1d37574 100644 --- a/packages/shared/src/editor-js/editor-js-plaintext-renderer.test.ts +++ b/packages/shared/src/editor-js/editor-js-plaintext-renderer.test.ts @@ -1,4 +1,5 @@ import { describe, expect, it } from "vitest"; + import { EditorJsPlaintextRenderer } from "./editor-js-plaintext-renderer"; describe("EditorJsPlaintextRenderer", () => { diff --git a/packages/shared/src/metadata-manager.ts b/packages/shared/src/metadata-manager.ts index bf4e940449..10bb637396 100644 --- a/packages/shared/src/metadata-manager.ts +++ b/packages/shared/src/metadata-manager.ts @@ -1,6 +1,6 @@ import { - MetadataEntry, EncryptedMetadataManager, + MetadataEntry, MetadataManager, SettingsManager, } from "@saleor/app-sdk/settings-manager"; diff --git a/packages/shared/src/no-ssr-wrapper.tsx b/packages/shared/src/no-ssr-wrapper.tsx index 03f16a362a..4960eb7a3f 100644 --- a/packages/shared/src/no-ssr-wrapper.tsx +++ b/packages/shared/src/no-ssr-wrapper.tsx @@ -1,5 +1,5 @@ -import { PropsWithChildren, Fragment } from "react"; import dynamic from "next/dynamic"; +import { Fragment,PropsWithChildren } from "react"; const Wrapper = (props: PropsWithChildren<{}>) => {props.children}; diff --git a/packages/shared/src/saleor-version-compatibility-validator.test.ts b/packages/shared/src/saleor-version-compatibility-validator.test.ts index b8ef9cf389..8155a2cf37 100644 --- a/packages/shared/src/saleor-version-compatibility-validator.test.ts +++ b/packages/shared/src/saleor-version-compatibility-validator.test.ts @@ -1,4 +1,5 @@ import { describe, expect, it } from "vitest"; + import { SaleorVersionCompatibilityValidator } from "./saleor-version-compatibility-validator"; describe("SaleorVersionCompatibilityValidator", () => { diff --git a/packages/shared/src/use-dashboard-notification.ts b/packages/shared/src/use-dashboard-notification.ts index d4550f42fb..dbf980c4ec 100644 --- a/packages/shared/src/use-dashboard-notification.ts +++ b/packages/shared/src/use-dashboard-notification.ts @@ -1,5 +1,5 @@ -import { useCallback } from "react"; import { actions, useAppBridge } from "@saleor/app-sdk/app-bridge"; +import { useCallback } from "react"; export const useDashboardNotification = () => { const { appBridge } = useAppBridge(); diff --git a/packages/trpc/src/context.ts b/packages/trpc/src/context.ts index 82354d75b7..5329639ae0 100644 --- a/packages/trpc/src/context.ts +++ b/packages/trpc/src/context.ts @@ -1,7 +1,7 @@ -import * as trpcNext from "@trpc/server/adapters/next"; -import { SALEOR_AUTHORIZATION_BEARER_HEADER, SALEOR_API_URL_HEADER } from "@saleor/app-sdk/const"; -import { inferAsyncReturnType } from "@trpc/server"; +import { SALEOR_API_URL_HEADER,SALEOR_AUTHORIZATION_BEARER_HEADER } from "@saleor/app-sdk/const"; import { getAppBaseUrl } from "@saleor/apps-shared"; +import { inferAsyncReturnType } from "@trpc/server"; +import * as trpcNext from "@trpc/server/adapters/next"; export const createTrpcContext = async ({ res, req }: trpcNext.CreateNextContextOptions) => { const baseUrl = getAppBaseUrl(req.headers); diff --git a/packages/ui/index.ts b/packages/ui/index.ts index daf5098469..7bb5572f30 100644 --- a/packages/ui/index.ts +++ b/packages/ui/index.ts @@ -1,6 +1,6 @@ -export * from "./src/text-link"; -export * from "./src/semantic-chip"; export * from "./src/breadcrumbs"; -export * from "./src/layout"; export * from "./src/buttons-box"; +export * from "./src/layout"; +export * from "./src/semantic-chip"; export * from "./src/skeleton-layout"; +export * from "./src/text-link"; diff --git a/packages/ui/src/buttons-box.tsx b/packages/ui/src/buttons-box.tsx index 158132cf3e..bbb3e5e1ad 100644 --- a/packages/ui/src/buttons-box.tsx +++ b/packages/ui/src/buttons-box.tsx @@ -1,4 +1,4 @@ -import { BoxProps, Box } from "@saleor/macaw-ui"; +import { Box,BoxProps } from "@saleor/macaw-ui"; export const ButtonsBox = (props: BoxProps) => { return ; diff --git a/packages/webhook-utils/src/create-app-webhook-from-manifest.ts b/packages/webhook-utils/src/create-app-webhook-from-manifest.ts index c69e9cbf25..cfefaea12f 100644 --- a/packages/webhook-utils/src/create-app-webhook-from-manifest.ts +++ b/packages/webhook-utils/src/create-app-webhook-from-manifest.ts @@ -1,5 +1,6 @@ import { WebhookManifest } from "@saleor/app-sdk/types"; import { Client } from "urql"; + import { WebhookEventTypeAsyncEnum, WebhookEventTypeSyncEnum } from "../generated/graphql"; import { createAppWebhook } from "./operations/create-app-webhook"; diff --git a/packages/webhook-utils/src/create-app-webhook-from-webhook-details-fragment.ts b/packages/webhook-utils/src/create-app-webhook-from-webhook-details-fragment.ts index 1cda9b04a7..1623ff1d3f 100644 --- a/packages/webhook-utils/src/create-app-webhook-from-webhook-details-fragment.ts +++ b/packages/webhook-utils/src/create-app-webhook-from-webhook-details-fragment.ts @@ -1,4 +1,5 @@ import { Client } from "urql"; + import { createAppWebhook } from "./operations/create-app-webhook"; import { WebhookData } from "./types"; diff --git a/packages/webhook-utils/src/disable-webhook.ts b/packages/webhook-utils/src/disable-webhook.ts index 3b3fc69e7b..f55f363f5c 100644 --- a/packages/webhook-utils/src/disable-webhook.ts +++ b/packages/webhook-utils/src/disable-webhook.ts @@ -1,4 +1,5 @@ import { Client } from "urql"; + import { modifyAppWebhook } from "./operations/modify-app-webhook"; interface DisableWebhookArgs { diff --git a/packages/webhook-utils/src/enable-webhook.ts b/packages/webhook-utils/src/enable-webhook.ts index d33c038973..1b5a250189 100644 --- a/packages/webhook-utils/src/enable-webhook.ts +++ b/packages/webhook-utils/src/enable-webhook.ts @@ -1,4 +1,5 @@ import { Client } from "urql"; + import { modifyAppWebhook } from "./operations/modify-app-webhook"; interface enableWebhookArgs { diff --git a/packages/webhook-utils/src/filters/get-webhook-ids-and-manifests-to-update.test.ts b/packages/webhook-utils/src/filters/get-webhook-ids-and-manifests-to-update.test.ts index 45741ca446..a300925282 100644 --- a/packages/webhook-utils/src/filters/get-webhook-ids-and-manifests-to-update.test.ts +++ b/packages/webhook-utils/src/filters/get-webhook-ids-and-manifests-to-update.test.ts @@ -1,4 +1,5 @@ import { describe, expect, it } from "vitest"; + import { getWebhookIdsAndManifestsToUpdate } from "./get-webhook-ids-and-manifests-to-update"; describe("getWebhookIdsAndQueriesToUpdate", () => { diff --git a/packages/webhook-utils/src/filters/get-webhook-ids-and-manifests-to-update.ts b/packages/webhook-utils/src/filters/get-webhook-ids-and-manifests-to-update.ts index d99d4069c3..719fea0120 100644 --- a/packages/webhook-utils/src/filters/get-webhook-ids-and-manifests-to-update.ts +++ b/packages/webhook-utils/src/filters/get-webhook-ids-and-manifests-to-update.ts @@ -1,4 +1,5 @@ import { WebhookManifest } from "@saleor/app-sdk/types"; + import { WebhookData } from "../types"; interface GetWebhookIdsAndQueriesToUpdateArgs { diff --git a/packages/webhook-utils/src/filters/webhooks-to-add.test.ts b/packages/webhook-utils/src/filters/webhooks-to-add.test.ts index bb501ac8fa..378ace6c5f 100644 --- a/packages/webhook-utils/src/filters/webhooks-to-add.test.ts +++ b/packages/webhook-utils/src/filters/webhooks-to-add.test.ts @@ -1,4 +1,5 @@ import { describe, expect, it } from "vitest"; + import { webhooksToAdd } from "./webhooks-to-add"; describe("webhooksToAdd", () => { diff --git a/packages/webhook-utils/src/filters/webhooks-to-add.ts b/packages/webhook-utils/src/filters/webhooks-to-add.ts index 38d7c0399e..82186ac971 100644 --- a/packages/webhook-utils/src/filters/webhooks-to-add.ts +++ b/packages/webhook-utils/src/filters/webhooks-to-add.ts @@ -1,4 +1,5 @@ import { WebhookManifest } from "@saleor/app-sdk/types"; + import { WebhookData } from "../types"; interface WebhooksToAddArgs { diff --git a/packages/webhook-utils/src/filters/webhooks-to-remove.test.ts b/packages/webhook-utils/src/filters/webhooks-to-remove.test.ts index 32976bbba6..767e490d78 100644 --- a/packages/webhook-utils/src/filters/webhooks-to-remove.test.ts +++ b/packages/webhook-utils/src/filters/webhooks-to-remove.test.ts @@ -1,4 +1,5 @@ import { describe, expect, it } from "vitest"; + import { webhooksToRemove } from "./webhooks-to-remove"; describe("webhooksToRemove", () => { diff --git a/packages/webhook-utils/src/filters/webhooks-to-remove.ts b/packages/webhook-utils/src/filters/webhooks-to-remove.ts index fa642305ac..ced304f514 100644 --- a/packages/webhook-utils/src/filters/webhooks-to-remove.ts +++ b/packages/webhook-utils/src/filters/webhooks-to-remove.ts @@ -1,4 +1,5 @@ import { WebhookManifest } from "@saleor/app-sdk/types"; + import { WebhookData } from "../types"; interface WebhooksToRemoveArgs { diff --git a/packages/webhook-utils/src/modify-app-webhook-from-manifest.ts b/packages/webhook-utils/src/modify-app-webhook-from-manifest.ts index 6f3a6cf05d..27918f96f3 100644 --- a/packages/webhook-utils/src/modify-app-webhook-from-manifest.ts +++ b/packages/webhook-utils/src/modify-app-webhook-from-manifest.ts @@ -1,5 +1,6 @@ import { WebhookManifest } from "@saleor/app-sdk/types"; import { Client } from "urql"; + import { WebhookEventTypeAsyncEnum, WebhookEventTypeSyncEnum } from "../generated/graphql"; import { modifyAppWebhook } from "./operations/modify-app-webhook"; diff --git a/packages/webhook-utils/src/modify-app-webhook-from-webhook-details.ts b/packages/webhook-utils/src/modify-app-webhook-from-webhook-details.ts index 914e59ea04..ed630394dd 100644 --- a/packages/webhook-utils/src/modify-app-webhook-from-webhook-details.ts +++ b/packages/webhook-utils/src/modify-app-webhook-from-webhook-details.ts @@ -1,4 +1,5 @@ import { type Client } from "urql"; + import { modifyAppWebhook } from "./operations/modify-app-webhook"; import { type WebhookData } from "./types";