merge cp-lji branch to develop

CHANGELOG.md

@@ -1,5 +1,83 @@
 # Newsroom Changelog
 
+## [1.15.2] 2019-10-17
+### Features
+- None
+
+### Improvements
+- Add ANA logo (#856)
+- [SDCP-25] Allow new users to register their interests (#857)
+- [SDAN-596] Pressing back button on a mobile phone when the preview is open should close the preview (#859)
+- [SDAN-599] 'Time to be confirmed' feature for Agenda Items (#860)
+- [SDAN-588] Use Topic instead of Events in navigation labels (#863)
+- [SDAN-599] Display changes to 'Time to be confirmed' label (#864)
+
+### Fixes
+- Use default Ubuntu in Travis (#853)
+- [SDAN-598] fix: Save button not being enabled when turning off topic notifications (#855)
+- [SDAN-595] fix(agenda-emails) Use correct url_for method (#854)
+- Updating superdesk-core version for newsroom package (#861)
+
+## [1.15.1] 2019-09-10
+### Features
+- None
+
+### Improvements
+- None
+
+### Fixes
+- [SDAN-594] Previewing past or future Agenda item from email displays list not the preview (#848)
+- Save Topic and Save Events 'SAVE' button was disabled while saving (#849)
+
+## [1.15] 2019-09-09
+### Features
+- None
+
+### Improvements
+- [SDAN-578][SDAN-579] 'Account Manager' field in Company schema and use that in Company Expiry alerts (#832)
+- [SDAN-570] Fixes/Improvements to the 'share' action (#838)
+- [SDAN-591] Improve company expiry email layout and text (#841)
+- [SDAN-570] Changes to 'share' item template (#842)
+- [SDAN-572] Style changes to display 'Event Completed' label (#843)
+- [SDAN-568] Improve responsive behaviour for mobile phones (#834)
+- [SDAN-568] Further response layout improvements (#844)
+
+### Fixes
+- [SDAN-583] Preview for items that aren't wire or agenda in the Subscriber Activity report don't show the body text (#831)
+- [SDAN-580] Remove company expiry check from user login and notifications (#833)
+- [SDAN-587] Ignore agenda when applying time limit to search (#836)
+- [SDAN-590] (fix): Celery beat and queue configs (#840)
+- [SDAN-592] Coverages in the Agenda Share/Print Preview are misaligned (#845)
+- [SDAN-593] Show all event coverages if no planning item selected (#847)
+
+## [1.14] 2019-08-22
+### Features
+- [SDAN-538] Add the ability to execute the remove expired command (#817)
+
+### Improvements
+- [SDAN-572] Label completed agenda items as 'Completed' (#829)
+- [SDAN-572][SDAN-567] UI changes in displaying 'byline', 'located' and 'slugline' (#823)
+- [SDAN-565] Reposition the 'show map' text in Agenda Preview (#821)
+- [SDAN-566] Add 'preview' and 'open' to 'actions' filter in subscriber activity report (#822)
+- [SDAN-524][SDAN-530] Record 'open' and 'preview' actions in history collection (#815)
+- [SDAN-519] Toggle map display in Agenda Preview (#811)
+
+### Fixes
+- [SDAN-585] (fix): Corrections showing up as 'Updates Coming' (#830)
+- [SDAN-569] Market Place Bookmarks were not seen (#828)
+- UI fix to add padding after 'published' and remove 'on created_time' in wire ite, detail (#826)
+- fix creating new dashboard card when there is single dashboard type (#827)
+- [SDAN-576] Prefer description_text over body_text for image captions (#825)
+- [SDAN-575] Internal note on coverages is visible for public users in Newsroom (#824)
+- [SDAN-548] ednote from wire item was not displayed in Agenda coverage. (#818)
+- [SDAN-549] Text from wire items were not updating in Agenda preview (#818)
+- [SDAN-531] Push errors when event is created from a planning item (#814)
+- [SDAN-516] Show agency logos for AAPX (#816)
+- [SDAN-535] Add 'located' attribute as 'Location' when a wire item is copied (#813)
+
+## [1.13.1] 2019-07-18
+- [SDAN-532] Fetch card external item details after loading the page (#812)
+
 ## [1.13] 2019-07-16
 - [SDAN-529] Fix incorrect coverage scheduled date in Agenda notification email
 - [SDAN-514] Changes to Watched Agenda Emails (#808)

assets/cards/components/CardsApp.jsx

@@ -25,7 +25,7 @@ class CardsApp extends React.Component {
                 onNewItem={this.props.newCard}
                 setQuery={this.props.setQuery}
                 fetch={this.props.fetchCards}
-                buttonName={gettext('Card')}
+                buttonText={gettext('New Card')}
             >
                 <DashboardSwitch
                     dashboards={this.props.dashboards}

assets/companies/components/CompaniesApp.jsx

@@ -22,7 +22,7 @@ class CompaniesApp extends React.Component {
                 onNewItem={this.props.newCompany}
                 setQuery={this.props.setQuery}
                 fetch={this.props.fetchCompanies}
-                buttonName={gettext('Company')}
+                buttonText={gettext('New Company')}
             />,
             <Companies key="Companies" />
             ]

assets/components/ListBar.jsx

@@ -1,6 +1,5 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import {gettext} from 'utils';
 import SearchBar from 'search/components/SearchBar';
 
 class ListBar extends React.Component {
@@ -16,11 +15,14 @@ class ListBar extends React.Component {
                         />
                     )}
                     <div className="content-bar__right">
-                        {this.props.onNewItem && <button
-                            className="btn btn-outline-secondary btn-responsive"
-                            onClick={() => this.props.onNewItem()}>
-                            {gettext('New {{ buttonName }}', {buttonName: this.props.buttonName})}
-                        </button>}
+                        {this.props.onNewItem && (
+                            <button
+                                className="btn btn-outline-secondary btn-responsive"
+                                onClick={() => this.props.onNewItem()}
+                            >
+                                {this.props.buttonText}
+                            </button>
+                        )}
                     </div>
                 </nav>
             </section>
@@ -31,7 +33,7 @@ class ListBar extends React.Component {
 ListBar.propTypes = {
     setQuery: PropTypes.func,
     fetch: PropTypes.func,
-    buttonName: PropTypes.string,
+    buttonText: PropTypes.string,
     onNewItem: PropTypes.func,
     children: PropTypes.node,
     noSearch: PropTypes.bool,

assets/components/PreviewActionButtons.jsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import ActionButton from './ActionButton';
+import types from 'wire/types';
 
 
 function PreviewActionButtons({item, user, actions, plan, group}) {
@@ -25,12 +26,9 @@ function PreviewActionButtons({item, user, actions, plan, group}) {
 }
 
 PreviewActionButtons.propTypes = {
-    item: PropTypes.object,
-    user: PropTypes.string,
-    actions: PropTypes.arrayOf(PropTypes.shape({
-        name: PropTypes.string,
-        action: PropTypes.func,
-    })),
+    item: types.item,
+    user: types.user,
+    actions: types.actions,
     plan: PropTypes.string,
     group: PropTypes.string,
 };

assets/components/SelectInput.jsx

@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import {gettext} from 'utils';
 
 const SelectInput = ({
     name,
@@ -26,7 +27,7 @@ const SelectInput = ({
                         <option value="">{defaultOption}</option>
                     }
                     {options.map((option) => {
-                        return <option key={option.value} value={option.value}>{option.text}</option>;
+                        return <option key={option.value} value={option.value}>{gettext(option.text)}</option>;
                     })}
                 </select>
                 {error && <div className="alert alert-danger">{error}</div>}

assets/components/cards/render/LargePictureTextCard.jsx

@@ -13,7 +13,11 @@ const getPictureTextPanel = (item, picture, openItem, cardId, listConfig) => {
 
     return (<div key={item._id} className="col-sm-6 col-lg-4 d-flex mb-4">
         <div className="card card--home" onClick={() => openItem(item, cardId)}>
-            <img className="card-img-top" src={imageUrl} alt={caption} />
+            {rendition &&
+                <div className="card-img-top-wrapper card-img-top-wrapper--aspect-16-9">
+                    <img className="card-img-top" src={imageUrl} alt={caption} />
+                </div>
+            }
             <CardBody item={item} displaySource={false} />
             <CardFooter
                 wordCount={wordCount(item)}

assets/components/cards/render/PictureTextCard.jsx

@@ -11,10 +11,12 @@ const getPictureTextPanel = (item, picture, openItem, withPictures, cardId, list
     const imageUrl = rendition && rendition.href;
     const caption = rendition && getCaption(picture);
 
-    return (<div key={item._id} className="col-sm-6 col-lg-3 d-flex mb-4">
+    return (<div key={item._id} className="col-sm-6 col-lg-4 col-xl-3 d-flex mb-4">
         <div className="card card--home" onClick={() => openItem(item, cardId)}>
             {rendition &&
-                <img className="card-img-top" src={imageUrl} alt={caption} />
+                <div className="card-img-top-wrapper card-img-top-wrapper--aspect-16-9">
+                    <img className="card-img-top" src={imageUrl} alt={caption} />
+                </div>
             }
             <CardBody item={item} displayMeta={false} />
             <CardFooter

assets/home/actions.js

@@ -1,5 +1,6 @@
 import server from '../server';
 import {errorHandler, recordAction} from 'utils';
+import {pushNotification as wirePushNotification} from 'wire/actions';
 import {get} from 'lodash';
 
 export const INIT_DATA = 'INIT_DATA';
@@ -46,6 +47,8 @@ export function pushNotification(push) {
                 () => window.location.reload(),
                 1000
             );
+        } else {
+            return wirePushNotification(push);
         }
     };
 }

assets/home/components/HomeApp.jsx

@@ -16,6 +16,7 @@ import DownloadItemsModal from 'wire/components/DownloadItemsModal';
 import WirePreview from 'wire/components/WirePreview';
 import {followStory} from 'search/actions';
 import {downloadVideo} from 'wire/actions';
+import {SearchBar} from './search-bar';
 import {previewConfigSelector, listConfigSelector, detailsConfigSelector} from 'ui/selectors';
 
 const modals = {
@@ -111,21 +112,25 @@ class HomeApp extends React.Component {
 
     renderContent(children) {
         return (
-            <section className="content-main d-block py-4 px-2 p-md-3 p-lg-4"
-                onScroll={this.onHomeScroll}
-                ref={(elem) => this.elem = elem}
-            >
-                <div className="container-fluid">
-                    {this.props.cards.length > 0 &&
-                    this.props.cards.filter((c) => c.dashboard === 'newsroom').map((card) => this.getPanels(card))}
-                    {this.props.cards.length === 0 &&
-                    <div className="alert alert-warning" role="alert">
-                        <strong>{gettext('Warning')}!</strong> {gettext('There\'s no card defined for home page!')}
+            <React.Fragment>
+                <SearchBar />
+
+                <section className="content-main d-block py-4 px-2 p-md-3 p-lg-4"
+                    onScroll={this.onHomeScroll}
+                    ref={(elem) => this.elem = elem}
+                >
+                    <div className="container-fluid">
+                        {this.props.cards.length > 0 &&
+                        this.props.cards.filter((c) => c.dashboard === 'newsroom').map((card) => this.getPanels(card))}
+                        {this.props.cards.length === 0 &&
+                        <div className="alert alert-warning" role="alert">
+                            <strong>{gettext('Warning')}!</strong> {gettext('There\'s no card defined for home page!')}
+                        </div>
+                        }
                     </div>
-                    }
-                </div>
-                {children}
-            </section>
+                    {children}
+                </section>
+            </React.Fragment>
         );
     }
 
@@ -136,8 +141,10 @@ class HomeApp extends React.Component {
             (this.props.itemToOpen ? [<ItemDetails key="itemDetails"
                 item={this.props.itemToOpen}
                 user={this.props.user}
+                topics={this.props.topics}
                 actions={this.filterActions(this.props.itemToOpen, this.props.previewConfig)}
                 onClose={() => this.props.actions.filter(a => a.id === 'open')[0].action(null)}
+                followStory={this.props.followStory}
                 detailsConfig={this.props.detailsConfig}
             />, modal] :
                 this.renderContent()
@@ -200,6 +207,7 @@ HomeApp.propTypes = {
     detailsConfig: PropTypes.object,
     downloadVideo: PropTypes.func,
     topics: PropTypes.array,
+    isFollowing: PropTypes.bool,
 };
 
 const mapStateToProps = (state) => ({

assets/home/components/search-bar.jsx

@@ -0,0 +1,35 @@
+import React from 'react';
+import {gettext} from 'utils';
+
+export class SearchBar extends React.PureComponent {
+    render() {
+        return (
+            <section className="content-header">
+                <nav className="content-bar navbar justify-content-start flex-nowrap flex-sm-wrap">
+                    <div className="search form-inline">
+                        <span className="search__icon d-none d-sm-block">
+                            <i className="icon--search icon--gray-light" />
+                        </span>
+                        <div className="search__form input-group searchForm--active">
+                            <form className="form-inline" action="/wire">
+                                <input type="text" name="q" className="search__input form-control"
+                                    placeholder={gettext('Search for...')}
+                                    aria-label={gettext('Search for...')} />
+                                <div className="search__form__buttons">
+                                    <button type="reset" className="icon-button search__clear" title={gettext('Clear')}>
+                                        <span className="search__clear">
+                                            <img src="/static/search_clear.png" width="16" height="16"/>
+                                        </span>
+                                    </button>
+                                    <button className="btn btn-outline-secondary" type="submit" title={gettext('Search')}>
+                                        {gettext('Search')}
+                                    </button>
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                </nav>
+            </section>
+        );
+    }
+}

assets/home/reducers.js

@@ -8,16 +8,19 @@ import {
 import {BOOKMARK_ITEMS, REMOVE_BOOKMARK} from '../wire/actions';
 import {CLOSE_MODAL, MODAL_FORM_VALID, RENDER_MODAL} from '../actions';
 import {modalReducer} from '../reducers';
+import {topicsReducer} from '../topics/reducer';
 
 const initialState = {
     cards: [],
-    itemsByCard: {},
+    topics: [],
     products: [],
+    itemsByCard: {},
     activeCard: null,
     uiConfig: {},
 };
 
-export default function homeReducer(state = initialState, action) {
+export default function homeReducer(state=initialState, action) {
+
     switch (action.type) {
 
     case INIT_DATA:
@@ -31,8 +34,9 @@ export default function homeReducer(state = initialState, action) {
             company: action.data.company,
             formats: action.data.formats || [],
             userSections: action.data.userSections,
-            context: 'wire',
             uiConfig: action.data.ui_config || {},
+            topics: action.data.topics || [],
+            context: 'wire'
         };
 
     case OPEN_ITEM:{
@@ -84,6 +88,6 @@ export default function homeReducer(state = initialState, action) {
         return {...state, modal: modalReducer(state.modal, action)};
 
     default:
-        return state;
+        return {...state, topics: topicsReducer(state.topics, action)};
     }
 }

assets/item-actions.js

@@ -1,5 +1,4 @@
-import {gettext} from './utils';
-
+import {gettext, isActionEnabled} from './utils';
 
 export function getItemActions(dispatch, actions) {
     const {
@@ -13,7 +12,6 @@ export function getItemActions(dispatch, actions) {
         removeItems,
     } = actions;
 
-
     return [
         {
             id: 'open',
@@ -81,5 +79,5 @@ export function getItemActions(dispatch, actions) {
             when: (state) => state.user && state.userType === 'administrator',
             action: (items) => removeItems(items),
         }
-    ];
+    ].filter(isActionEnabled('item_actions'));
 }