@clickview/player 0.0.3-dev.0 → 0.0.3-rc.0

package/.storybook/main.js

@@ -13,7 +13,6 @@ module.exports = {
         rules: custom.module.rules
       },
       resolve: custom.resolve,
-      resolveLoader: custom.resolveLoader,
       plugins: [
         ...config.plugins,
         ...custom.plugins

package/.storybook/stories/Base.stories.tsx

@@ -3,14 +3,13 @@ import { ClickViewPlayer, Player } from '../../src/index';
 import { mockplayerApi } from './utils/mock-playerapi';
 import { mockSetups } from './utils/mock-setup';
 
-const PLAYER_API_STAGING = 'https://player.web.au.stg.cvnet.io';
-
 export default {
   title: 'Base'
 };
 
-export const Default = () => <ClickViewPlayer viewKey='basic' fetch={mockplayerApi} />;
-  
+export const Default = () =>
+  <ClickViewPlayer viewKey='basic' fetch={mockplayerApi} />;
+
 Default.storyName = 'Default';
 
 export const Chapters = () =>
@@ -49,7 +48,7 @@ export const Error = () =>
   <ClickViewPlayer viewKey='error' fetch={mockplayerApi} />;
 
 export const PlayerApi = () =>
-  <ClickViewPlayer viewKey='camwashere' playerApi={new URL(PLAYER_API_STAGING)} />;
+  <ClickViewPlayer viewKey='camwashere' />;
 
 PlayerApi.storyName = 'Player API';
 
@@ -57,7 +56,7 @@ PlayerApi.storyName = 'Player API';
  * This story uses an intentionally invalid viewKey.
  */
 export const PlayerApiError = () =>
-  <ClickViewPlayer viewKey='camwashere_error' playerApi={new URL(PLAYER_API_STAGING)} />;
+  <ClickViewPlayer viewKey='camwashere_error' />;
 
 PlayerApiError.storyName = 'Player API Error';
 

package/.storybook/stories/Interactives.stories.tsx

@@ -1,64 +1,68 @@
 import React from 'react';
+import { ClickViewInteractivePlayer, InteractivePlayer } from '../../src/index';
+import { InteractiveMode } from '../../src/plugins/interactive-plugin/interfaces';
+import { mockplayerApi } from './utils/mock-playerapi';
+
+const IMAGE_API_URL_STAGING = 'https://image.api.stg.cvnet.io';
 
 export default {
   title: 'Interactives'
 };
 
-export const Default = () => <h1>Sorry no interactives</h1>;
-
-Default.storyName = 'Default';
+export const Default = () =>
+  <ClickViewInteractivePlayer viewKey='interactive' fetch={mockplayerApi} />;
 
-// export const Create = () =>
-//   <ClickViewInteractivePlayer
-//     viewKey='interactive'
-//     fetch={mockplayerApi}
-//     mode={InteractiveMode.Create}
-//     imageApi={new URL(IMAGE_API_URL_STAGING)} />;
+export const Create = () =>
+  <ClickViewInteractivePlayer
+    viewKey='basic'
+    fetch={mockplayerApi}
+    mode={InteractiveMode.Create}
+    imageApi={IMAGE_API_URL_STAGING} />;
 
-// export const Annotation = () => {
-//   function onReady(player: InteractivePlayer): void {
-//     player.currentTime(15);
-//   }
+export const Annotation = () => {
+  function onReady(player: InteractivePlayer): void {
+    player.currentTime(15);
+  }
 
-//   return <ClickViewInteractivePlayer onReady={onReady} viewKey='interactive' fetch={mockplayerApi} autoplay={true} />;
-// };
+  return <ClickViewInteractivePlayer onReady={onReady} viewKey='interactive' fetch={mockplayerApi} autoplay={true} />;
+};
 
-// export const ShortAnswer = () => {
-//   function onReady(player: InteractivePlayer): void {
-//     player.currentTime(13);
-//   }
+export const ShortAnswer = () => {
+  function onReady(player: InteractivePlayer): void {
+    player.currentTime(13);
+  }
 
-//   return <ClickViewInteractivePlayer onReady={onReady} viewKey='interactive' fetch={mockplayerApi} autoplay={true} />;
-// };
+  return <ClickViewInteractivePlayer onReady={onReady} viewKey='interactive' fetch={mockplayerApi} autoplay={true} />;
+};
 
-// export const Image = () => {
-//   function onReady(player: InteractivePlayer): void {
-//     player.currentTime(17);
-//   }
+export const Image = () => {
+  function onReady(player: InteractivePlayer): void {
+    player.currentTime(17);
+  }
 
-//   return <ClickViewInteractivePlayer onReady={onReady} viewKey='interactive' fetch={mockplayerApi} autoplay={true} />;
-// };
+  return <ClickViewInteractivePlayer onReady={onReady} viewKey='interactive' fetch={mockplayerApi} autoplay={true} />;
+};
 
-// export const TrueOrFalse = () => {
-//   function onReady(player: InteractivePlayer): void {
-//     player.currentTime(5);
-//   }
+export const TrueOrFalse = () => {
+  function onReady(player: InteractivePlayer): void {
+    player.currentTime(5);
+  }
 
-//   return <ClickViewInteractivePlayer onReady={onReady} viewKey='interactive' fetch={mockplayerApi} autoplay={true} />;
-// };
+  return <ClickViewInteractivePlayer onReady={onReady} viewKey='interactive' fetch={mockplayerApi} autoplay={true} />;
+};
 
-// export const MultipleChoice = () => {
-//   function onReady(player: InteractivePlayer): void {
-//     player.currentTime(7);
-//   }
+export const MultipleChoice = () => {
+  function onReady(player: InteractivePlayer): void {
+    player.currentTime(7);
+  }
 
-//   return <ClickViewInteractivePlayer onReady={onReady} viewKey='interactive' fetch={mockplayerApi} autoplay={true} />;
-// };
+  return <ClickViewInteractivePlayer onReady={onReady} viewKey='interactive' fetch={mockplayerApi} autoplay={true} />;
+};
 
-// export const MissingWord = () => {
-//   function onReady(player: InteractivePlayer): void {
-//     player.currentTime(9);
-//   }
+export const MissingWord = () => {
+  function onReady(player: InteractivePlayer): void {
+    player.currentTime(9);
+  }
 
-//   return <ClickViewInteractivePlayer onReady={onReady} viewKey='interactive' fetch={mockplayerApi} autoplay={true} />;
-// };
+  return <ClickViewInteractivePlayer onReady={onReady} viewKey='interactive' fetch={mockplayerApi} autoplay={true} />;
+};

package/.storybook/stories/utils/mock-playerapi.ts

@@ -163,14 +163,6 @@ const mockResources = <Resources> {
 
 const emptyLocalCacheAddresses = <LocalCacheAddress[]> [];
 
-const mockExtraData = {
-  videoId: '',
-  viewerId: '',
-  viewerCustomerId: '',
-  region: '',
-  mediaId: ''
-}
-
 const sources: { [key: string]: PlaybackObject } = {
   basic: {
     files: basicFiles,
@@ -186,8 +178,7 @@ const sources: { [key: string]: PlaybackObject } = {
       }]
     },
     localCacheAddresses: emptyLocalCacheAddresses,
-    resources: mockResources,
-    ...mockExtraData
+    resources: mockResources
   },
   chapters: {
     files: basicFiles,
@@ -195,8 +186,7 @@ const sources: { [key: string]: PlaybackObject } = {
     chapters: mockChapters,
     subtitles: emptySubtitles,
     localCacheAddresses: emptyLocalCacheAddresses,
-    resources: mockResources,
-    ...mockExtraData
+    resources: mockResources
   },
   vertical: {
     files: {
@@ -210,8 +200,7 @@ const sources: { [key: string]: PlaybackObject } = {
     chapters: mockChapters,
     subtitles: emptySubtitles,
     localCacheAddresses: emptyLocalCacheAddresses,
-    resources: mockResources,
-    ...mockExtraData
+    resources: mockResources
   },
   error: {
     files: {
@@ -227,8 +216,7 @@ const sources: { [key: string]: PlaybackObject } = {
     chapters: emptyChapters,
     subtitles: emptySubtitles,
     localCacheAddresses: emptyLocalCacheAddresses,
-    resources: mockResources,
-    ...mockExtraData
+    resources: mockResources
   },
   multipleQualities: {
     files: multipleFiles,
@@ -236,8 +224,7 @@ const sources: { [key: string]: PlaybackObject } = {
     chapters: emptyChapters,
     subtitles: emptySubtitles,
     localCacheAddresses: emptyLocalCacheAddresses,
-    resources: mockResources,
-    ...mockExtraData
+    resources: mockResources
   },
   poster: {
     files: basicFiles,
@@ -246,8 +233,7 @@ const sources: { [key: string]: PlaybackObject } = {
     posterUrl: 'https://image.api.stg.cvnet.io/v2/thumbnails/Q229lo',
     subtitles: emptySubtitles,
     localCacheAddresses: emptyLocalCacheAddresses,
-    resources: mockResources,
-    ...mockExtraData
+    resources: mockResources
   },
   everything: {
     files: multipleFiles,
@@ -256,8 +242,7 @@ const sources: { [key: string]: PlaybackObject } = {
     posterUrl: 'https://image.api.stg.cvnet.io/v2/thumbnails/Q229lo',
     subtitles: multipleSubtitles,
     localCacheAddresses: emptyLocalCacheAddresses,
-    resources: mockResources,
-    ...mockExtraData
+    resources: mockResources
   },
   multipleSubtitles: {
     files: basicFiles,
@@ -265,8 +250,7 @@ const sources: { [key: string]: PlaybackObject } = {
     chapters: emptyChapters,
     subtitles: multipleSubtitles,
     localCacheAddresses: emptyLocalCacheAddresses,
-    resources: mockResources,
-    ...mockExtraData
+    resources: mockResources
   },
   multipleTracksWithDefault: {
     files: basicFiles,
@@ -292,8 +276,7 @@ const sources: { [key: string]: PlaybackObject } = {
       }]
     },
     localCacheAddresses: emptyLocalCacheAddresses,
-    resources: mockResources,
-    ...mockExtraData
+    resources: mockResources
   },
   interactive: {
     files: basicFiles,
@@ -302,8 +285,7 @@ const sources: { [key: string]: PlaybackObject } = {
     additionalData: interactive,
     subtitles: emptySubtitles,
     localCacheAddresses: emptyLocalCacheAddresses,
-    resources: mockResources,
-    ...mockExtraData
+    resources: mockResources
   },
   clip: {
     files: basicFiles,
@@ -315,8 +297,7 @@ const sources: { [key: string]: PlaybackObject } = {
     },
     subtitles: emptySubtitles,
     localCacheAddresses: emptyLocalCacheAddresses,
-    resources: mockResources,
-    ...mockExtraData
+    resources: mockResources
   },
   localcache: {
     files: multipleFiles,
@@ -328,8 +309,7 @@ const sources: { [key: string]: PlaybackObject } = {
       name: 'test',
       playbackProfile: '1080'
     }],
-    resources: mockResources,
-    ...mockExtraData
+    resources: mockResources
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clickview/player",
-  "version": "0.0.3-dev.0",
+  "version": "0.0.3-rc.0",
   "description": "ClickView Player",
   "main": "dist/player-app.js",
   "scripts": {
@@ -27,12 +27,11 @@
   "devDependencies": {
     "@babel/core": "7.11.6",
     "@clickview/eslint-config": "1.0.0",
-    "@clickview/player-font": "0.0.8",
-    "@clickview/tooling": "0.0.22-dev.0",
+    "@clickview/player-font": "0.0.6",
+    "@clickview/tooling": "0.0.22-rc.0",
     "@storybook/react": "6.0.26",
     "@types/cropperjs": "1.3.0",
     "@types/draft-js": "0.10.44",
-    "@types/node-polyglot": "0.4.34",
     "@types/react-draft-wysiwyg": "1.13.1",
     "@types/simplebar": "5.1.1",
     "@types/video.js": "7.3.11",
@@ -41,13 +40,12 @@
     "webpack-dev-server": "3.11.0"
   },
   "dependencies": {
-    "@clickview/styles": "1.0.15-dev.0",
+    "@clickview/styles": "1.0.15-rc.0",
     "@microsoft/signalr": "5.0.2",
     "cropperjs": "1.5.6",
     "draft-convert": "2.1.10",
     "draft-js": "0.11.7",
     "keycode": "2.2.0",
-    "node-polyglot": "2.3.0",
     "react-draft-wysiwyg": "1.14.5",
     "simplebar": "5.3.0",
     "simplebar-react": "2.3.0",

package/typings/utils/imports.d.ts

@@ -6,7 +6,7 @@
 declare module '*.scss';
 declare module '*.svg';
 
-declare module '*.json' {
+declare module "*.json" {
   export const value: any;
   export default value;
 }