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

Jump to bottom

[TGA-59] fix(author_approval): incorrect watch function signature #4340

Merged
merged 3 commits into from
Oct 13, 2023
Merged

[TGA-59] fix(author_approval): incorrect watch function signature #4340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
914f21c
[TGA-59] fix(author_approval): incorrect watch function signature
MarkLark86 Oct 12, 2023
44447e8
Fix article update after it's been signed off
thecalcc Oct 12, 2023
e06dbf0
fix lint issue, dont wipe extra on update
MarkLark86 Oct 12, 2023
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
13 changes: 13 additions & 0 deletions scripts/apps/authoring/authoring/directives/ArticleEditDirective.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,19 @@ export function ArticleEditDirective(
}
}

// Needed only for authoring Angular. In authoring react we have a generic
// event ('resource:updated') which listens to all item changes.
scope.$on('author_approval:updated', (_event, extra) => {
if (extra.item_id === scope.item?._id) {
if (scope.item.extra == null) {
scope.item.extra = {};
}

scope.item.extra.publish_sign_off = extra.new_sign_off;
scope.$apply();
}
});

scope.$watch('item.language', () => {
scope.monthNames = getMonthNamesShort(scope.item.language ?? appConfig.default_language)
.map((label, i) => ({id: i.toString(), label: label}));
Expand Down
8 changes: 0 additions & 8 deletions scripts/apps/authoring/authoring/directives/AuthoringContainerDirective.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,6 @@ export function AuthoringContainerDirective(authoringWorkspace: AuthoringWorkspa
scope: {},
require: 'sdAuthoringContainer',
link: function(scope, elem, attrs, ctrl) {
// Needed only for authoring Angular. In authoring react we have a generic
// event ('resource:updated') which listens to all item changes.
scope.$on('author_approval:updated', (event) => {
if (event.item_id === scope.item._id) {
scope.item.extra.publish_sign_off = event.sign_off_new_data;
}
});

scope.$watch(authoringWorkspace.getState, (state) => {
if (state) {
if (itemInEditMode != null) {
Expand Down
Loading