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

Fix form error

Browse source
This commit is contained in:
dominik-zeglen 2020-03-16 10:55:16 +01:00
parent a7749b6aac
commit e21d4803d4
2 changed files with 18 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/services/views/ServiceCreate/ServiceCreate.tsx
View file

@ -6,7 +6,6 @@ import useNavigator from "@saleor/hooks/useNavigator";
import useNotifier from "@saleor/hooks/useNotifier"; import useNotifier from "@saleor/hooks/useNotifier";
import useShop from "@saleor/hooks/useShop"; import useShop from "@saleor/hooks/useShop";
import { commonMessages } from "@saleor/intl"; import { commonMessages } from "@saleor/intl";
import { maybe } from "@saleor/misc";
import { ServiceCreateMutation } from "@saleor/services/mutations"; import { ServiceCreateMutation } from "@saleor/services/mutations";
import { ServiceCreate as ServiceCreateData } from "@saleor/services/types/ServiceCreate"; import { ServiceCreate as ServiceCreateData } from "@saleor/services/types/ServiceCreate";
import ServiceCreatePage, { import ServiceCreatePage, {
@ -61,13 +60,10 @@ export const ServiceCreate: React.FC<ServiceCreateProps> = ({ setToken }) => {
/> />
<ServiceCreatePage <ServiceCreatePage
disabled={false} disabled={false}
errors={maybe( errors={serviceCreateOpts.data?.serviceAccountCreate.errors || []}
() => serviceCreateOpts.data.serviceAccountCreate.errors,
[]
)}
onBack={handleBack} onBack={handleBack}
onSubmit={handleSubmit} onSubmit={handleSubmit}
permissions={maybe(() => shop.permissions)} permissions={shop?.permissions}
saveButtonBarState={serviceCreateOpts.status} saveButtonBarState={serviceCreateOpts.status}
/> />
</> </>

33
src/services/views/ServiceDetails/ServiceDetails.tsx
View file

@ -7,7 +7,7 @@ import useNavigator from "@saleor/hooks/useNavigator";
import useNotifier from "@saleor/hooks/useNotifier"; import useNotifier from "@saleor/hooks/useNotifier";
import useShop from "@saleor/hooks/useShop"; import useShop from "@saleor/hooks/useShop";
import { commonMessages } from "@saleor/intl"; import { commonMessages } from "@saleor/intl";
import { maybe } from "@saleor/misc"; import { maybe, getStringOrPlaceholder } from "@saleor/misc";
import ServiceDeleteDialog from "@saleor/services/components/ServiceDeleteDialog"; import ServiceDeleteDialog from "@saleor/services/components/ServiceDeleteDialog";
import ServiceTokenCreateDialog from "@saleor/services/components/ServiceTokenCreateDialog"; import ServiceTokenCreateDialog from "@saleor/services/components/ServiceTokenCreateDialog";
import ServiceTokenDeleteDialog from "@saleor/services/components/ServiceTokenDeleteDialog"; import ServiceTokenDeleteDialog from "@saleor/services/components/ServiceTokenDeleteDialog";
@ -154,15 +154,16 @@ export const ServiceDetails: React.FC<OrderListProps> = ({
return ( return (
<> <>
<WindowTitle title={service?.name || "..."} /> <WindowTitle
title={getStringOrPlaceholder(service?.name)}
/>
<ServiceDetailsPage <ServiceDetailsPage
apiUri={API_URI} apiUri={API_URI}
disabled={loading} disabled={loading}
errors={maybe( errors={
() => updateServiceOpts.data?.serviceAccountUpdate
updateServiceOpts.data.serviceAccountUpdate .errors || []
.errors }
)}
token={token} token={token}
onApiUriClick={() => open(API_URI, "blank")} onApiUriClick={() => open(API_URI, "blank")}
onBack={handleBack} onBack={handleBack}
@ -175,15 +176,14 @@ export const ServiceDetails: React.FC<OrderListProps> = ({
id id
}) })
} }
permissions={maybe(() => shop.permissions)} permissions={shop?.permissions}
service={maybe(() => data.serviceAccount)} service={data?.serviceAccount}
saveButtonBarState={updateServiceOpts.status} saveButtonBarState={updateServiceOpts.status}
/> />
<ServiceDeleteDialog <ServiceDeleteDialog
confirmButtonState={deleteServiceOpts.status} confirmButtonState={deleteServiceOpts.status}
name={maybe( name={getStringOrPlaceholder(
() => data.serviceAccount.name, data?.serviceAccount?.name
"..."
)} )}
onClose={closeModal} onClose={closeModal}
onConfirm={handleRemoveConfirm} onConfirm={handleRemoveConfirm}
@ -194,11 +194,10 @@ export const ServiceDetails: React.FC<OrderListProps> = ({
onClose={closeModal} onClose={closeModal}
onCreate={handleTokenCreate} onCreate={handleTokenCreate}
open={params.action === "create-token"} open={params.action === "create-token"}
token={maybe( token={
() => createTokenOpts.data
createTokenOpts.data ?.serviceAccountTokenCreate.authToken
.serviceAccountTokenCreate.authToken }
)}
/> />
<ServiceTokenDeleteDialog <ServiceTokenDeleteDialog
confirmButtonState={deleteTokenOpts.status} confirmButtonState={deleteTokenOpts.status}