entcore 3.12.1 → 3.12.5

package/docker-compose.yml

@@ -7,7 +7,7 @@ gradle:
     - ~/.gradle:/home/gradle/.gradle
 
 node:
-  image: opendigitaleducation/node
+  image: opendigitaleducation/node:10-alpine
   working_dir: /home/node/app
   volumes:
     - ./:/home/node/app

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "entcore",
-  "version": "3.12.1",
+  "version": "3.12.5",
   "description": "",
   "main": "gulpfile.js",
   "types": "./types/src/ts/entcore.d.ts",

package/src/template/cgu-lightbox.html

@@ -10,9 +10,6 @@
                     <p class="">
                         <span class="no-style">[[content]]</span>
                     </p>
-                    <!--a href="[[linkUrl]]" target="_blank" style="display: inline">
-                        <span class="no-style ng-scope">[[linkText]]</span>
-                    </a-->
                     <p>
                         <input type="checkbox" ng-model="model.accept">&nbsp;&nbsp;
                         <i18n>cgu.revalidate.accept</i18n>

package/src/template/media-library/main.html

@@ -25,7 +25,7 @@
 	<h2>[[title()]]</h2>
 	<section class="row media-library">
 		<section class="twelve row">
-			<div class="tabs heading-tabs" style="overflow: hidden">
+			<div class="tabs heading-tabs">
 				<header ng-repeat="header in headers()" ng-class="{'selected':isSelectedHeader(header)}" ng-click="showHeader(header)" workflow="[[header.worflowKey]]" ng-show="header.visible()">
 					<span translate content="[[header.i18Key]]"></span>
 				</header>

package/src/template/recorder.html

@@ -43,7 +43,8 @@
 				ng-click="switchRecord()"
 				ng-disabled="isEncoding() || isUploading()">
 			<i class="record-audio" ng-class="{'start': !isRecording(), 'suspend': isRecording()}"></i>
-			<span ng-if="isSuspended()"><i18n>embed.resume</i18n></span>
+			<span ng-if="isIdle() || isStopped()"><i18n>embed.start.mini</i18n></span>
+			<span ng-if="!isIdle() && !isStopped() && !isRecording()"><i18n>embed.resume</i18n></span>
 			<span ng-if="isRecording()"><i18n>embed.suspend</i18n></span>
 		</button>
 

package/src/template/video/integration.html

@@ -1,6 +1,5 @@
 <div class="provider cell pick" ng-class="{ visible: display.provider.name === 'none' }">
     <div class="provider-content">
-        <h2><i18n>editor.option.embed</i18n></h2>
         <div class="supported-providers">
 
             <div class="info twelve cell">

package/src/template/video/loading.html

@@ -1 +1,56 @@
-<div>Loading template works!</div>
+<div class="split-screen" ng-class="{ split: display.editedDocument !== undefined }">
+    <div class="loading-list drop-zone">
+        <ul>
+            <li ng-repeat="doc in upload.documents"
+                ng-click="openCompression(doc)"
+                ng-class="{
+                    'image-file': doc.isEditableImage && doc.uploadStatus === 'loaded',
+                    'loading': doc.uploadStatus === 'loading',
+                    selected: doc === display.editedDocument
+                }"                
+            >
+                <div class="icon">
+                    <i class="[[doc.role()]]"></i>
+                    <i tooltip-check="doc.isEditableImage && doc.uploadStatus === 'loaded'"
+                    tooltip="medialibrary.editImage.tooltip" class="edit" ng-if="doc.isEditableImage && doc.uploadStatus === 'loaded'"></i>
+                </div>
+                <div class="title">[[doc.name || doc.title]]</div>
+                <div class="status-infos">
+                    <span class="small-text horizontal-margin">
+                        [[doc.size]]
+                    </span>
+                    <i ng-class="{
+                        loading: doc.uploadStatus === 'loading',
+                        loaded: doc.uploadStatus === 'loaded',
+                        failed: doc.uploadStatus === 'failed'
+                    }"></i>
+                </div>
+                <i class="close" ng-click="abortOrDelete(doc)"></i>
+            </li>
+        </ul>
+    </div>
+</div>
+<div class="row zero-mobile">
+    <div class="one cell">&nbsp;<!-- Marge d'Alizée, voir #44014 --></div>
+
+    <div class="five cell">
+        <em class="small-text"><i18n>video.upload.supported.formats</i18n></em>
+        <br>
+        <em class="small-text"><i18n>video.upload.supported.weight</i18n></em>
+    </div>
+    <div class="six cell">
+        <button class="right-magnet" ng-click="confirmImport()" ng-disabled="!canConfirmImport()" type="button"><i18n>import</i18n></button>
+        <button class="right-magnet cancel" ng-click="cancelUpload()" type="button"><i18n>cancel</i18n></button>
+    </div>
+</div>
+<div class="twelve row zero-desktop">
+    <p>
+        <em class="small-text"><i18n>video.upload.supported.formats</i18n></em>
+        <br>
+        <em class="small-text"><i18n>video.upload.supported.weight</i18n></em>
+    </p>
+    <div class="twelve cell">
+        <button class="right-magnet" ng-click="confirmImport()" ng-disabled="!canConfirmImport()" type="button"><i18n>import</i18n></button>
+        <button class="right-magnet cancel" ng-click="cancelUpload()" type="button"><i18n>cancel</i18n></button>
+    </div>
+</div>

