Skip to content

Commit

Permalink
fix(FEC-11864): kava reports player version instead of product version (
Browse files Browse the repository at this point in the history
#514)

**the issue:**
kava reports player version (i.e: 1.7.1) instead of product version (i.e: 7.43.1).
the productVersion is being taken from options obj, however, productVersion is no longer part of options - regression from FEC-11498

**the solution:**
taking productVersion from window.__kalturaplayerdata instead.

Solves FEC-11864
  • Loading branch information
lianbenjamin authored Jan 12, 2022
1 parent 22af35a commit b81f88b
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 16 deletions.
3 changes: 2 additions & 1 deletion src/common/plugins/plugins-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {PluginConfigStore, templateRegex} from './plugins-config-store.js';
import evaluate from '../utils/evaluate';
import {getReferrer} from '../utils/kaltura-params';
import {Utils} from '@playkit-js/playkit-js';
import {getServerUIConf} from '../utils/setup-helpers';

/**
* returns whether value is evaluated
Expand Down Expand Up @@ -44,7 +45,7 @@ const removeUnevaluatedExpression = (obj: Object = {}): Object =>
*/
const getModel = (options: KPOptionsObject): Object => {
const dataModel: Object = {
pVersion: options.productVersion ? options.productVersion : __VERSION__,
pVersion: getServerUIConf()?.productVersion || __VERSION__,
pName: __NAME__
};
if (options.targetId) {
Expand Down
47 changes: 32 additions & 15 deletions test/src/common/plugin/plugins-config.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,24 @@ import {ConfigEvaluator, getEncodedReferrer} from '../../../../src/common/plugin
let sandbox = sinon.createSandbox();

describe('evaluatePluginsConfig', function () {
const playerConfig = {
targetId: 'myTargetId',
provider: {
partnerId: '1234'
}
};
const pluginsConfig = {
kava: {
myHandler: function () {},
myUnevaluatedConfig: '{{abc}}',
myArray: [1, 'value', 0, true, '{{value}}', false]
}
};

const configEvaluator = new ConfigEvaluator();
let playerConfig, pluginsConfig, configEvaluator;
beforeEach(function () {
playerConfig = {
targetId: 'myTargetId',
provider: {
partnerId: '1234'
}
};
pluginsConfig = {
kava: {
myHandler: function () {},
myUnevaluatedConfig: '{{abc}}',
myArray: [1, 'value', 0, true, '{{value}}', false]
}
};

configEvaluator = new ConfigEvaluator();
});

it('should save the function after evaluatePluginsConfig called', function () {
configEvaluator.evaluatePluginsConfig(pluginsConfig, playerConfig);
Expand All @@ -40,6 +43,20 @@ describe('evaluatePluginsConfig', function () {
configEvaluator.evaluatePluginsConfig(pluginsConfig, playerConfig);
pluginsConfig.kava.myArray.should.deep.equal([1, 'value', 0, true, false]);
});

it('should set playerVersion as productVersion from server', function () {
window.__kalturaplayerdata = {productVersion: '7.43.1'};
configEvaluator.evaluatePluginsConfig(pluginsConfig, playerConfig);
pluginsConfig.kava.should.have.property('playerVersion');
pluginsConfig.kava.playerVersion.should.equal('7.43.1');
});

it('should set playerVersion as playerVersion', function () {
window.__kalturaplayerdata = {};
configEvaluator.evaluatePluginsConfig(pluginsConfig, playerConfig);
pluginsConfig.kava.should.have.property('playerVersion');
pluginsConfig.kava.playerVersion.should.equal(__VERSION__);
});
});

describe('getEncodedReferrer', function () {
Expand Down

0 comments on commit b81f88b

Please sign in to comment.