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

Fix article content profile switch in authoring #4684

Merged
merged 8 commits into from
Nov 13, 2024
Merged

Fix article content profile switch in authoring #4684

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
92c036a
Fix article content profile switch in authoring
thecalcc Nov 11, 2024
bd800ca
Fix lint
thecalcc Nov 11, 2024
9f49051
Merge branch 'develop' into fix-profile-dropdown
thecalcc Nov 11, 2024
fd9c4e5
Changes after review
thecalcc Nov 13, 2024
cfdac74
Lint
thecalcc Nov 13, 2024
d0f3fa6
Changes v2
thecalcc Nov 13, 2024
0164e43
Changes after review
thecalcc Nov 13, 2024
dd1a1f8
Fix lint
thecalcc Nov 13, 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
31 changes: 31 additions & 0 deletions scripts/apps/authoring-react/authoring-integration-wrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,37 @@
},
retrieveStoredValue: (item: IArticle, fieldId) => item.extra?.[fieldId] ?? null,
}}
headerToolbar={((exposed) => {
const getProfileAndReinitialize = (item: IArticle) =>
this.props.authoringStorage.getContentProfile(
item,
exposed.fieldsAdapter,
).then((profile) => {
exposed.reinitialize(item, profile);
});

return [{
component: ({entity}) => (
<div className="authoring-header__general-info">
<ContentProfileDropdown
item={entity}
reinitialize={(item) => {
const handledChanges = exposed.hasUnsavedChanges()
? exposed.handleUnsavedChanges()
: Promise.resolve();

handledChanges.then(() => {
getProfileAndReinitialize(item);
});
}}
/>
</div>
),
availableOffline: false,
group: 'start',
priority: 1,
}]

Check failure on line 391 in scripts/apps/authoring-react/authoring-integration-wrapper.tsx

View workflow job for this annotation

GitHub Actions / test 

Missing semicolon

Check failure on line 391 in scripts/apps/authoring-react/authoring-integration-wrapper.tsx

View workflow job for this annotation

GitHub Actions / test 

Missing semicolon

Check failure on line 391 in scripts/apps/authoring-react/authoring-integration-wrapper.tsx

View workflow job for this annotation

GitHub Actions / test 

Missing semicolon
})}
getLanguage={(article) => article.language ?? 'en'}
onEditingStart={(article) => {
dispatchCustomEvent('articleEditStart', article);
Expand Down
32 changes: 8 additions & 24 deletions scripts/apps/authoring-react/authoring-react.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ import {IFontSizeOption, ITheme, ProofreadingThemeModal} from './toolbar/proofre
import {showModal} from '@superdesk/common';
import ng from 'core/services/ng';
import {focusFirstChildInput} from 'utils/focus-first-child-input';
import {ContentProfileDropdown} from './subcomponents/content-profile-dropdown';

export function getFieldsData<T>(
item: T,
Expand Down Expand Up @@ -1220,6 +1219,7 @@ export class AuthoringReact<T extends IBaseRestApiResponse> extends React.PureCo
pinnedId: id === activeWidgetId ? activeWidgetId : this.props.sideWidget?.pinnedId,
});
},
reinitialize: (item, profile) => this.reinitialize(state, item, profile),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you didn't add reinitialize to the interface.

addValidationErrors: (moreValidationErrors) => {
this.setState({
...state,
Expand Down Expand Up @@ -1417,13 +1417,6 @@ export class AuthoringReact<T extends IBaseRestApiResponse> extends React.PureCo

const isPinned = this.props.sideWidget?.pinnedId != null;

const onChangeSideWidget = (item: T) => {
authoringStorage.getContentProfile(item, this.props.fieldsAdapter)
.then((res) => {
this.reinitialize(state, item, res);
});
};

return (
<div style={{display: 'contents'}} ref={this.setRef}>
{
Expand Down Expand Up @@ -1466,10 +1459,10 @@ export class AuthoringReact<T extends IBaseRestApiResponse> extends React.PureCo
reinitialize={(item) => {
if (this.hasUnsavedChanges()) {
exposed.handleUnsavedChanges().then(() => {
onChangeSideWidget(item);
this.reinitialize(state, item);
});
} else {
onChangeSideWidget(item);
this.reinitialize(state, item);
}
}}
item={state.itemWithChanges}
Expand Down Expand Up @@ -1506,20 +1499,11 @@ export class AuthoringReact<T extends IBaseRestApiResponse> extends React.PureCo
headerPadding={{top: 8}}
authoringHeader={(
<div style={{width: '100%'}}>
<div className="authoring-header__general-info">
<ContentProfileDropdown
item={state.itemWithChanges}
reinitialize={(item) => {
if (this.hasUnsavedChanges()) {
exposed.handleUnsavedChanges().then(() => {
onChangeSideWidget(item);
});
} else {
onChangeSideWidget(item);
}
}}
/>
</div>
<AuthoringToolbar
entity={state.itemWithChanges}
coreWidgets={this.props.headerToolbar(exposed)}
backgroundColor={authoringOptions?.toolbarBgColor}
/>
<AuthoringSection
fields={state.profile.header}
fieldsData={state.fieldsDataWithChanges}
Expand Down
3 changes: 3 additions & 0 deletions scripts/core/superdesk-api.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ declare module 'superdesk-api' {
initiateClosing(): void;
keepChangesAndClose(): void;
stealLock(): void;
reinitialize: (item: T, profile?: IContentProfileV2) => void;
addValidationErrors(validationErrors: IAuthoringValidationErrors): void;
}

Expand Down Expand Up @@ -215,6 +216,8 @@ declare module 'superdesk-api' {
reinitialize(itemWithChanges: T): void;
}>>;

headerToolbar?: (options: IExposedFromAuthoring<T>) => Array<ITopBarWidget<T>>;

disableWidgetPinning?: boolean; // defaults to false

getSidebarWidgetsCount(options: IExposedFromAuthoring<T>): number;
Expand Down
Loading