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

Fixed Tables & Attachments getting rendered as Editable in readonly scenarios #431

Open
wants to merge 2 commits into
base: release/23.1
Choose a base branch
from
+16 −12
Open

Fixed Tables & Attachments getting rendered as Editable in readonly scenarios #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7f06f8
Fixed Tables & Attachments getting rendered as Editable in readonly s…
Dec 18, 2024
6324b39
Removed extra entry in the array
Dec 18, 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
2 changes: 1 addition & 1 deletion packages/react-sdk-components/src/components/field/ScalarList/ScalarList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export default function ScalarList(props: ScalarListProps) {
); // 2nd, 3rd, and 4th args empty string/object/null until typedef marked correctly as optional;
});

if (['LABELS_LEFT', 'STACKED_LARGE_VAL', 'DISPLAY_ONLY'].includes(displayMode)) {
if (['LABELS_LEFT', 'STACKED_LARGE_VAL'].includes(displayMode)) {
return (
<div>
<CommaSeparatedList items={items} />
Expand Down
2 changes: 1 addition & 1 deletion ...ages/react-sdk-components/src/components/template/SimpleTable/SimpleTable/SimpleTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export default function SimpleTable(props: SimpleTableProps) {

const label = labelProp || propertyLabel;
const propsToUse = { label, ...getPConnect().getInheritedProps() };
const isDisplayModeEnabled = displayMode === 'DISPLAY_ONLY';
const isDisplayModeEnabled = displayMode === 'LABELS_LEFT';

if (fieldMetadata && fieldMetadata.type === 'Page List' && fieldMetadata.dataRetrievalType === 'refer') {
const {
Expand Down
8 changes: 4 additions & 4 deletions ...dk-components/src/components/template/SimpleTable/SimpleTableManual/SimpleTableManual.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export default function SimpleTableManual(props: PropsWithChildren<SimpleTableMa
const classes = useStyles();
const {
getPConnect,
referenceList = [], // if referenceList not in configProps$, default to empy list
referenceList = [], // if referenceList not in configProps$, default to empty list
children,
renderMode,
presets,
Expand Down Expand Up @@ -160,9 +160,9 @@ export default function SimpleTableManual(props: PropsWithChildren<SimpleTableMa

const rawConfig = rawMetadata?.config;
const rawFields = rawConfig?.children?.[0]?.children || rawConfig?.presets?.[0].children?.[0]?.children;
const isDisplayModeEnabled = displayMode === 'DISPLAY_ONLY';
const readOnlyMode = renderMode === 'ReadOnly';
const editableMode = renderMode === 'Editable';
const isDisplayModeEnabled = displayMode === 'LABELS_LEFT';
const readOnlyMode = renderMode === 'ReadOnly' || isDisplayModeEnabled;
const editableMode = renderMode === 'Editable' && !isDisplayModeEnabled;
const showAddRowButton = !readOnlyMode && !hideAddRow;
const allowEditingInModal =
(editMode ? editMode === 'modal' : addAndEditRowsWithin === 'modal') && !(renderMode === 'ReadOnly' || isDisplayModeEnabled);
Expand Down
16 changes: 10 additions & 6 deletions packages/react-sdk-components/src/components/widget/Attachment/Attachment.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ export default function Attachment(props: AttachmentProps) {
}, [toggleUploadBegin]);

useEffect(() => {
if (files.length > 0 && displayMode !== 'DISPLAY_ONLY') {
if (files.length > 0 && displayMode !== 'LABELS_LEFT') {
const currentAttachmentList = getCurrentAttachmentsList(getAttachmentKey(valueRef), pConn.getContextName());
// block duplicate files to redux store when added 1 after another to prevent multiple duplicates being added to the case on submit
const tempFiles = files.filter(f => currentAttachmentList.findIndex(fr => fr.ID === f.ID) === -1 && !f.inProgress && f.responseProps);
Expand Down Expand Up @@ -416,7 +416,7 @@ export default function Attachment(props: AttachmentProps) {
{item.props.meta && <div style={{ color: item.props.error ? 'red' : undefined }}>{item.props.meta}</div>}
</div>
<div className='psdk-utility-action'>
{item.ID && (
{item.ID && displayMode !== 'LABELS_LEFT' && (
<button type='button' className='psdk-utility-button' aria-label='Delete Attachment' onClick={() => deleteFile(item)}>
<img className='psdk-utility-card-action-svg-icon' src={deleteIcon} />
</button>
Expand All @@ -440,9 +440,11 @@ export default function Attachment(props: AttachmentProps) {
>
Download
</MenuItem>
<MenuItem style={{ fontSize: '14px' }} key='delete' onClick={() => deleteFile(item)}>
Delete
</MenuItem>
{displayMode !== 'LABELS_LEFT' && (
<MenuItem style={{ fontSize: '14px' }} key='delete' onClick={() => deleteFile(item)}>
Delete
</MenuItem>
)}
</Menu>
</div>
)}
Expand All @@ -456,7 +458,9 @@ export default function Attachment(props: AttachmentProps) {
return (
<div className='file-upload-container'>
<span className={`label ${required ? 'file-label' : ''}`}>{label}</span>
{((files.length === 0 && allowMultiple !== 'true') || allowMultiple === 'true') && <section>{content}</section>}
{((files.length === 0 && allowMultiple !== 'true') || allowMultiple === 'true') && displayMode !== 'LABELS_LEFT' && (
<section>{content}</section>
)}
{validatemessage !== '' ? <span className='file-error'>{validatemessage}</span> : ''}
{files && files.length > 0 && <section>{fileDisplay}</section>}
</div>
Expand Down
Loading