Fix article content profile switch in authoring #4684
Conversation
| @@ -359,6 +359,22 @@ export class AuthoringIntegrationWrapper extends React.PureComponent<IPropsWrapp | |||
| }, | |||
| retrieveStoredValue: (item: IArticle, fieldId) => item.extra?.[fieldId] ?? null, | |||
| }} | |||
| customHeader={((options) => ( | |||
There was a problem hiding this comment.
use exposed to keep naming consistent
scripts/core/superdesk-api.d.ts
Outdated
| @@ -215,6 +216,8 @@ declare module 'superdesk-api' { | |||
| reinitialize(itemWithChanges: T): void; | |||
| }>>; | |||
|
|
|||
| customHeader?: (options: IExposedFromAuthoring<T>) => JSX.Element; | |||
There was a problem hiding this comment.
Return Array<ITopBarWidget<T>> here. We already have a nice interface that supports ordering buttons, adding keybindings. This is just another toolbar and it'd be best if it was configurable the same way.
scripts/core/superdesk-api.d.ts
Outdated
| @@ -161,6 +161,7 @@ declare module 'superdesk-api' { | |||
| initiateClosing(): void; | |||
| keepChangesAndClose(): void; | |||
| stealLock(): void; | |||
| onChangeToolbarWidget(item: T): void; | |||
There was a problem hiding this comment.
Naming doesn't make sense for me here. What is a toolbar widget? What does it mean for a toolbar widget to "change"? from widget A to widget B? or how? Why would then the article be passed if it was only the toolbar widget that changed?
I think you should simply expose reinitialize: (itemWithChanges: IArticle) => void; that is already exposed in multiple places in the API, just add a profile argument.
There was a problem hiding this comment.
I can't because state needs to be passed, so some wrapper would always have to be there
There was a problem hiding this comment.
remove onChangeToolbarWidget completely since there are no usages anymore
|
fix ci |
scripts/core/superdesk-api.d.ts
Outdated
| @@ -161,6 +161,7 @@ declare module 'superdesk-api' { | |||
| initiateClosing(): void; | |||
| keepChangesAndClose(): void; | |||
| stealLock(): void; | |||
| onChangeToolbarWidget(item: T): void; | |||
There was a problem hiding this comment.
remove onChangeToolbarWidget completely since there are no usages anymore
scripts/core/superdesk-api.d.ts
Outdated
| @@ -215,6 +216,8 @@ declare module 'superdesk-api' { | |||
| reinitialize(itemWithChanges: T): void; | |||
| }>>; | |||
|
|
|||
| customHeader?: (options: IExposedFromAuthoring<T>) => Array<ITopBarWidget<T>>; | |||
There was a problem hiding this comment.
headerToolbar would be a better name.
| <ContentProfileDropdown | ||
| item={entity} | ||
| reinitialize={(item) => { | ||
| if (exposed.hasUnsavedChanges()) { |
There was a problem hiding this comment.
It'd be cleaner if getProfileAndReinitialize would only be used once. This way it is also clear that it will get called regardless of the condition.
const handledChanges = exposed.hasUnsavedChanges()
? exposed.handleUnsavedChanges()
: Promise.resolve();
handledChanges.then(() => {
getProfileAndReinitialize(item);
});
| @@ -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), | |||
There was a problem hiding this comment.
you didn't add reinitialize to the interface.
SDESK-7417