Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨ Field and component level access restriction #1891 #2707

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+845 −394
Open

✨ Field and component level access restriction #1891 #2707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7d7edd5
✨ Initial commit #1891
padms Sep 26, 2024
25a8217
Merge main
padms Dec 2, 2024
cae5490
💡 Unused import and comments #1891
padms Dec 3, 2024
9d70261
♻️ Read only wrapper #1891
padms Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions sanityv3/actions/fieldActions/CustomCopyFieldAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,6 @@ export const copyAction = defineDocumentFieldAction({
description: 'Cannot copy document. Use duplicate instead.',
})
return
} else if (path[0] === 'lang') {
toast.push({
title: 'Cannot copy language',
description: 'Copying language is not allowed.',
})
return
}
const value = getFormValue([]) as FormDocumentValue
onCopy(path, value, {
Expand Down
2 changes: 1 addition & 1 deletion sanityv3/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"react-dom": "^18.2.0",
"react-is": "^18.2.0",
"rxjs": "^7.8.0",
"sanity": "^3.52.4",
"sanity": "^3.62.0",
"sanity-plugin-documents-pane": "^2.1.0",
"sanity-plugin-iframe-pane": "^2.3.0",
"sanity-plugin-media": "^2.2.5",
Expand Down
691 changes: 494 additions & 197 deletions sanityv3/pnpm-lock.yaml
View file
Open in desktop

Large diffs are not rendered by default.

65 changes: 34 additions & 31 deletions sanityv3/schemas/components/Breadcrumbs/BreadcrumbsInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ import { BreadcrumbsPreview } from './BreadcrumbsPreview'
import { getObjectMemberField } from '../utils/getObjectMemberField'
import { constructBreadcrumbs } from './utils/constructBreadcrumbs'
import { apiVersion } from '../../../sanity.client'
import { ReadOnlyWrapper } from '../common/ReadOnlyWrapper'

type BreadCrumbsInputProps = {
value?: Reference[]
} & ObjectInputProps

export const BreadcrumbsInput = (props: BreadCrumbsInputProps) => {
const { value, members, renderField, renderInput, renderItem, renderPreview } = props
const { value, members, renderField, renderInput, renderItem, renderPreview, readOnly } = props

const client = useClient({ apiVersion: apiVersion })
const slug = useFormValue([`slug`]) as SlugValue
Expand Down Expand Up @@ -76,42 +77,44 @@ export const BreadcrumbsInput = (props: BreadCrumbsInputProps) => {
if (!enableBreadcrumbs || !useCustomBreadcrumbs || !customBreadcrumbs) return null

return (
<Card padding={[3, 3, 4]} radius={2} shadow={1}>
<Stack space={3}>
<Text size={1}>Here you can control the breadcrumbs for this page. Breadcrumbs are disabled by default.</Text>

<Grid columns={2} gap={3}>
<MemberField
member={enableBreadcrumbs}
renderInput={renderInput}
renderField={renderField}
renderItem={renderItem}
renderPreview={renderPreview}
/>

{value?.enableBreadcrumbs && (
<ReadOnlyWrapper readOnly={readOnly}>
<Card padding={[3, 3, 4]} radius={2} shadow={1}>
<Stack space={3}>
<Text size={1}>Here you can control the breadcrumbs for this page. Breadcrumbs are disabled by default.</Text>

<Grid columns={2} gap={3}>
<MemberField
member={enableBreadcrumbs}
renderInput={renderInput}
renderField={renderField}
renderItem={renderItem}
renderPreview={renderPreview}
/>

{value?.enableBreadcrumbs && (
<MemberField
member={useCustomBreadcrumbs}
renderInput={renderInput}
renderField={renderField}
renderItem={renderItem}
renderPreview={renderPreview}
/>
)}
</Grid>

{value?.enableBreadcrumbs && <BreadcrumbsPreview breadcrumbs={breadcrumbs || defaultBreadcrumbs} />}

{value?.enableBreadcrumbs && value?.useCustomBreadcrumbs && (
<MemberField
member={useCustomBreadcrumbs}
member={customBreadcrumbs}
renderInput={renderInput}
renderField={renderField}
renderItem={renderItem}
renderPreview={renderPreview}
/>
)}
</Grid>

{value?.enableBreadcrumbs && <BreadcrumbsPreview breadcrumbs={breadcrumbs || defaultBreadcrumbs} />}

{value?.enableBreadcrumbs && value?.useCustomBreadcrumbs && (
<MemberField
member={customBreadcrumbs}
renderInput={renderInput}
renderField={renderField}
renderItem={renderItem}
renderPreview={renderPreview}
/>
)}
</Stack>
</Card>
</Stack>
</Card>
</ReadOnlyWrapper>
)
}
45 changes: 24 additions & 21 deletions sanityv3/schemas/components/ColorSelector/ColorSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { set } from 'sanity'
import type { ObjectInputProps } from 'sanity'
import styled from 'styled-components'
import { defaultColors } from '../../defaultColors'
import { ReadOnlyWrapper } from '../common/ReadOnlyWrapper'

const Circle = styled.div<{ active: boolean }>`
display: inline-block;
Expand Down Expand Up @@ -57,7 +58,7 @@ const ColorCircle = ({ color, active, onClickHandler }: ColorCircleProps) => (

type ColorSelectorProps = ObjectInputProps

export const ColorSelector = ({ value, onChange, schemaType }: ColorSelectorProps) => {
export const ColorSelector = ({ value, onChange, schemaType, readOnly }: ColorSelectorProps) => {
const { options } = schemaType
const colors = (options?.colors as ColorSelectorValue[]) || defaultColors

Expand All @@ -74,26 +75,28 @@ export const ColorSelector = ({ value, onChange, schemaType }: ColorSelectorProp
)

return (
<Stack space={3}>
{colors && (
<Card>
<Flex direction={'row'} wrap={'wrap'}>
{colors
.filter((colorItem: ColorSelectorValue) => !colorItem?.onlyTextColor)
.map((colorItem: ColorSelectorValue) => {
return (
<ColorCircle
key={colorItem.value}
color={colorItem}
active={colorItem.value === value?.value}
onClickHandler={handleSelect}
/>
)
})}
</Flex>
</Card>
)}
</Stack>
<ReadOnlyWrapper readOnly={readOnly}>
<Stack space={3}>
{colors && (
<Card>
<Flex direction={'row'} wrap={'wrap'}>
{colors
.filter((colorItem: ColorSelectorValue) => !colorItem?.onlyTextColor)
.map((colorItem: ColorSelectorValue) => {
return (
<ColorCircle
key={colorItem.value}
color={colorItem}
active={colorItem.value === value?.value}
onClickHandler={handleSelect}
/>
)
})}
</Flex>
</Card>
)}
</Stack>
</ReadOnlyWrapper>
)
}

Expand Down
Loading
Loading