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

As a user I want to have the Coming Up field active when I create a new story in save as a template. [SDBELGA-466] #4033

Merged
merged 6 commits into from
Dec 17, 2021
Merged

As a user I want to have the Coming Up field active when I create a new story in save as a template. [SDBELGA-466] #4033

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c53e93b
As a user I want to have the Coming Up field active when I create a n…
GyanP Dec 2, 2021
1cebbd6
minor change
GyanP Dec 2, 2021
0d70702
address the comment
GyanP Dec 7, 2021
57d5139
add implementation of date-time field inside the extension
GyanP Dec 15, 2021
2787edf
trigger `onTemplateCreate` for all extensions, not only date time; pa…
tomaskikutis Dec 16, 2021
200df46
fix unit tests
tomaskikutis Dec 16, 2021
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
28 changes: 27 additions & 1 deletion scripts/apps/templates/controllers/CreateTemplateController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import notifySaveError from '../helpers';
import {extensions} from 'appConfig';

CreateTemplateController.$inject = [
'item',
Expand All @@ -10,6 +11,7 @@ CreateTemplateController.$inject = [
'lodash',
'privileges',
'session',
'vocabularies',
];
export function CreateTemplateController(
item,
Expand All @@ -21,6 +23,7 @@ export function CreateTemplateController(
_,
privileges,
session,
vocabularies,
) {
var self = this;

Expand All @@ -32,8 +35,27 @@ export function CreateTemplateController(
this.types = templates.types;
this.createTypes = _.filter(templates.types, (element) => element._id !== 'kill');
this.save = save;
this.dateTimeFields = null;

activate();
function itemData() {
const _item = JSON.parse(JSON.stringify(templates.pickItemData(item)));

self.dateTimeFields?.forEach((field) => {
tomaskikutis marked this conversation as resolved.
Show resolved Hide resolved
if (_item.extra[field._id]) {
Object.values(extensions).forEach(({activationResult}) => {
if (activationResult.contributions?.customFieldTypes) {
activationResult.contributions?.customFieldTypes?.forEach((customField) => {
if (customField?.onTemplateCreate) {
_item.extra[field._id] = customField.onTemplateCreate(field);
tomaskikutis marked this conversation as resolved.
Show resolved Hide resolved
}
});
}
});
}
});
return _item;
}

function activate() {
if (item.template) {
Expand All @@ -48,6 +70,10 @@ export function CreateTemplateController(
desks.fetchCurrentUserDesks().then((_desks) => {
self.desks = _desks;
});

vocabularies.getVocabularies().then((_vocabularies) => {
self.dateTimeFields = _vocabularies.filter((vocabulary) => vocabulary.custom_field_type === 'datetime');
});
}

self.canEdit = () => {
Expand Down Expand Up @@ -81,7 +107,7 @@ export function CreateTemplateController(
template_type: self.type,
template_desks: self.is_public ? [self.desk] : null,
is_public: self.is_public,
data: templates.pickItemData(item),
data: itemData(),
};

var template = self.template ? self.template : data;
Expand Down
2 changes: 2 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 @@ -2160,6 +2160,8 @@ declare module 'superdesk-api' {
previewComponent: React.ComponentType<IPreviewComponentProps>;
configComponent?: React.ComponentType<IConfigComponentProps<IConfig>>;
templateEditorComponent?: React.ComponentType<ITemplateEditorComponentProps<IConfig>>;

onTemplateCreate?(field: IConfig): any;
tomaskikutis marked this conversation as resolved.
Show resolved Hide resolved
}


Expand Down
7 changes: 7 additions & 0 deletions scripts/extensions/datetimeField/src/extension.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ function getDateTimePreviewComponent(superdesk: ISuperdesk) {
};
}

function onTemplateCreate(field: any) {
const initialOffset = field.custom_field_config.initial_offset_minutes;

return `{{ now|add_timedelta(minutes=${initialOffset})|iso_datetime }}`;
}

export interface IDateTimeFieldConfig {
initial_offset_minutes: number;
increment_steps: Array<number>;
Expand All @@ -56,6 +62,7 @@ const extension: IExtension = {
previewComponent: getDateTimePreviewComponent(superdesk),
configComponent: getConfigComponent(superdesk),
templateEditorComponent: getToggleDateTimeField(superdesk),
onTemplateCreate: (field: any) => onTemplateCreate(field),
},
],
},
Expand Down