djkato/saleor-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes afer merge

Browse source
This commit is contained in:
Magdalena Markusik 2020-09-18 16:40:48 +02:00
parent 7631a7a281
commit d20b58dd79
28 changed files with 64 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/categories/components/CategoryCreatePage/CategoryCreatePage.tsx
View file

@ -19,6 +19,7 @@ import CategoryDetailsForm from "../../components/CategoryDetailsForm";
export interface FormData extends MetadataFormData {
description: RawDraftContentState;
name: string;
slug: string;
seoTitle: string;
seoDescription: string;
}
@ -29,7 +30,8 @@ const initialData: FormData = {
name: "",
privateMetadata: [],
seoDescription: "",
seoTitle: ""
seoTitle: "",
slug: ""
};
export interface CategoryCreatePageProps {
@ -81,6 +83,8 @@ export const CategoryCreatePage: React.FC<CategoryCreatePageProps> = ({
defaultMessage:
"Add search engine title and description to make this category easier to find"
})}
slug={data.slug}
slugPlaceholder={data.name}
title={data.seoTitle}
titlePlaceholder={data.name}
description={data.seoDescription}

8
src/categories/components/CategoryUpdatePage/CategoryUpdatePage.tsx
View file

@ -118,7 +118,8 @@ export const CategoryUpdatePage: React.FC<CategoryUpdatePageProps> = ({
name: category.name || "",
privateMetadata: category?.privateMetadata?.map(mapMetadataItemToInput),
seoDescription: category.seoDescription || "",
seoTitle: category.seoTitle || ""
seoTitle: category.seoTitle || "",
slug: category?.slug || ""
}
: {
backgroundImageAlt: "",
@ -127,7 +128,8 @@ export const CategoryUpdatePage: React.FC<CategoryUpdatePageProps> = ({
name: "",
privateMetadata: undefined,
seoDescription: "",
seoTitle: ""
seoTitle: "",
slug: ""
};
const handleSubmit = (data: FormData) => {
@ -179,6 +181,8 @@ export const CategoryUpdatePage: React.FC<CategoryUpdatePageProps> = ({
titlePlaceholder={data.name}
description={data.seoDescription}
descriptionPlaceholder={data.name}
slug={data.slug}
slugPlaceholder={data.name}
loading={!category}
onChange={change}
disabled={disabled}

1
src/categories/types/CategoryCreate.ts
View file

@ -38,6 +38,7 @@ export interface CategoryCreate_categoryCreate_category {
privateMetadata: (CategoryCreate_categoryCreate_category_privateMetadata | null)[];
backgroundImage: CategoryCreate_categoryCreate_category_backgroundImage | null;
name: string;
slug: string;
descriptionJson: any;
seoDescription: string | null;
seoTitle: string | null;

1
src/categories/types/CategoryDetails.ts
View file

@ -147,6 +147,7 @@ export interface CategoryDetails_category {
privateMetadata: (CategoryDetails_category_privateMetadata | null)[];
backgroundImage: CategoryDetails_category_backgroundImage | null;
name: string;
slug: string;
descriptionJson: any;
seoDescription: string | null;
seoTitle: string | null;

1
src/categories/types/CategoryUpdate.ts
View file

@ -38,6 +38,7 @@ export interface CategoryUpdate_categoryUpdate_category {
privateMetadata: (CategoryUpdate_categoryUpdate_category_privateMetadata | null)[];
backgroundImage: CategoryUpdate_categoryUpdate_category_backgroundImage | null;
name: string;
slug: string;
descriptionJson: any;
seoDescription: string | null;
seoTitle: string | null;

6
src/collections/components/CollectionCreatePage/CollectionCreatePage.tsx
View file

@ -28,6 +28,7 @@ export interface CollectionCreatePageFormData extends MetadataFormData {
backgroundImageAlt: string;
description: RawDraftContentState;
name: string;
slug: string;
publicationDate: string;
isPublished: boolean;
seoDescription: string;
@ -55,7 +56,8 @@ const initialForm: CollectionCreatePageFormData = {
privateMetadata: [],
publicationDate: "",
seoDescription: "",
seoTitle: ""
seoTitle: "",
slug: ""
};
const CollectionCreatePage: React.FC<CollectionCreatePageProps> = ({
@ -140,6 +142,8 @@ const CollectionCreatePage: React.FC<CollectionCreatePageProps> = ({
defaultMessage:
"Add search engine title and description to make this collection easier to find"
})}
slug={data.slug}
slugPlaceholder={data.name}
title={data.seoTitle}
titlePlaceholder={data.name}
onChange={change}

6
src/collections/components/CollectionDetailsPage/CollectionDetailsPage.tsx
View file

@ -33,6 +33,7 @@ export interface CollectionDetailsPageFormData extends MetadataFormData {
backgroundImageAlt: string;
description: RawDraftContentState;
name: string;
slug: string;
publicationDate: string;
seoDescription: string;
seoTitle: string;
@ -101,7 +102,8 @@ const CollectionDetailsPage: React.FC<CollectionDetailsPageProps> = ({
),
publicationDate: maybe(() => collection.publicationDate, ""),
seoDescription: maybe(() => collection.seoDescription, ""),
seoTitle: maybe(() => collection.seoTitle, "")
seoTitle: maybe(() => collection.seoTitle, ""),
slug: collection.slug || ""
}}
onSubmit={handleSubmit}
confirmLeave
@ -149,6 +151,8 @@ const CollectionDetailsPage: React.FC<CollectionDetailsPageProps> = ({
defaultMessage:
"Add search engine title and description to make this collection easier to find"
})}
slug={data.slug}
slugPlaceholder={data.name}
title={data.seoTitle}
titlePlaceholder={maybe(() => collection.name)}
onChange={change}

1
src/collections/types/CollectionDetails.ts
View file

@ -71,6 +71,7 @@ export interface CollectionDetails_collection {
metadata: (CollectionDetails_collection_metadata | null)[];
privateMetadata: (CollectionDetails_collection_privateMetadata | null)[];
backgroundImage: CollectionDetails_collection_backgroundImage | null;
slug: string;
descriptionJson: any;
publicationDate: any | null;
seoDescription: string | null;

1
src/collections/types/CollectionUpdate.ts
View file

@ -34,6 +34,7 @@ export interface CollectionUpdate_collectionUpdate_collection {
metadata: (CollectionUpdate_collectionUpdate_collection_metadata | null)[];
privateMetadata: (CollectionUpdate_collectionUpdate_collection_privateMetadata | null)[];
backgroundImage: CollectionUpdate_collectionUpdate_collection_backgroundImage | null;
slug: string;
descriptionJson: any;
publicationDate: any | null;
seoDescription: string | null;

1
src/collections/types/CollectionUpdateWithHomepage.ts
View file

@ -56,6 +56,7 @@ export interface CollectionUpdateWithHomepage_collectionUpdate_collection {
metadata: (CollectionUpdateWithHomepage_collectionUpdate_collection_metadata | null)[];
privateMetadata: (CollectionUpdateWithHomepage_collectionUpdate_collection_privateMetadata | null)[];
backgroundImage: CollectionUpdateWithHomepage_collectionUpdate_collection_backgroundImage | null;
slug: string;
descriptionJson: any;
publicationDate: any | null;
seoDescription: string | null;

1
src/collections/types/CreateCollection.ts
View file

@ -34,6 +34,7 @@ export interface CreateCollection_collectionCreate_collection {
metadata: (CreateCollection_collectionCreate_collection_metadata | null)[];
privateMetadata: (CreateCollection_collectionCreate_collection_privateMetadata | null)[];
backgroundImage: CreateCollection_collectionCreate_collection_backgroundImage | null;
slug: string;
descriptionJson: any;
publicationDate: any | null;
seoDescription: string | null;

20
src/components/SeoForm/SeoForm.tsx
View file

@ -7,6 +7,7 @@ import Typography from "@material-ui/core/Typography";
import classNames from "classnames";
import React from "react";
import { FormattedMessage, useIntl } from "react-intl";
import slugify from "slugify";
import CardTitle from "../CardTitle";
import FormSpacer from "../FormSpacer";
@ -68,6 +69,8 @@ interface SeoFormProps {
loading?: boolean;
helperText?: string;
title: string;
slug: string;
slugPlaceholder?: string;
titlePlaceholder: string;
onChange(event: any);
onClick?();
@ -75,13 +78,14 @@ interface SeoFormProps {
const SeoForm: React.FC<SeoFormProps> = props => {
const {
description,
description = "",
descriptionPlaceholder,
disabled,
helperText,
loading,
title,
title = "",
slug,
slugPlaceholder = "",
titlePlaceholder,
onChange
} = props;
@ -90,7 +94,9 @@ const SeoForm: React.FC<SeoFormProps> = props => {
const intl = useIntl();
const [expanded, setExpansionStatus] = React.useState(false);
const toggleExpansion = () => setExpansionStatus(!expanded);
const shouldDisplayHelperText = () => helperText && !expanded;
console.log({ slug });
return (
<Card>
<CardTitle
@ -107,7 +113,7 @@ const SeoForm: React.FC<SeoFormProps> = props => {
}
/>
<CardContent>
{helperText && (
{shouldDisplayHelperText() && (
<Typography
className={classNames({ [classes.helperText]: expanded })}
>
@ -123,14 +129,14 @@ const SeoForm: React.FC<SeoFormProps> = props => {
<div className={classes.label}>
<FormattedMessage defaultMessage="Slug" />
</div>
{title.length > 0 && (
{slug?.length > 0 && (
<span>
<FormattedMessage
defaultMessage="{numberOfCharacters} of {maxCharacters} characters"
description="character limit"
values={{
maxCharacters: 70,
numberOfCharacters: slug.length
numberOfCharacters: slug?.length
}}
/>
</span>
@ -141,9 +147,9 @@ const SeoForm: React.FC<SeoFormProps> = props => {
defaultMessage:
"If empty, the preview shows what will be autogenerated."
})}
value={title.slice(0, 69)}
value={slug.slice(0, 69)}
disabled={loading || disabled}
placeholder="Slug"
placeholder={slug || slugify(slugPlaceholder)}
onChange={onChange}
fullWidth
/>

1
src/fragments/categories.ts
View file

@ -24,6 +24,7 @@ export const categoryDetailsFragment = gql`
url
}
name
slug
descriptionJson
seoDescription
seoTitle

1
src/fragments/collections.ts
View file

@ -20,6 +20,7 @@ export const collectionDetailsFragment = gql`
alt
url
}
slug
descriptionJson
publicationDate
seoDescription

1
src/fragments/products.ts
View file

@ -111,6 +111,7 @@ export const productFragmentDetails = gql`
...ProductVariantAttributesFragment
...MetadataFragment
name
slug
descriptionJson
seoTitle
seoDescription

1
src/fragments/types/CategoryDetailsFragment.ts
View file

@ -36,6 +36,7 @@ export interface CategoryDetailsFragment {
privateMetadata: (CategoryDetailsFragment_privateMetadata | null)[];
backgroundImage: CategoryDetailsFragment_backgroundImage | null;
name: string;
slug: string;
descriptionJson: any;
seoDescription: string | null;
seoTitle: string | null;

1
src/fragments/types/CollectionDetailsFragment.ts
View file

@ -32,6 +32,7 @@ export interface CollectionDetailsFragment {
metadata: (CollectionDetailsFragment_metadata | null)[];
privateMetadata: (CollectionDetailsFragment_privateMetadata | null)[];
backgroundImage: CollectionDetailsFragment_backgroundImage | null;
slug: string;
descriptionJson: any;
publicationDate: any | null;
seoDescription: string | null;

1
src/fragments/types/Product.ts
View file

@ -195,6 +195,7 @@ export interface Product {
metadata: (Product_metadata | null)[];
privateMetadata: (Product_privateMetadata | null)[];
name: string;
slug: string;
descriptionJson: any;
seoTitle: string | null;
seoDescription: string | null;

4
src/pages/components/PageDetailsPage/PageDetailsPage.tsx
View file

@ -23,7 +23,6 @@ import { useIntl } from "react-intl";
import { maybe } from "../../../misc";
import { PageDetails_page } from "../../types/PageDetails";
import PageInfo from "../PageInfo";
import PageSlug from "../PageSlug";
export interface FormData {
content: RawDraftContentState;
@ -31,7 +30,6 @@ export interface FormData {
publicationDate: string;
seoDescription: string;
seoTitle: string;
seoSlug: string;
slug: string;
title: string;
}
@ -108,6 +106,8 @@ const PageDetailsPage: React.FC<PageDetailsPageProps> = ({
""
)}
onChange={change}
slug={data.slug}
slugPlaceholder={data.title}
title={data.seoTitle}
titlePlaceholder={data.title}
helperText={intl.formatMessage({

4
src/products/components/ProductCreatePage/ProductCreatePage.tsx
View file

@ -59,6 +59,7 @@ interface FormData extends MetadataFormData {
isAvailableForPurchase: boolean;
isPublished: boolean;
name: string;
slug: string;
productType: string;
seoDescription: string;
seoTitle: string;
@ -156,6 +157,7 @@ export const ProductCreatePage: React.FC<ProductCreatePageProps> = ({
isPublished: false,
metadata: [],
name: "",
slug: "",
privateMetadata: [],
productType: "",
publicationDate: "",
@ -309,6 +311,8 @@ export const ProductCreatePage: React.FC<ProductCreatePageProps> = ({
"Add search engine title and description to make this product easier to find"
})}
title={data.seoTitle}
slug={data.slug}
slugPlaceholder={data.name}
titlePlaceholder={data.name}
description={data.seoDescription}
descriptionPlaceholder={data.seoTitle}

2
src/products/components/ProductUpdatePage/ProductUpdatePage.tsx
View file

@ -357,6 +357,8 @@ export const ProductUpdatePage: React.FC<ProductUpdatePageProps> = ({
.getPlainText()
.slice(0, 300)
)}
slug={data.slug}
slugPlaceholder={data.name}
loading={disabled}
onClick={onSeoClick}
onChange={change}

1
src/products/types/ProductCreate.ts
View file

@ -201,6 +201,7 @@ export interface ProductCreate_productCreate_product {
metadata: (ProductCreate_productCreate_product_metadata | null)[];
privateMetadata: (ProductCreate_productCreate_product_privateMetadata | null)[];
name: string;
slug: string;
descriptionJson: any;
seoTitle: string | null;
seoDescription: string | null;

1
src/products/types/ProductDetails.ts
View file

@ -195,6 +195,7 @@ export interface ProductDetails_product {
metadata: (ProductDetails_product_metadata | null)[];
privateMetadata: (ProductDetails_product_privateMetadata | null)[];
name: string;
slug: string;
descriptionJson: any;
seoTitle: string | null;
seoDescription: string | null;

1
src/products/types/ProductImageCreate.ts
View file

@ -201,6 +201,7 @@ export interface ProductImageCreate_productImageCreate_product {
metadata: (ProductImageCreate_productImageCreate_product_metadata | null)[];
privateMetadata: (ProductImageCreate_productImageCreate_product_privateMetadata | null)[];
name: string;
slug: string;
descriptionJson: any;
seoTitle: string | null;
seoDescription: string | null;

1
src/products/types/ProductImageUpdate.ts
View file

@ -201,6 +201,7 @@ export interface ProductImageUpdate_productImageUpdate_product {
metadata: (ProductImageUpdate_productImageUpdate_product_metadata | null)[];
privateMetadata: (ProductImageUpdate_productImageUpdate_product_privateMetadata | null)[];
name: string;
slug: string;
descriptionJson: any;
seoTitle: string | null;
seoDescription: string | null;

2
src/products/types/ProductUpdate.ts
View file

@ -201,6 +201,7 @@ export interface ProductUpdate_productUpdate_product {
metadata: (ProductUpdate_productUpdate_product_metadata | null)[];
privateMetadata: (ProductUpdate_productUpdate_product_privateMetadata | null)[];
name: string;
slug: string;
descriptionJson: any;
seoTitle: string | null;
seoDescription: string | null;
@ -236,6 +237,7 @@ export interface ProductUpdateVariables {
publicationDate?: any | null;
category?: string | null;
chargeTaxes: boolean;
slug?: string | null;
collections?: (string | null)[] | null;
descriptionJson?: any | null;
isPublished: boolean;

1
src/products/types/SimpleProductUpdate.ts
View file

@ -201,6 +201,7 @@ export interface SimpleProductUpdate_productUpdate_product {
metadata: (SimpleProductUpdate_productUpdate_product_metadata | null)[];
privateMetadata: (SimpleProductUpdate_productUpdate_product_privateMetadata | null)[];
name: string;
slug: string;
descriptionJson: any;
seoTitle: string | null;
seoDescription: string | null;

2
src/products/utils/data.ts
View file

@ -181,6 +181,7 @@ export interface ProductUpdatePageFormData extends MetadataFormData {
isAvailable: boolean;
isPublished: boolean;
name: string;
slug: string;
publicationDate: string;
seoDescription: string;
seoTitle: string;
@ -222,6 +223,7 @@ export function getProductUpdatePageFormData(
: undefined,
""
),
slug: product?.slug || "",
trackInventory: !!product?.variants[0]?.trackInventory,
visibleInListings: !!product?.visibleInListings,
weight: product?.weight?.value.toString() || ""