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

Unlink as coverage #1847

Merged
merged 22 commits into from
Sep 13, 2024
Merged

Unlink as coverage #1847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
998cff9
adjust API
tomaskikutis Apr 20, 2023
209db09
update gettext usage
tomaskikutis Apr 20, 2023
def1a61
Fix event template (#1812)
thecalcc Jun 14, 2023
629c2e8
Fix show modal (#1814)
thecalcc Jun 14, 2023
46387f7
UIF version update (#1818)
thecalcc Jun 28, 2023
a9fe557
[email protected]
tomaskikutis Jul 27, 2023
677f7e5
Unlink as coverage
thecalcc Aug 31, 2023
6ee85a5
Merge remote-tracking branch 'origin/develop' into authoring-react-po…
petrjasek Oct 31, 2023
400ef62
fix lint
petrjasek Oct 31, 2023
9a8ec9e
fix e2e client build
petrjasek Oct 31, 2023
39161ab
Update ng use, fix lint
thecalcc Nov 6, 2023
22f9466
Merge branch 'authoring-react-post-broadcasting' into unlink-as-coverage
thecalcc Nov 6, 2023
71f4543
Use gettext
thecalcc Aug 30, 2024
bae43ce
Merge branch 'develop' into unlink-as-coverage
thecalcc Aug 30, 2024
72d9ea9
Fix sd api usage
thecalcc Aug 30, 2024
929832f
Update client-core
thecalcc Sep 11, 2024
6b0b326
More fixes
thecalcc Sep 12, 2024
0b9d3eb
Update artifact
thecalcc Sep 12, 2024
dfd0245
Merge branch 'develop' into unlink-as-coverage
thecalcc Sep 12, 2024
57670c5
Merge branch 'develop' into unlink-as-coverage
thecalcc Sep 12, 2024
07ab588
Keep conditions in sync with a comment
thecalcc Sep 13, 2024
b12a71f
Add angular authoring tag
thecalcc Sep 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
29 changes: 28 additions & 1 deletion client/planning-extension/src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,41 @@ function onSendBefore(superdesk: ISuperdesk, items: Array<IArticle>, desk: IDesk
const extension: IExtension = {
activate: (superdesk: ISuperdesk) => {
const extensionConfig: IPlanningExtensionConfigurationOptions = superdesk.getExtensionConfig();

const displayTopbarWidget = superdesk.privileges.hasPrivilege('planning_assignments_view')
&& extensionConfig?.assignmentsTopBarWidget === true;
const {gettext} = superdesk.localization;

const result: IExtensionActivationResult = {
contributions: {
entities: {
article: {
getActions: (item) => [
{
label: gettext('Unlink as Coverage'),
groupId: 'planning-actions',
icon: 'cut',
onTrigger: () => {
const superdeskArticle = superdesk.entities.article;

// keep in sync with client/planning-extension/src/extension.ts:123
if (
Copy link
Member

Choose a reason for hiding this comment

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

Did you take these conditions from somewhere else? In order not to duplicate it, we should add canUnlinkAscoverage function and expose it via extensions bridge.

Copy link
Contributor Author

@thecalcc thecalcc Sep 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

The thing is, we can't add it 1-to-1, because in the angular world permissions work under the hood, so if we do add it it'll still be chopped up. Personally I don't think it's necessary when this is the case, so we can keep it like this

Copy link
Member

Choose a reason for hiding this comment

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

add the comment about keeping it up to date

superdesk.privileges.hasPrivilege('archive') &&
item.assignment_id != null &&
!superdeskArticle.isPersonal(item) &&
!superdeskArticle.isLockedInOtherSession(item) &&
(
superdeskArticle.itemAction(item).edit ||
superdeskArticle.itemAction(item).correct ||
superdeskArticle.itemAction(item).deschedule
)
) {
const event = new CustomEvent('planning:unlinkfromcoverage', {detail: {item}});

window.dispatchEvent(event);
}
},
}
],
onSpike: (item: IArticle) => onSpike(superdesk, item),
onSpikeMultiple: (items: Array<IArticle>) => onSpikeMultiple(superdesk, items),
onPublish: (item: IArticle) => onPublishArticle(superdesk, item),
Expand Down
16 changes: 15 additions & 1 deletion index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import planningModule from './client';
import * as ctrl from './client/controllers';
import {gettext} from './client/utils/gettext';
import {isContentLinkToCoverageAllowed} from './client/utils/archive';

import ng from 'superdesk-core/scripts/core/services/ng';

configurePlanning.$inject = ['superdeskProvider'];
function configurePlanning(superdesk) {
Expand Down Expand Up @@ -103,6 +103,8 @@ function configurePlanning(superdesk) {
!['killed', 'recalled', 'unpublished', 'spiked', 'correction'].includes(item.state);
}],
})

// TAG: AUTHORING-ANGULAR
Copy link
Member

Choose a reason for hiding this comment

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

image

I'm wondering about that external-app action.

image

It looks like the same action also appears in the topbar. Could you double check whether we also have it in authoring-react?

Copy link
Member

Choose a reason for hiding this comment

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

@thecalcc have you looked into this yet?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm doing so yep, but I plan to address it in a different PR. haven't forgotten about it

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm doing so yep, but I plan to address it in a different PR. haven't forgotten about it

In short, looks like this is some filtering based on which we calculate whether to show the action in the three dots menu or not

.activity('planning.unlink', {
label: gettext('Unlink as Coverage'),
icon: 'cut',
Expand All @@ -120,6 +122,8 @@ function configurePlanning(superdesk) {
],
group: gettext('Planning'),
privileges: {archive: 1},

// keep in sync with client/planning-extension/src/extension.ts:126
additionalCondition: ['archiveService', 'item', 'authoring',
function(archiveService, item, authoring) {
return item.assignment_id &&
Expand All @@ -134,5 +138,15 @@ function configurePlanning(superdesk) {
});
}

window.addEventListener('planning:unlinkfromcoverage', (event: CustomEvent) => {
ctrl.UnlinkAssignmentController(
event.detail,
ng.get('notify'),
ng.get('gettext'),
ng.get('api'),
ng.get('lock'),
);
});

export default planningModule
.config(configurePlanning);
Loading
Loading