fix(FEC-9103): Remove old kaltura stats (#244)

Remove kanalytics from kaltura-player.
kaltura · Jun 11, 2019 · f7fa3ac · f7fa3ac
1 parent 59368a3
commit f7fa3ac
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 77 deletions.
diff --git a/README.md b/README.md
@@ -14,14 +14,14 @@ The Kaltura Player integrates:
 - [PlayKit JS DASH](https://github.com/kaltura/playkit-js-dash) and [PlayKit JS HLS](https://github.com/kaltura/playkit-js-hls) for HLS & MPEG-DASH media source extensions capabilities.
 - [PlayKit JS IMA](https://github.com/kaltura/playkit-js-ima) for ads and monetization.
 - [PlayKit JS Providers](https://github.com/kaltura/playkit-js-providers) as the backend media providers.
-- [PlayKit JS Youbora](https://github.com/kaltura/playkit-js-youbora), [PlayKit JS KAnalytics](https://github.com/kaltura/playkit-js-kanalytics), [PlayKit JS KAVA](https://github.com/kaltura/playkit-js-kava), and [PlayKit JS OTT Analytics](https://github.com/kaltura/playkit-js-ott-analytics) as the different analytics plugins.
+- [PlayKit JS Youbora](https://github.com/kaltura/playkit-js-youbora), [PlayKit JS KAVA](https://github.com/kaltura/playkit-js-kava), and [PlayKit JS OTT Analytics](https://github.com/kaltura/playkit-js-ott-analytics) as the different analytics plugins.
 
 The Kaltura Player exposes two different players: the _Kaltura OVP Player_ and _Kaltura Cloud TV Player_. Each player integrates its related packages, as you can see in the following table:
 
-|                 | PlayKit JS | PlayKit JS Providers | PlayKit JS UI | PlayKit JS DASH | PlayKit JS HLS | PlayKit JS Youbora | PlayKit JS KAnalytics | PlayKit JS OTT Analytics | PlayKit JS KAVA |
-| --------------- | ---------- | -------------------- | ------------- | --------------- | -------------- | ------------------ | --------------------- | ------------------------ | --------------- |
-| OVP Player      | V          | OVP                  | V             | V               | V              | V                  | V                     |                          | V               |  |
-| Cloud TV Player | V          | OTT                  | V             | V               | V              | V                  |                       | V                        | V (\*)          |
+|                 | PlayKit JS | PlayKit JS Providers | PlayKit JS UI | PlayKit JS DASH | PlayKit JS HLS | PlayKit JS Youbora | PlayKit JS OTT Analytics | PlayKit JS KAVA |
+| --------------- | ---------- | -------------------- | ------------- | --------------- | -------------- | ------------------ | ------------------------ | --------------- |
+| OVP Player      | V          | OVP                  | V             | V               | V              | V                  |                          | V               |  |
+| Cloud TV Player | V          | OTT                  | V             | V               | V              | V                  | V                        | V (\*)          |
 
 > \* Needs to be configured.
 

diff --git a/package.json b/package.json
@@ -98,7 +98,6 @@
     "@playkit-js/playkit-js": "^0.46.2",
     "@playkit-js/playkit-js-dash": "^1.10.1",
     "@playkit-js/playkit-js-hls": "^1.13.1",
-    "@playkit-js/playkit-js-kanalytics": "^0.10.1",
     "@playkit-js/playkit-js-kava": "^0.7.2",
     "@playkit-js/playkit-js-ott-analytics": "^0.5.0",
     "@playkit-js/playkit-js-ui": "^0.40.1",

diff --git a/samples/ovp/all-plugins.html b/samples/ovp/all-plugins.html
@@ -20,9 +20,6 @@
       }
     },
     plugins: {
-      kanalytics: {
-        serviceUrl: "http://qa-apache-php7.dev.kaltura.com/api_v3"
-      },
       ima: {
         adTagUrl: 'https://pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/124319096/external/ad_rule_samples&ciu_szs=300x250&ad_rule=1&impl=s&gdfp_req=1&env=vp&output=vmap&unviewed_position_start=1&cust_params=deployment%3Ddevsite%26sample_ar%3Dpremidpost&cmsid=496&vid=short_onecue&correlator='
       }

diff --git a/samples/ovp/standalone-kanalytics.html b/samples/ovp/standalone-kanalytics.html
diff --git a/src/common/plugins/plugins-config-store.js b/src/common/plugins/plugins-config-store.js
@@ -12,17 +12,6 @@ const defaultConfig: dataStoreType = {
     sessionId: '{{sessionId}}',
     uiConfId: '{{uiConfId}}'
   },
-  kanalytics: {
-    playerVersion: '{{pVersion}}',
-    playlistId: '{{playlistId}}',
-    entryId: '{{entryId}}',
-    entryType: '{{entryType}}',
-    sessionId: '{{sessionId}}',
-    ks: '{{ks}}',
-    uiConfId: '{{uiConfId}}',
-    partnerId: '{{partnerId}}',
-    referrer: '{{referrer}}'
-  },
   googleAnalytics: {
     entryId: '{{entryId}}',
     entryName: '{{entryName}}',

diff --git a/src/index.js b/src/index.js
@@ -13,7 +13,6 @@ import '@playkit-js/playkit-js-hls';
 import '@playkit-js/playkit-js-dash';
 // Import analytics plugin
 import 'playkit-js-analytics';
-import '@playkit-js/playkit-js-kava';
 // Import shaka-player
 import * as shaka from 'shaka-player';
 // Import setup method

diff --git a/src/ott/analytics.js b/src/ott/analytics.js
@@ -0,0 +1,3 @@
+// Import analytics plugin
+import '@playkit-js/playkit-js-ott-analytics';
+import '@playkit-js/playkit-js-kava';
diff --git a/src/ovp/analytics.js b/src/ovp/analytics.js
@@ -0,0 +1,2 @@
+// Import analytics plugin
+import '@playkit-js/playkit-js-kava';
diff --git a/src/ovp/player-defaults.js b/src/ovp/player-defaults.js
@@ -16,15 +16,4 @@ export function setDefaultAnalyticsPlugin(options: KPOptionsObject): void {
       }
     });
   }
-  let kanalyticsPlugin = Utils.Object.getPropertyPath(options, 'plugins.kanalytics');
-  if (!kanalyticsPlugin) {
-    kanalyticsPlugin = Utils.Object.mergeDeep(options, {
-      plugins: {
-        kanalytics: {}
-      }
-    });
-  }
-  if (options.plugins && !kavaPlugin.disable && !kanalyticsPlugin.disable) {
-    Object.assign(options.plugins.kanalytics, {hasKanalony: true});
-  }
 }
diff --git a/webpack.config.ott.js b/webpack.config.ott.js
@@ -35,10 +35,9 @@ if (PROD) {
 const entry = {
   'kaltura-tv-player': 'index.js'
 };
-
 const alias = {
   'playkit-js-providers': path.resolve('./node_modules/playkit-js-providers/dist/playkit-ott-provider'),
-  'playkit-js-analytics': path.resolve('./node_modules/@playkit-js/playkit-js-ott-analytics'),
+  'playkit-js-analytics': path.resolve('./src/ott/analytics'),
   'player-defaults': path.resolve('./src/ott/player-defaults'),
   poster: path.resolve('./src/ott/poster')
 };

diff --git a/webpack.config.ovp.js b/webpack.config.ovp.js
@@ -38,7 +38,7 @@ const entry = {
 
 const alias = {
   'playkit-js-providers': path.resolve('./node_modules/playkit-js-providers/dist/playkit-ovp-provider'),
-  'playkit-js-analytics': path.resolve('./node_modules/@playkit-js/playkit-js-kanalytics'),
+  'playkit-js-analytics': path.resolve('./src/ovp/analytics'),
   'player-defaults': path.resolve('./src/ovp/player-defaults'),
   poster: path.resolve('./src/ovp/poster')
 };

diff --git a/yarn.lock b/yarn.lock
@@ -12,11 +12,6 @@
   resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js-hls/-/playkit-js-hls-1.13.1.tgz#a3a35f41f7fff9d74a3d8f50bb768d8cfc77fc8c"
   integrity sha512-1H+0nYMkrdYYbMewXDFIqMoQBhKOKTeTDOMeys0BakmA28l108wL+EFDj61chYxIphhec/S4Ol+orddcrtp6gA==
 
-"@playkit-js/playkit-js-kanalytics@^0.10.1":
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js-kanalytics/-/playkit-js-kanalytics-0.10.1.tgz#0b62494daaf8b30cd3aa6ae21e8a396df9b8d335"
-  integrity sha512-udnTQwpSoIB5kZPJkxqGV1HfGwbz3U1OkIucNL8ldphYflllxH+0L2OHzQ4VV/b2rs41HZtlVMS29fTEIWxGmQ==
-
 "@playkit-js/playkit-js-kava@^0.7.2":
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js-kava/-/playkit-js-kava-0.7.2.tgz#2e0ad94096dbffc63d12ad2486d4f27950977f20"