Merge pull request #139 from ride90/0.x

v0.6.2

.travis.yml

@@ -2,38 +2,39 @@ language: python
 
 python: "3.5"
 
-sudo: false
-dist: trusty
-
 services:
     - mongodb
-    - elasticsearch
     - redis-server
 
 addons:
   apt:
     sources:
     - mongodb-3.0-precise
+    - elasticsearch-2.x
     packages:
     - mongodb-org-server
+    - elasticsearch
 
 cache:
   directories:
     - $HOME/.cache/pip
     - $HOME/.npm
 
 before_install:
+    - sudo apt-get purge elasticsearch
+    - sudo apt-get install -t stable elasticsearch
     - nvm install 6.10
     - nvm use 6.10
     - node --version
     - npm install -g npm@3
     - npm install -g grunt-cli
+    - sudo systemctl start elasticsearch
 
 install:
     - cd server && pip install -r dev-requirements.txt && cd ..
     - cd client && npm install && cd ..
 
 script:
-    - cd server && flake8 && cd ..
+    - cd server && flake8 && nosetests && cd ..
     - cd client && node --max_old_space_size=4098 ./node_modules/.bin/grunt build && cd ..
     - cd server && python manage.py users:create -u test -p test -e test@localhost --admin && cd ..

client/belga/index.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import angular from 'angular';
-import {IUser} from 'superdesk-api'
+import {IUser} from 'superdesk-api';
 import {startApp} from 'superdesk-core/scripts/index';
 import belgaImage from './image';
 import belga360Archive from './360archive';
@@ -9,6 +9,7 @@ import markForUserExtension from 'superdesk-core/scripts/extensions/markForUser/
 import datetimeFieldExtension from 'superdesk-core/scripts/extensions/datetimeField/dist/src/extension';
 import belgaCoverageExtension from '../extensions/belgaCoverage/dist/index';
 import updateArticleOnProfileChangeExtension from '../extensions/updateArticleOnProfileChange/dist/src/extension';
+import iptcExtension from '../extensions/iptc/dist/extension'
 
 class UserAvatar extends React.Component<{user: IUser}> {
     render() {
@@ -29,6 +30,7 @@ setTimeout(() => {
         datetimeFieldExtension,
         belgaCoverageExtension,
         updateArticleOnProfileChangeExtension,
+        iptcExtension,
     ],{UserAvatar});
 });
 

client/extensions/iptc/.gitignore

@@ -0,0 +1 @@
+dist

client/extensions/iptc/package.json

@@ -0,0 +1,13 @@
+{
+  "private": true,
+  "main": "dist/extension.js",
+  "name": "iptc",
+  "version": "1.0.0",
+  "scripts": {
+    "compile": "tsc",
+    "watch": "tsc -watch"
+  },
+  "devDependencies": {
+    "typescript": "3.7.2"
+  }
+}

client/extensions/iptc/src/extension.ts

@@ -0,0 +1,58 @@
+import {IExtension, IExtensionActivationResult, ISuperdesk, IArticle, ISubject} from 'superdesk-api';
+
+type Scheme = 'media-credit' | 'belga-keywords' | 'country';
+
+const CVS: Array<Scheme> = ['media-credit', 'belga-keywords', 'country'];
+
+const DEFAULT_SUBJECT = {
+    'media-credit': ['BELGA_ON_THE_SPOT'],
+    'belga-keywords': ['RUSHES', 'BELGAILLUSTRATION', 'BELGAINTERVIEW', 'BELGAINSERT'],
+    'country': ['COUNTRY_BEL'],
+};
+
+const extension: IExtension = {
+    id: 'iptc',
+    activate: (superdesk: ISuperdesk) => {
+        const result: IExtensionActivationResult = {
+            contributions: {
+                iptcMapping: (data, item: IArticle) => Promise.all<Array<ISubject>>(
+                    CVS.map((id) => superdesk.entities.vocabulary.getVocabulary(id)),
+                ).then((cvItems) => {
+                    const subject: Array<ISubject> = [];
+                    const items = {
+                        'media-credit': cvItems[0],
+                        'belga-keywords': cvItems[1],
+                        'country': cvItems[2],
+                    };
+
+                    for (let scheme of CVS) {
+                        items[scheme]
+                            .filter((subj) => DEFAULT_SUBJECT[scheme].includes(subj.qcode.toUpperCase()))
+                            .forEach((subj) => {
+                                subject.push({
+                                    name: subj.name,
+                                    qcode: subj.qcode,
+                                    scheme: scheme,
+                                    translations: subj.translations,
+                                });
+                            });
+                    }
+
+                    Object.assign(item, {
+                        source: 'Belga',
+                        subject: subject,
+                        extra: {
+                            city: data.City || 'Brussels',
+                        },
+                    });
+
+                    return item;
+                }),
+            },
+        };
+
+        return Promise.resolve(result);
+    },
+};
+
+export default extension;

client/extensions/iptc/src/typings/refs.d.ts

@@ -0,0 +1 @@
+/// <reference path='../../../../node_modules/superdesk-core/scripts/core/superdesk-api.d.ts' />

client/extensions/iptc/tsconfig.json

@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "outDir": "dist",
+        "module": "commonjs",
+        "target": "es6",
+        "lib": [
+            "dom",
+            "es2017"
+        ],
+        "skipLibCheck": true,
+        "jsx": "react",
+
+        "strict": true,
+        "alwaysStrict": true,
+        "strictBindCallApply": true,
+        "strictFunctionTypes": true,
+        "strictPropertyInitialization": true,
+        "strictNullChecks": true,
+        "noImplicitAny": true,
+        "noImplicitReturns": true,
+        "noImplicitThis": true,
+
+        "forceConsistentCasingInFileNames": true,
+        "noFallthroughCasesInSwitch": true,
+        "noUnusedLocals": true,
+        "noUnusedParameters": true
+    }
+}

client/package.json

@@ -6,8 +6,8 @@
     },
     "dependencies": {
         "superdesk-analytics": "github:tomaskikutis/superdesk-analytics#next",
-        "superdesk-core": "github:superdesk/superdesk-client-core#2915ba304",
+        "superdesk-core": "github:superdesk/superdesk-client-core#67d8fc6",
         "superdesk-planning-extension": "1.0.1",
         "superdesk-planning": "github:tomaskikutis/superdesk-planning#move-planning-extension-from-core"
     }
-}
+}