package/src/template/video/main.html

@@ -18,7 +18,7 @@
  ~
  -->
 
-<lightbox show="show" on-close="cancel();" navigation-guard="true">
+<lightbox show="show" on-close="cancel();" navigation-guard="true" guard-root="videoCapturedGuard">
 		<style>
 			header > span.beta-feature:after {
 				color: #FF8500;
@@ -32,8 +32,13 @@
     <div class="embed-container">
         <h2>[[title()]]</h2>
         <section class="twelve row">
-            <section class="tabs heading-tabs" style="overflow: hidden">
-                <header ng-repeat="header in headers()" ng-class="{'selected':isSelectedHeader(header)}" navigation-trigger="showHeader(header)" workflow="[[header.worflowKey]]" ng-show="header.visible()">
+            <section class="tabs heading-tabs">
+                <header workflow="[[header.worflowKey]]"
+                        navigation-trigger="showHeader(header)" 
+                        navigation-trigger-param="{onEvent:'click', guardMessageKey:'video.capture.guard.text', rootGuardId:'videoCapturedGuard'}"
+                        ng-repeat="header in headers()" 
+                        ng-class="{'selected':isSelectedHeader(header)}"
+                        ng-show="header.visible()">
                     <span translate content="[[header.i18Key]]" ng-class="getClassOf(header)"></span>
                 </header>
             </section>

package/src/template/video/record.html

@@ -1,4 +1,4 @@
-<div ng-controller="VideoController" class="video" guard-root custom-guard="guard">
+<div ng-controller="VideoController" class="video" custom-guard="guard">
     <div class="recorder--video">
         <div ng-if="isIncompatible() && !isIncompatibleDevice()" class="browser" style="box-shadow:none">
             <h3><i18n>embed.video.incompatible</i18n></h3>
@@ -64,7 +64,7 @@
                 <p><i18n>video.msg</i18n></p>
                 <div class="recorder--timer">
                     <i class="rec" ng-if="isRecording()"></i>
-                    <span>[[recordTime]] / [[pad(RECORD_MAX_TIME)]]:00</span>
+                    <span>[[recordTime]] / [[pad(recordMaxTime)]]:00</span>
                 </div>
             </div>
             <div class="recorder--viewer" ng-show="isCameraVisible()">

package/src/template/video/upload.html

@@ -1 +1,47 @@
-<div>Upload template works!</div>
+<!--
+ ~	Copyright © WebServices pour l'Éducation, 2014
+ ~
+ ~ This file is part of ENT Core. ENT Core is a versatile ENT engine based on the JVM.
+ ~
+ ~ This program is free software; you can redistribute it and/or modify
+ ~ it under the terms of the GNU Affero General Public License as
+ ~ published by the Free Software Foundation (version 3 of the License).
+ ~
+ ~ For the sake of explanation, any module that communicate over native
+ ~ Web protocols, such as HTTP, with ENT Core is outside the scope of this
+ ~ license and could be license under its own terms. This is merely considered
+ ~ normal use of ENT Core, and does not fall under the heading of "covered work".
+ ~
+ ~ This program is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ ~
+ -->
+
+<p>
+	<em class="twelve cell small-text"><i18n>video.upload.supported.formats</i18n></em>
+	<em class="twelve cell small-text"><i18n>video.upload.supported.weight</i18n></em>
+</p>
+<div class="row media-library">
+	<div class="drop-zone import-files">
+		<article class="drop flex-row align-center">
+				<i class="two cloud-upload"></i>
+				<div class="ten help">
+					<em><i18n>video.drop.help2</i18n></em>
+				</div>
+		</article>
+		<article class="default flex-row align-center absolute-position">
+			<div class="three select-file">
+				<div class="hidden-content">
+					<input class="upload-input" type="file" files-input-change="importFiles()" ng-model="upload.files" />
+				</div>
+				<button class="file-button no-margin" translate content="library.file.choose" ng-click="triggerIpnutFileClick($event)"></button>
+			</div>
+			<i class="two cloud-upload"></i>
+			<div class="seven help">
+				<em><i18n>video.drop.help</i18n></em>
+			</div>
+		</article>
+
+	</div>
+</div>

package/types/src/ts/directives/navigationGuard.d.ts

@@ -7,4 +7,18 @@ export declare const inputGuardDirective: Directive;
 export declare const dirtyGuardDirective: Directive;
 export declare const documentGuardDirective: Directive;
 export declare const customGuardDirective: Directive;
+/**
+ * Usage:
+ *
+ * <div  navigation-trigger="doSomethingUsefulWhenNavigationConfirmed()"
+ *
+ *   navigation-trigger-param="{onEvent:['click','focus'], confirmMessageKey:'my.msg.key', rootGuardId:'myGuardId'}">
+ *
+ * </div>
+ *
+ * @param navigation-trigger-param [optional]
+ * @values onEvent to specify one or more event that effectively trigger the guard,
+ * Set confirmMessageKey to set a i18n for the confirm dialog message,
+ * Set rootGuardId to trigger only the guard with specified the ID (useful when nesting guards).
+ */
 export declare const navigationTrigger: Directive;

package/types/src/ts/navigationGuard.d.ts

@@ -3,6 +3,8 @@ import { LightboxDelegate } from "./directives";
 export interface INavigationInfo {
     accept(): void;
     reject(): void;
+    confirmMessageKey?: string;
+    checkGuardId?: string | "*";
 }
 export interface INavigationListener {
     onChange: Subject<INavigationInfo>;

package/types/src/ts/notify.d.ts

@@ -3,4 +3,5 @@ export declare var notify: {
     error: (message: any, timeout?: any) => void;
     info: (message: any, timeout?: any) => void;
     success: (message: any, timeout?: any) => void;
+    close: () => void;
 };

package/types/src/ts/video/VideoEventTrackerService.d.ts

@@ -0,0 +1,27 @@
+/**
+ * This utility class allows sending usage data events to the server.
+ */
+export declare class VideoEventTrackerService {
+    videos: any[];
+    /**
+     * Generates a new FormData containing generic video tracking metadata :
+     * - device,
+     * - browser,
+     * - url,
+     * - app
+     * @returns FormData
+     */
+    static asFormData(): FormData;
+    /** Send a VIDEO_VIEW or VIDEO_PLAY event to the server. */
+    private generateEvent(type, videoId, source);
+    private onPlay(event);
+    private generateViewEventFor(video);
+    /**
+     * Look for every <video> tag in the HTML document, and the VIDEO_VIEW and VIDEO_PLAY events.
+     * If applied to an angular scope, it will auto-release the listeners and prevent memory leaks.
+     * Otherwise, you must call untrackAll() to release the listeners.
+     */
+    trackAll($scope: any): void;
+    /** Release event listeners previously put on <video> tags, @see trackAll() */
+    untrackAll(): void;
+}

package/types/src/ts/video/VideoRecorder.d.ts

@@ -7,7 +7,6 @@ export declare class VideoRecorder {
     private mediaRecorder;
     private recordMimeType;
     private recorded;
-    private id;
     private mode;
     constraints: MediaStreamConstraints;
     onPlayChanged: Subject<Event>;
@@ -23,7 +22,7 @@ export declare class VideoRecorder {
     private prepareRecord();
     stopStreaming(): void;
     startStreaming(notAllowedCb?: () => void): Promise<void>;
-    private uuid();
+    generateVideoId(): string;
     resume(): void;
     canStartRecording(callback: any): Promise<void>;
     startRecording(): Promise<void>;
@@ -31,5 +30,4 @@ export declare class VideoRecorder {
     stopRecording(preparePlay: boolean): void;
     getBuffer(): Blob;
     clearBuffer(prepareRecord: boolean): void;
-    upload(filename: any, recordTime: any, callback: any, errCallback: any): Promise<void>;
 }

package/types/src/ts/video/VideoUploadService.d.ts

@@ -0,0 +1,36 @@
+export declare type UploadResult = {
+    data: {
+        processid: string;
+        state: "running" | "succeed" | "error";
+        /** ID of the video file. */
+        videoid?: string;
+        /** size of the video, in bytes. */
+        videosize: number;
+        /** ID of the video document in Workspace. */
+        videoworkspaceid: string;
+        /** Error code (i18n key), when state==="error" */
+        code?: string;
+    };
+    status: number;
+    statusText: string;
+    headers: any;
+};
+/**
+ * This utility class allows uploading videos to the server, as documents.
+ * Each video can be either recorded (Blob) or chosen from the local storage (File).
+ * The server will process each uploaded video and convert them to a streamable format.
+ */
+export declare class VideoUploadService {
+    private _maxWeight;
+    private _maxDuration;
+    private _acceptVideoUploadExtensions;
+    private _initialized;
+    readonly maxWeight: number;
+    readonly maxDuration: number;
+    private safeValueOf(obj, key, defaultValue);
+    /** Awaits for loading the video public configuration. */
+    initialize(): Promise<void>;
+    getValidExtensions(): string[];
+    checkValidExtension(ext: string): boolean;
+    upload(file: Blob, filename: string, captation: boolean, duration?: string | number): Promise<UploadResult>;
+}

package/.npmignore

@@ -1,7 +0,0 @@
-**/*.ts
-!*.d.ts
-*.ts
-!*.d.ts
-tsconfig.json
-.idea
-coverage