[smarcet] - #10167

* survey data tagging / edition

[spalenque] - #13074
* merge tags feature

[spalenque] - #13075
* stats revamp

Author: smarcet

.gitignore

@@ -88,4 +88,7 @@ auth.json
 autocomplete/
 *.patch
 *.mo
-blog
+blog
+db.ini
+env/
+*.pyc

bower.json

@@ -23,8 +23,8 @@
     "jquery-ui": "~1.11.4",
     "jquery-validate": "~1.14.0",
     "bootstrap": "3.3.6",
-    "fontawesome": "4.5.0",
-    "bootstrap-tagsinput": "0.7.1",
+    "fontawesome": "4.7.0",
+    "bootstrap-tagsinput": "0.8.0",
     "bootstrap-datepicker": "~1.4.0",
     "pwstrength-bootstrap": "~1.2.7",
     "jquery-cookie": "~1.4.1",

composer.json

@@ -9,8 +9,8 @@
   ],
   "require": {
     "php": ">=5.3.2",
-    "silverstripe/cms": "3.1.19",
-    "silverstripe/framework": "3.1.19",
+    "silverstripe/cms": "3.1.20",
+    "silverstripe/framework": "3.1.20",
     "ezyang/htmlpurifier": "dev-master",
     "undefinedoffset/sortablegridfield": "0.5.4",
     "tractorcow/silverstripe-colorpicker": "3.0.*@dev",

marketplace/code/ui/admin/SangriaPageMarketPlaceExtension.php

@@ -165,7 +165,7 @@ public function ViewOpenStackProductsByRegion(){
         Requirements::clear();
         // css
 
-        Requirements::css('marketplace/ui/source/css/sangria.css');
+        Requirements::css('sangria/ui/source/css/sangria.css');
         Requirements::css("themes/openstack/bower_assets/bootstrap/dist/css/bootstrap.min.css");
         Requirements::css("themes/openstack/bower_assets/fontawesome/css/font-awesome.min.css");
         Requirements::css('//fonts.googleapis.com/css?family=Open+Sans:300,400,700');

marketplace/ui/source/js/sangria-marketplace-openstack-powered-products/store.js

@@ -17,15 +17,9 @@ import thunk from 'redux-thunk';
 import {openStackPoweredProducts} from './reducers';
 import { genericReducers } from "~core-utils/reducers";
 
-/*const createStoreWithMiddleware = applyMiddleware(
-    thunk,
-)(createStore);*/
-
 const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
 
 let reducer = reduceReducers(openStackPoweredProducts, genericReducers);
 const store = createStore(reducer, composeEnhancers(applyMiddleware(thunk)));
 
-//const store = createStoreWithMiddleware(openStackPoweredProducts);
-
 export default store;

openstack/code/utils/apis/AbstractRestfulJsonApi.php

@@ -19,6 +19,28 @@
 abstract class AbstractRestfulJsonApi extends Controller
 {
 
+    private static $api_prefix = null;
+
+    /**
+     * @return bool
+     */
+    protected function isApiCall()
+    {
+        $class   = get_class($this);
+        $request = $this->getRequest();
+
+        if (is_null($request)) {
+            return false;
+        }
+
+        $api_prefix = Config::inst()->get($class, 'api_prefix', Config::UNINHERITED);
+
+        if(!empty($api_prefix))
+            return strpos(strtolower($request->getURL()), $api_prefix) !== false;
+
+        return false;
+    }
+
     /**
      * @param string $action
      * @return CachedMethod
@@ -158,11 +180,6 @@ public function __construct()
         register_shutdown_function(array($this, 'shutdown_function'));
     }
 
-    /**
-     * @return mixed
-     */
-    abstract protected function isApiCall();
-
     /**
      * @param $realm
      * @return SS_HTTPResponse

package.json

@@ -15,12 +15,23 @@
   },
   "dependencies": {
     "amdefine": "^1.0.0",
+    "babel-cli": "^6.24.1",
     "babel-polyfill": "^6.16.0",
+    "bootstrap": "3.3.6",
+    "bootstrap-3-typeahead": "^4.0.2",
+    "bootstrap-tagsinput": "^0.7.1",
+    "chart.js": "^2.6.0",
     "classnames": "^2.2.5",
+    "font-awesome": "^4.7.0",
     "has-flag": "^2.0.0",
+    "jquery": "^3.2.1",
     "mousetrap": "^1.6.0",
+    "randomcolor": "^0.5.3",
     "react": "^15.4.1",
+    "react-chartjs2": "^1.1.2",
+    "react-confirm-bootstrap": "^3.1.4",
     "react-dom": "^15.4.1",
+    "react-modal-bootstrap": "^1.1.1",
     "react-redux": "^5.0.5",
     "reduce-reducers": "^0.1.2",
     "redux-thunk": "^2.2.0",
@@ -37,7 +48,6 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "autoprefixer-loader": "^3.2.0",
-    "babel": "^6.5.2",
     "babel-core": "^6.14.0",
     "babel-loader": "^6.2.5",
     "babel-polyfill": "^6.16.0",
@@ -46,9 +56,12 @@
     "babel-preset-stage-2": "^6.18.0",
     "babel-preset-stage-3": "^6.17.0",
     "bower": "^1.7.9",
+    "browser-sync-webpack-plugin": "^1.1.4",
     "css-loader": "^0.25.0",
+    "expose-loader": "^0.7.3",
     "extract-text-webpack-plugin": "^1.0.1",
     "file-loader": "^0.9.0",
+    "imports-loader": "^0.7.1",
     "json-loader": "^0.5.4",
     "less": "^2.7.1",
     "less-loader": "^2.2.3",

sangria/_config/routes.yml

@@ -0,0 +1,7 @@
+---
+Name: sangriaroutes
+After: 'framework/routes#coreroutes'
+---
+Director:
+  rules:
+    'api/v1/sangria': 'SangriaApi'

sangria/code/SangriaPage.php

@@ -43,12 +43,19 @@ function init()
             Security::permissionFailure();
         }
         parent::init();
+
+        Requirements::css('fonts.googleapis.com/css?family=PT+Sans&subset=latin');
+        Requirements::css('themes/openstack/css/blueprint/screen.css', 'screen, projection');
+        Requirements::css('themes/openstack/css/blueprint/print.css', 'print');
+        Requirements::css('themes/openstack/css/dropdown.css', 'screen, projection, print');
+
         Requirements::css(THIRDPARTY_DIR . '/jquery-ui-themes/smoothness/jquery-ui.css');
+        Requirements::css("themes/openstack/javascript/datetimepicker/jquery.datetimepicker.css");
+        Requirements::css("themes/openstack/css/deployment.survey.page.css");
+
         Requirements::javascript(THIRDPARTY_DIR . '/jquery-ui/jquery-ui.js');
         Requirements::javascript('themes/openstack/javascript/jquery.tablednd.js');
-        Requirements::css("themes/openstack/javascript/datetimepicker/jquery.datetimepicker.css");
         Requirements::javascript("themes/openstack/javascript/datetimepicker/jquery.datetimepicker.js");
-        Requirements::css("themes/openstack/css/deployment.survey.page.css");
         Requirements::javascript("themes/openstack/javascript/deployment.survey.filters.js");
 
         self::$default_start_date = date('Y/m/d', strtotime('-1 months')) . ' 00:00';

sangria/code/SangriaPageViewCurrentStoriesExtension.php

@@ -19,26 +19,23 @@
 final class SangriaPageViewCurrentStoriesExtension extends Extension
 {
 
+    static $allowed_actions = [
+        'ViewCurrentStories',
+        'UpdateStories',
+        'SetAdminSS',
+        'UnPublishFromUserStories',
+    ];
+
     public function onBeforeInit()
     {
 
-        Config::inst()->update(get_class($this), 'allowed_actions', array(
-            'ViewCurrentStories',
-            'UpdateStories',
-            'SetAdminSS',
-            'UnPublishFromUserStories',
-        ));
-
-        Config::inst()->update(get_class($this->owner), 'allowed_actions', array(
-            'ViewCurrentStories',
-            'UpdateStories',
-            'SetAdminSS',
-            'UnPublishFromUserStories',
-        ));
+        Config::inst()->update(get_class($this), 'allowed_actions', self::$allowed_actions);
+
+        Config::inst()->update(get_class($this->owner), 'allowed_actions', self::$allowed_actions);
     }
 
     public function ViewCurrentStories(){
-        Requirements::javascript("themes/openstack/javascript/sangria/view.current.stories.js");
+        Requirements::javascript("sangria/ui/source/UserStories.js");
         return $this->owner->Customise(array())->renderWith(array('SangriaPage_ViewCurrentStories','SangriaPage','SangriaPage'));
     }