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

[7095] Rename dialog offers the ability to edit a broken reference but will not allow the user to open the content form #4079

Draft
wants to merge 9 commits into
base: develop
Choose a base branch
from
Draft

[7095] Rename dialog offers the ability to edit a broken reference but will not allow the user to open the content form #4079

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
efb28dc
[7095] Rename dialog offers the ability to edit a broken reference bu…
jvega190 Jul 31, 2024
b700bdd
Merge branch 'develop' of https://github.com/craftercms/studio-ui int…
jvega190 Aug 29, 2024
c664383
Revert "[7095] Rename dialog offers the ability to edit a broken refe…
jvega190 Aug 29, 2024
f138828
[7095] Add separate form dialog to open dependency - Initial work
jvega190 Aug 29, 2024
555bbf4
[7095] Add formId to form iframe to identify messages
jvega190 Sep 2, 2024
b01d580
[7095] Re-fetch dependants on contentEvent
jvega190 Sep 3, 2024
4b5e80c
[7095] Update to use useId hook, combine fetchDependants effects
jvega190 Sep 5, 2024
46113f9
[7095] Consider taxonomies in handleEditorDisplay
jvega190 Sep 9, 2024
718a61d
[7095] Consider taxonomies in openItemEditor util
jvega190 Sep 10, 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
1 change: 1 addition & 0 deletions ui/app/src/components/LegacyFormDialog/LegacyFormDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ export function LegacyFormDialog(props: LegacyFormDialogProps) {
onRenamed={onContentRenamed}
path={renameContentDialogData.path}
value={renameContentDialogData.value}
allowEditDependencies={false}
/>
</>
);
Expand Down
4 changes: 3 additions & 1 deletion ui/app/src/components/RenameContentDialog/RenameContentDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,13 @@ import { ensureSingleSlash, isBlank } from '../../utils/string';
export interface RenameContentDialogProps extends EnhancedDialogProps {
path: string;
value?: string;
allowEditDependencies?: boolean;
onRenamed(name: string): void;
onSubmittingAndOrPendingChange(value: onSubmittingAndOrPendingChangeProps): void;
}

export function RenameContentDialog(props: RenameContentDialogProps) {
const { path, value, onRenamed, onSubmittingAndOrPendingChange, ...dialogProps } = props;
const { path, value, allowEditDependencies, onRenamed, onSubmittingAndOrPendingChange, ...dialogProps } = props;
const [dependantItems, setDependantItems] = useState<DetailedItem[]>(null);
const [fetchingDependantItems, setFetchingDependantItems] = useState(false);
const [error, setError] = useState(null);
Expand Down Expand Up @@ -73,6 +74,7 @@ export function RenameContentDialog(props: RenameContentDialogProps) {
onSubmittingAndOrPendingChange={onSubmittingAndOrPendingChange}
onRenamed={onRenamed}
error={error}
allowEditDependencies={allowEditDependencies}
/>
</EnhancedDialog>
);
Expand Down
4 changes: 3 additions & 1 deletion ui/app/src/components/RenameContentDialog/RenameContentDialogContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import { applyContentNameRules } from '../../utils/content';
export interface RenameContentDialogContainerProps
extends Pick<
RenameContentDialogProps,
'path' | 'value' | 'onRenamed' | 'onClose' | 'onSubmittingAndOrPendingChange'
'path' | 'value' | 'onRenamed' | 'onClose' | 'onSubmittingAndOrPendingChange' | 'allowEditDependencies'
> {
dependantItems: DetailedItem[];
fetchingDependantItems: boolean;
Expand All @@ -50,6 +50,7 @@ export function RenameContentDialogContainer(props: RenameContentDialogContainer
dependantItems,
fetchingDependantItems,
error,
allowEditDependencies,
onSubmittingAndOrPendingChange
} = props;
const isPage = value.includes('/index.xml');
Expand Down Expand Up @@ -104,6 +105,7 @@ export function RenameContentDialogContainer(props: RenameContentDialogContainer
<FormattedMessage defaultMessage="Consisting of lowercase letters without accents, numbers, dash (-) and underscore (_)." />
)
}
allowEditDependencies={allowEditDependencies}
/>
</DialogBody>
<DialogFooter>
Expand Down
4 changes: 3 additions & 1 deletion ui/app/src/components/RenameDialogBody/RenameItemView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export interface RenameItemViewProps {
onRename: () => void;
onInputChanges: (event: React.ChangeEvent<HTMLInputElement>) => void;
helperText?: ReactNode;
allowEditDependencies?: boolean;
}

export function RenameItemView(props: RenameItemViewProps) {
Expand All @@ -61,6 +62,7 @@ export function RenameItemView(props: RenameItemViewProps) {
fetchingDependantItems,
error,
helperText,
allowEditDependencies = true,
setConfirmBrokenReferences,
onRename,
onInputChanges
Expand Down Expand Up @@ -115,7 +117,7 @@ export function RenameItemView(props: RenameItemViewProps) {
compactView={false}
showTypes="all-deps"
renderAction={(dependency) =>
isEditableAsset(dependency.path) ? (
allowEditDependencies && isEditableAsset(dependency.path) ? (
<IconButton onClick={() => handleEditorDisplay(dependency)}>
<EditRoundedIcon />
</IconButton>
Expand Down