diff --git a/.eslintignore b/.eslintignore index f238ad411f..2dd79c50c5 100644 --- a/.eslintignore +++ b/.eslintignore @@ -5,4 +5,5 @@ language-mapping-list.js scripts/extensions/*/node_modules scripts/extensions/**/dist end-to-end-testing-helpers/dist -end-to-end-testing-helpers/node_modules \ No newline at end of file +end-to-end-testing-helpers/node_modules +spec/**/*.js \ No newline at end of file diff --git a/package.json b/package.json index 03a49d9839..248b2a1548 100644 --- a/package.json +++ b/package.json @@ -156,7 +156,7 @@ "debug-unit-tests": "karma start karma.conf.js --browsers=Chrome", "unit": "grunt unit", "build": "grunt build", - "lint": "tsc -p scripts --noEmit && tslint -c tslint.json './**/*.{ts,tsx}' && eslint --parser=@typescript-eslint/parser --ext .js --ext .jsx --ext .ts --ext .tsx scripts tasks *.js", + "lint": "tsc -p scripts --noEmit && tslint -c tslint.json './**/*.{ts,tsx}' && eslint --parser=@typescript-eslint/parser --ext .js --ext .jsx --ext .ts --ext .tsx scripts spec tasks *.js", "lint-fix": "tsc -p scripts --noEmit && tslint --fix -c tslint.json 'scripts/**/*.{ts,tsx}' && eslint --fix --parser=@typescript-eslint/parser --ext .js --ext .jsx --ext .ts --ext .tsx scripts spec tasks *.js", "start-test-server": "cd test-server && python3 -m venv env && . env/bin/activate && pip install -Ur requirements.txt && honcho start", "protractor": "protractor protractor.conf.js", diff --git a/scripts/apps/authoring/styles/themes.scss b/scripts/apps/authoring/styles/themes.scss index 469629c6e7..8c2356477c 100644 --- a/scripts/apps/authoring/styles/themes.scss +++ b/scripts/apps/authoring/styles/themes.scss @@ -311,7 +311,11 @@ body, html { } } } - + .field__label--with-actions { + display: flex; + .field__label { margin-right: auto; } + } + .main-article__fieldset { display: flex; flex-direction: row; diff --git a/scripts/apps/authoring/views/article-edit.html b/scripts/apps/authoring/views/article-edit.html index c60586cd22..fcf4ff7a1e 100644 --- a/scripts/apps/authoring/views/article-edit.html +++ b/scripts/apps/authoring/views/article-edit.html @@ -679,7 +679,6 @@ sd-validation-error="error[field._id]" order="{{editor[field._id].order}}" data-required="schema[field._id].required"> -
-
+
+ + +
+
{{field.helper_text}}
diff --git a/scripts/apps/authoring/views/authoring-header.html b/scripts/apps/authoring/views/authoring-header.html index f8d3197f3e..27744bf838 100644 --- a/scripts/apps/authoring/views/authoring-header.html +++ b/scripts/apps/authoring/views/authoring-header.html @@ -96,6 +96,7 @@ ng-disabled="!_editable" ng-trim="false" tabindex="{{editor.slugline.order}}" + data-test-id="field-slugline" > - + tabindex="{{editor.ednote.order}}" + data-test-id="field-editors-note" + >
diff --git a/scripts/apps/authoring/views/authoring-topbar.html b/scripts/apps/authoring/views/authoring-topbar.html index cb0ac4303f..27605d43ca 100644 --- a/scripts/apps/authoring/views/authoring-topbar.html +++ b/scripts/apps/authoring/views/authoring-topbar.html @@ -141,7 +141,8 @@ ng-if="action !== 'correct' && action !== 'kill'" title="{{ :: 'Close' | translate }}" sd-hotkey="ctrl+shift+e" - sd-hotkey-options="{global: true}"> + sd-hotkey-options="{global: true}" + data-test-id="close"> Close @@ -152,7 +153,9 @@ ng-disabled="!save_enabled() || saveDisabled" sd-hotkey="ctrl+shift+s" sd-hotkey-options="{global: true}" - translate>Save + translate + data-test-id="save" + >Save -
+
-
- diff --git a/scripts/apps/highlights/services/HighlightsService.ts b/scripts/apps/highlights/services/HighlightsService.ts index 3245c7fe37..a48791920a 100644 --- a/scripts/apps/highlights/services/HighlightsService.ts +++ b/scripts/apps/highlights/services/HighlightsService.ts @@ -115,7 +115,7 @@ export function HighlightsService(api, $q, $cacheFactory, packages, privileges) pkgDefaults.task = highlight.task; } - return packages.createEmptyPackage(pkgDefaults, group); + return packages.createEmptyPackage(pkgDefaults, false, group); }; /** diff --git a/scripts/apps/monitoring/views/monitoring-view.html b/scripts/apps/monitoring/views/monitoring-view.html index c6330acaca..f4d0ad995d 100644 --- a/scripts/apps/monitoring/views/monitoring-view.html +++ b/scripts/apps/monitoring/views/monitoring-view.html @@ -96,8 +96,16 @@

- -
+ +
diff --git a/scripts/apps/packaging/services/PackagesService.ts b/scripts/apps/packaging/services/PackagesService.ts index dbfa6991bd..ccc1fb3da1 100644 --- a/scripts/apps/packaging/services/PackagesService.ts +++ b/scripts/apps/packaging/services/PackagesService.ts @@ -46,13 +46,13 @@ export function PackagesService(api, $q, archiveService, lock, autosave, authori return api.save('archive', newPackage); }; - this.createEmptyPackage = function(defaults, idRef = 'main') { + this.createEmptyPackage = function(defaults, initializeAsUpdated: boolean, idRef = 'main') { var newPackage: any = { headline: '', slugline: '', description_text: '', type: 'composite', - version: 0, + version: initializeAsUpdated ? 1 : 0, groups: [ { role: 'grpRole:NEP', diff --git a/scripts/apps/relations/directives/RelatedItemsDirective.ts b/scripts/apps/relations/directives/RelatedItemsDirective.ts index 3556da630a..a15522a977 100644 --- a/scripts/apps/relations/directives/RelatedItemsDirective.ts +++ b/scripts/apps/relations/directives/RelatedItemsDirective.ts @@ -8,6 +8,8 @@ const ARCHIVE_TYPES = ['archive', 'published']; const isInArchive = (item: IArticle) => item._type != null && ARCHIVE_TYPES.includes(item._type); interface IScope extends IDirectiveScope { + onCreated: (items: Array) => void; + gettext: (text: any, params?: any) => string; field: IArticleField; editable: boolean; item: IArticle; @@ -43,6 +45,14 @@ export function RelatedItemsDirective(authoringWorkspace: AuthoringWorkspaceServ }, templateUrl: 'scripts/apps/relations/views/related-items.html', link: function(scope: IScope, elem, attr) { + scope.onCreated = (items: Array) => { + items.forEach((item) => { + scope.addRelatedItem(item); + }); + }; + + scope.gettext = gettext; + const dragOverClass = 'dragover'; const fieldOptions = scope.field?.field_options || {}; const allowed = fieldOptions.allowed_types || {}; diff --git a/scripts/apps/relations/views/related-items.html b/scripts/apps/relations/views/related-items.html index 71b19c8583..5a7a4c9737 100644 --- a/scripts/apps/relations/views/related-items.html +++ b/scripts/apps/relations/views/related-items.html @@ -1,7 +1,24 @@ +
+ +
+ + +
+
+
+ +
    @@ -27,4 +44,4 @@
- + \ No newline at end of file diff --git a/scripts/apps/templates/views/create-template.html b/scripts/apps/templates/views/create-template.html index f11c0dd234..0de80f679b 100644 --- a/scripts/apps/templates/views/create-template.html +++ b/scripts/apps/templates/views/create-template.html @@ -39,8 +39,14 @@

Save as template

- + translate + data-test-id="create-template-modal--save" + > + Save + diff --git a/scripts/apps/templates/views/template-list.html b/scripts/apps/templates/views/template-list.html index 1682a8468d..d9a7ba3e47 100644 --- a/scripts/apps/templates/views/template-list.html +++ b/scripts/apps/templates/views/template-list.html @@ -1,4 +1,4 @@ -
  • +
  • diff --git a/scripts/apps/workspace/content/directives/ContentCreateDirective.ts b/scripts/apps/workspace/content/directives/ContentCreateDirective.ts index 8d00783a72..6045c92ad0 100644 --- a/scripts/apps/workspace/content/directives/ContentCreateDirective.ts +++ b/scripts/apps/workspace/content/directives/ContentCreateDirective.ts @@ -1,7 +1,42 @@ import {AuthoringWorkspaceService} from 'apps/authoring/authoring/services/AuthoringWorkspaceService'; - -ContentCreateDirective.$inject = ['desks', 'templates', 'content', 'authoringWorkspace', - 'superdesk', 'keyboardManager', '$location']; +import {IArticle} from 'superdesk-api'; +import {IContentTemplate} from 'superdesk-interfaces/ContentTemplate'; +import {assertNever, isArray} from 'core/helpers/typescript-helpers'; + +type IItemCreationAction = + { kind: 'plain-text'} + | {kind: 'from-template'; template: IContentTemplate} + | {kind: 'create-package'} + | {kind: 'upload-media'} +; + +ContentCreateDirective.$inject = [ + 'desks', + 'templates', + 'content', + 'authoringWorkspace', + 'superdesk', + 'keyboardManager', + '$location', + 'packages', +]; + +interface IScope extends ng.IScope { + createFromTemplate: (template: IContentTemplate) => Promise; + create: (action: IItemCreationAction) => Promise; + onCreated?: (item: Array) => void; + defaultTemplate: any; + openUpload: () => void; + canCreatePackage: () => boolean; + createPackage: () => void; + contentTemplates: any; + + // If an item is created, but closed without changes, it gets removed + // it doesn't work well when creating item and adding as related immediately + // user might want to go back and update the item later. + // To avoid the item getting removed it is initialized with a higher version + initializeAsUpdated: boolean; +} export function ContentCreateDirective( desks, @@ -11,20 +46,15 @@ export function ContentCreateDirective( superdesk, keyboardManager, $location, + packages, ) { return { - scope: true, + scope: { + onCreated: '=', + initializeAsUpdated: '=', + }, templateUrl: 'scripts/apps/workspace/content/views/sd-content-create.html', - link: function(scope) { - /** - * Start editing given item in sidebar editor - * - * @param {Object} item - */ - function edit(item) { - authoringWorkspace.edit(item); - } - + link: function(scope: IScope) { function getRecentTemplates(deskId) { var NUM_ITEMS = 5; @@ -33,20 +63,39 @@ export function ContentCreateDirective( }); } - /** - * Create and start editing item of given type - * - * @param {string} type - */ - scope.create = function(type) { - content.createItem(type).then(edit); + scope.create = function(action: IItemCreationAction) { + return (() => { + if (action.kind === 'plain-text') { + return content.createItem('text', scope.initializeAsUpdated); + } else if (action.kind === 'from-template') { + return content.createItemFromTemplate(action.template, scope.initializeAsUpdated) + .then((item: IArticle) => { + getRecentTemplates(desks.activeDeskId); + + return item; + }); + } else if (action.kind === 'create-package') { + return packages.createEmptyPackage(undefined, scope.initializeAsUpdated); + } else if (action.kind === 'upload-media') { + return superdesk.intent('upload', 'media', {deskSelectionAllowed: true}); + } else { + assertNever(action); + } + })().then((result: IArticle | Array) => { + if (typeof scope.onCreated === 'function') { + scope.onCreated( + isArray(result) ? result : [result], + ); + } + + if (action.kind !== 'upload-media' && !isArray(result)) { + authoringWorkspace.edit(result); + } + }); }; - /** - * Create and start editing a package - */ - scope.createPackage = function() { - content.createPackageItem().then(edit); + scope.createFromTemplate = function(template: IContentTemplate) { + return scope.create({kind: 'from-template', template}); }; /** @@ -61,26 +110,6 @@ export function ContentCreateDirective( getDefaultTemplate(); }); - /** - * Create and start editing an item based on given package - * - * @param {Object} template - */ - scope.createFromTemplate = function(template) { - content.createItemFromTemplate(template) - .then(edit) - .then(() => { - getRecentTemplates(desks.activeDeskId); - }); - }; - - /** - * Start content upload modal - */ - scope.openUpload = function openUpload() { - superdesk.intent('upload', 'media', {deskSelectionAllowed: true}); - }; - scope.contentTemplates = null; desks.initialize().then(() => { @@ -95,7 +124,11 @@ export function ContentCreateDirective( e.preventDefault(); } - scope.defaultTemplate ? scope.createFromTemplate(scope.defaultTemplate) : scope.create(); + if (scope.defaultTemplate) { + scope.create({kind: 'from-template', template: scope.defaultTemplate}); + } else { + scope.create({kind: 'plain-text'}); + } }); scope.$on('$destroy', () => { diff --git a/scripts/apps/workspace/content/services/ContentService.ts b/scripts/apps/workspace/content/services/ContentService.ts index 7654cde8c7..047eb71dfd 100644 --- a/scripts/apps/workspace/content/services/ContentService.ts +++ b/scripts/apps/workspace/content/services/ContentService.ts @@ -3,6 +3,7 @@ import {get, omit, isEmpty, zipObject} from 'lodash'; import {gettext} from 'core/utils'; import {isMediaEditable} from 'core/config'; import {appConfig} from 'appConfig'; +import {dataApi} from 'core/helpers/CrudManager'; import {IArticle, IContentProfileEditorConfig, IArticleField} from 'superdesk-api'; /** @@ -46,10 +47,10 @@ export function ContentService(api, templates, desks, packages, archiveService, const self = this; - function newItem(type) { + function newItem(type, initializeAsUpdated: boolean) { return { type: type || TEXT_TYPE, - version: 0, + version: initializeAsUpdated ? 1 : 0, }; } @@ -79,25 +80,13 @@ export function ContentService(api, templates, desks, packages, archiveService, * @param {string} type * @return {Promise} */ - this.createItem = function(type) { - var item = newItem(type); + this.createItem = function(type, initializeAsUpdated) { + var item = newItem(type, initializeAsUpdated); archiveService.addTaskToArticle(item); return save(item); }; - /** - * Create a package containing given item - * - * @param {Object} item - * @return {Promise} - */ - this.createPackageItem = function(item) { - var data = item ? {items: [item]} : {}; - - return packages.createEmptyPackage(data); - }; - /** * Create a package containing given item * @@ -114,8 +103,8 @@ export function ContentService(api, templates, desks, packages, archiveService, * @param {Object} template * @return {Promise} */ - this.createItemFromTemplate = function(template) { - var item: any = newItem(template.data.type || null); + this.createItemFromTemplate = function(template, initializeAsUpdated) { + var item: Partial = newItem(template.data.type || null, initializeAsUpdated); angular.extend(item, templates.pickItemData(template.data || {}), {template: template._id}); // set the dateline date to default utc date. @@ -129,7 +118,8 @@ export function ContentService(api, templates, desks, packages, archiveService, } archiveService.addTaskToArticle(item); - return save(item).then((_item) => { + + return dataApi.create('archive', item).then((_item) => { templates.addRecentTemplate(desks.activeDeskId, template._id); return _item; }); diff --git a/scripts/apps/workspace/content/tests/content.spec.ts b/scripts/apps/workspace/content/tests/content.spec.ts index a7959022f4..ef66fee7c0 100644 --- a/scripts/apps/workspace/content/tests/content.spec.ts +++ b/scripts/apps/workspace/content/tests/content.spec.ts @@ -1,7 +1,3 @@ - -import {waitUntil} from 'core/helpers/waitUtil'; -import {appConfig} from 'appConfig'; - describe('superdesk.apps.workspace.content', () => { beforeEach(window.module('superdesk.mocks')); beforeEach(window.module('superdesk.apps.desks')); @@ -22,20 +18,20 @@ describe('superdesk.apps.workspace.content', () => { })); it('can create plain text items', inject((api, content, $rootScope) => { - content.createItem().then(done); + content.createItem('text').then(done); $rootScope.$digest(); expect(api.save).toHaveBeenCalledWith('archive', {type: 'text', version: 0}); expect(done).toHaveBeenCalledWith(ITEM); })); - it('can create packages', inject((api, content, desks, session, $rootScope) => { + it('can create packages', inject((api, packages, desks, session, $rootScope) => { session.identity = {_id: '1'}; desks.userDesks = {_items: []}; spyOn(desks, 'getCurrentDesk') .and .returnValue({_id: '1', name: 'sport', working_stage: '2', incoming_stage: '3'}); - content.createPackageItem().then(done); + packages.createEmptyPackage().then(done); $rootScope.$digest(); expect(api.save).toHaveBeenCalledWith('archive', {headline: '', slugline: '', description_text: '', type: 'composite', @@ -68,35 +64,6 @@ describe('superdesk.apps.workspace.content', () => { id: 'main', role: 'grpRole:main'}]}); })); - it('can create items from template', inject((api, content, desks, session, $rootScope) => { - session.identity = {_id: 'user:1', byline: 'user1'}; - - spyOn(desks, 'getCurrentDesk') - .and - .returnValue({_id: '2', name: 'news', working_stage: '4', incoming_stage: '5'}); - - content.createItemFromTemplate({ - _id: 'template1', - data: { - slugline: 'test_slugline', - body_html: 'test_body_html', - irrelevantData: 'yes', - }, - }).then(done); - - $rootScope.$digest(); - expect(done).toHaveBeenCalledWith(ITEM); - expect(api.save).toHaveBeenCalledWith('archive', { - slugline: 'test_slugline', - body_html: 'test_body_html', - task: {desk: '2', stage: '4', user: 'user:1'}, - template: 'template1', - type: 'text', - version: 0, - byline: 'user1', - }); - })); - it('can fetch content types', inject((api, content, $rootScope, $q) => { var types = [{_id: 'foo'}]; diff --git a/scripts/apps/workspace/content/views/sd-content-create.html b/scripts/apps/workspace/content/views/sd-content-create.html index b226fc7942..cc395e6ae8 100644 --- a/scripts/apps/workspace/content/views/sd-content-create.html +++ b/scripts/apps/workspace/content/views/sd-content-create.html @@ -4,25 +4,18 @@
  • -
  • -
    • - -
  • - -
    • @@ -32,7 +25,7 @@
  • -
    • @@ -45,18 +38,18 @@ - +
    • -
      • -
    • -
    diff --git a/scripts/core/helpers/typescript-helpers.ts b/scripts/core/helpers/typescript-helpers.ts index 5b6d835d1f..7d53a98397 100644 --- a/scripts/core/helpers/typescript-helpers.ts +++ b/scripts/core/helpers/typescript-helpers.ts @@ -9,6 +9,10 @@ export function applyDefault(value: T, defaultValue: T) { return value != null ? value : defaultValue; } +export function isArray(x: T | Array): x is Array { + return Array.isArray(x); +} + export function assertNever(x: never): never { throw new Error('Unexpected object: ' + x); } diff --git a/scripts/superdesk-interfaces/ContentTemplate.ts b/scripts/superdesk-interfaces/ContentTemplate.ts new file mode 100644 index 0000000000..bac99376f0 --- /dev/null +++ b/scripts/superdesk-interfaces/ContentTemplate.ts @@ -0,0 +1,12 @@ +import {IBaseRestApiResponse, IDesk} from 'superdesk-api'; + +export interface IContentTemplate extends IBaseRestApiResponse { + template_name?: string; + data?: any; + user?: string; + is_public?: boolean; + template_type?: 'create' | 'kill'; + next_run?: any; + schedule?: any; + template_desks?: Array; +} diff --git a/spec/helpers/authoring.ts b/spec/helpers/authoring.ts index f2ef462728..642167ca5d 100644 --- a/spec/helpers/authoring.ts +++ b/spec/helpers/authoring.ts @@ -741,7 +741,9 @@ class Authoring { }); }; - var bodyHtml = element(by.model('item.body_html')).all(by.className('editor-type-html')).first(); + var getBodyHtml = () => browser.wait(ECE.presenceOf(element(by.model('item.body_html')))) + .then(() => element(by.model('item.body_html')).all(by.className('editor-type-html')).first()); + var abstract = element(by.model('item.abstract')).all(by.className('editor-type-html')).first(); var bodyFooter = element(by.id('body_footer')).all(by.className('editor-type-html')).first(); var bodyFooterPreview = element(by.id('body_footer_preview')).all(by.css('[ng-bind-html="html"]')).first(); @@ -749,7 +751,9 @@ class Authoring { var byline = element(by.model('item.byline')).all(by.className('editor-type-html')).first(); this.writeText = function(text) { - bodyHtml.sendKeys(text); + getBodyHtml().then((bodyHtml) => { + bodyHtml.sendKeys(text); + }); }; this.writeTextToHeadline = function(text) { @@ -797,7 +801,9 @@ class Authoring { this.getEditorWordCount = () => element.all(by.className('char-count words')).last().getText(); this.getBodyText = function() { - return bodyHtml.getText(); + return getBodyHtml().then((bodyHtml) => { + return bodyHtml.getText(); + }); }; this.getBodyInnerHtml = function() { @@ -806,12 +812,16 @@ class Authoring { }; this.focusBodyHtmlElement = function() { - bodyHtml.click(); + getBodyHtml().then((bodyHtml) => { + bodyHtml.click(); + }); }; this.cleanBodyHtmlElement = function() { - bodyHtml.clear(); - this.backspaceBodyHtml(); + getBodyHtml().then((bodyHtml) => { + bodyHtml.clear(); + this.backspaceBodyHtml(); + }); }; this.backspaceBodyHtml = function(count) { @@ -821,7 +831,9 @@ class Authoring { sequence += protractor.Key.BACK_SPACE; } - bodyHtml.sendKeys(sequence); + getBodyHtml().then((bodyHtml) => { + bodyHtml.sendKeys(sequence); + }); }; this.getHeadlineText = function() { @@ -974,6 +986,8 @@ class Authoring { this.setHeaderSluglineText = function(text) { var headerDetails = element(by.className('authoring-header__detailed')); + browser.wait(ECE.presenceOf(headerDetails)); + return headerDetails.all(by.model('item.slugline')).sendKeys(text); }; diff --git a/spec/monitoring_spec.ts b/spec/monitoring_spec.ts index 1882e09c60..50d10a0f76 100644 --- a/spec/monitoring_spec.ts +++ b/spec/monitoring_spec.ts @@ -7,6 +7,7 @@ import {workspace} from './helpers/workspace'; import {authoring} from './helpers/authoring'; import {dashboard} from './helpers/dashboard'; import {desks} from './helpers/desks'; +import {el, s} from 'end-to-end-testing-helpers'; describe('monitoring', () => { // Opens desk settings and configure monitoring settings for the named desk @@ -789,6 +790,37 @@ describe('monitoring', () => { expect(previewPane.isPresent()).toBe(false); }); + it('Can create items from templates', () => { + const slugline = 'slugline template'; + const editorsNote = 'test editor\'s note for template'; + + monitoring.openMonitoring(); + expect(browser.isElementPresent(element(s(['authoring'])))).toBe(false); + el(['content-create']).click(); + el(['content-create-dropdown']).element(by.buttonText('Plain text')).click(); + + expect(browser.isElementPresent(element(s(['authoring'])))).toBe(true); + el(['authoring', 'field-slugline']).sendKeys(slugline); + el(['authoring', 'field-editors-note']).sendKeys(editorsNote); + browser.sleep(500); // input debouncing + el(['authoring', 'save']).click(); + + el(['authoring', 'actions-button']).click(); + el(['authoring', 'actions-list']).element(by.buttonText('Save as template')).click(); + el(['create-template-modal--save']).click(); + el(['authoring', 'close']).click(); + expect(browser.isElementPresent(element(s(['authoring'])))).toBe(false); + + el(['content-create']).click(); + el(['content-create-dropdown']).element(by.buttonText('More templates...')).click(); + el(['templates-list']).element(by.buttonText(slugline)).click(); + + browser.sleep(500); // animation + expect(browser.isElementPresent(element(s(['authoring'])))).toBe(true); + expect(el(['authoring', 'field-slugline']).getAttribute('value')).toBe(slugline); + expect(el(['authoring', 'field-editors-note']).getAttribute('value')).toBe(editorsNote); + }); + xit('can display embargo label when set for published item', () => { setupDeskMonitoringSettings('POLITIC DESK'); monitoring.turnOffDeskWorkingStage(0); diff --git a/spec/templates_spec.ts b/spec/templates_spec.ts index b4c0fe1da3..ed0cbf8197 100644 --- a/spec/templates_spec.ts +++ b/spec/templates_spec.ts @@ -8,7 +8,7 @@ * at https://www.sourcefabric.org/superdesk/license */ -import {by} from 'protractor'; +import {by, browser} from 'protractor'; import {templates} from './helpers/templates'; import {monitoring} from './helpers/monitoring';