diff --git a/.changeset/rare-crews-guess.md b/.changeset/rare-crews-guess.md new file mode 100644 index 0000000..6f71c06 --- /dev/null +++ b/.changeset/rare-crews-guess.md @@ -0,0 +1,5 @@ +--- +"saleor-app-cms": minor +--- + +Redesigned the app to better match new Dashboard diff --git a/apps/cms/next.config.js b/apps/cms/next.config.js index 58c02e3..964c407 100644 --- a/apps/cms/next.config.js +++ b/apps/cms/next.config.js @@ -14,6 +14,7 @@ module.exports = { disableServerWebpackPlugin: !isSentryPropertiesInEnvironment, disableClientWebpackPlugin: !isSentryPropertiesInEnvironment, }, + transpilePackages: ["@saleor/apps-shared"], }; module.exports = withSentryConfig(module.exports, { silent: true }, { hideSourcemaps: true }); diff --git a/apps/cms/package.json b/apps/cms/package.json index cff13bf..03faefc 100644 --- a/apps/cms/package.json +++ b/apps/cms/package.json @@ -38,7 +38,8 @@ "usehooks-ts": "^2.9.1", "uuid": "^9.0.0", "vite": "^4.1.4", - "zod": "^3.19.1" + "zod": "^3.19.1", + "@saleor/apps-shared": "workspace:*" }, "devDependencies": { "@graphql-codegen/cli": "2.13.3", diff --git a/apps/cms/src/lib/cms/client/clients-operations.ts b/apps/cms/src/lib/cms/client/clients-operations.ts index e51a173..cf88712 100644 --- a/apps/cms/src/lib/cms/client/clients-operations.ts +++ b/apps/cms/src/lib/cms/client/clients-operations.ts @@ -1,14 +1,13 @@ import { NextWebhookApiHandler } from "@saleor/app-sdk/handlers/next"; -import { createClient } from "../../graphql"; import { createSettingsManager } from "../../metadata"; import { getOperationType } from "./operations"; import { getChannelsSettings, - getProviderInstancesSettings, getProductVariantProviderInstancesToAlter, + getProviderInstancesSettings, } from "./settings"; import { providersSchemaSet } from "../config"; -import { cmsProviders, CMSProvider } from "../providers"; +import { CMSProvider, cmsProviders } from "../providers"; import { CmsClientOperations } from "../types"; import { logger as pinoLogger } from "../../logger"; import { getCmsIdFromSaleorItemKey } from "./metadata"; diff --git a/apps/cms/src/lib/cms/client/metadata-execution.ts b/apps/cms/src/lib/cms/client/metadata-execution.ts index a66a682..193fc50 100644 --- a/apps/cms/src/lib/cms/client/metadata-execution.ts +++ b/apps/cms/src/lib/cms/client/metadata-execution.ts @@ -1,8 +1,6 @@ -import { AuthData } from "@saleor/app-sdk/APL"; import { NextWebhookApiHandler } from "@saleor/app-sdk/handlers/next"; import { DeleteMetadataDocument, - ProductVariantUpdatedWebhookPayloadFragment, UpdateMetadataDocument, WebhookProductVariantFragment, } from "../../../../generated/graphql"; diff --git a/apps/cms/src/lib/cms/client/settings.ts b/apps/cms/src/lib/cms/client/settings.ts index f16f0b6..3506bce 100644 --- a/apps/cms/src/lib/cms/client/settings.ts +++ b/apps/cms/src/lib/cms/client/settings.ts @@ -1,6 +1,5 @@ import { EncryptedMetadataManager } from "@saleor/app-sdk/settings-manager"; import { CMSSchemaChannels, CMSSchemaProviderInstances } from "../config"; -import { createCmsKeyForSaleorItem, getCmsIdFromSaleorItemKey } from "./metadata"; export const getChannelsSettings = async (settingsManager: EncryptedMetadataManager) => { const channelsSettings = await settingsManager.get("channels"); diff --git a/apps/cms/src/lib/metadata.ts b/apps/cms/src/lib/metadata.ts index b3104cf..89d57c0 100644 --- a/apps/cms/src/lib/metadata.ts +++ b/apps/cms/src/lib/metadata.ts @@ -1,4 +1,4 @@ -import { MetadataEntry, EncryptedMetadataManager } from "@saleor/app-sdk/settings-manager"; +import { EncryptedMetadataManager, MetadataEntry } from "@saleor/app-sdk/settings-manager"; import { Client } from "urql"; import { diff --git a/apps/cms/src/modules/channels/ui/channel-configuration-form.tsx b/apps/cms/src/modules/channels/ui/channel-configuration-form.tsx index de94fad..62604fe 100644 --- a/apps/cms/src/modules/channels/ui/channel-configuration-form.tsx +++ b/apps/cms/src/modules/channels/ui/channel-configuration-form.tsx @@ -1,18 +1,17 @@ import { zodResolver } from "@hookform/resolvers/zod"; -import { Checkbox, FormControl, FormControlLabel, Switch, Typography } from "@material-ui/core"; +import { Checkbox, FormControl, Typography } from "@material-ui/core"; import { - makeStyles, + Button, List, ListBody, + ListFooter, ListHeader, ListItem, ListItemCell, - ListFooter, - Button, + makeStyles, } from "@saleor/macaw-ui"; import React from "react"; -import { Controller, useController, useForm } from "react-hook-form"; -import { z } from "zod"; +import { useForm } from "react-hook-form"; import { channelSchema, ChannelSchema, @@ -39,6 +38,10 @@ const useStyles = makeStyles((theme) => { justifyContent: "flex-end", padding: theme.spacing(2, 4), }, + form: { + border: `1px solid hsla(212, 44%, 13%, 0.08)`, + borderRadius: 8, + }, }; }); @@ -87,7 +90,7 @@ export const ChannelConfigurationForm = ({ const errors = formState.errors; return ( -