entcore 4.6.0-dev.0 → 4.6.0-dev.202210281154

package/{src → dist}/template/media-library/browse.html

@@ -31,13 +31,24 @@
 <div class="row reduce-block-four search-image">
 	<input type="search" ng-model="display.search" i18n-placeholder="search" ng-change="updateSearch()" class="six cell" />
 	<div class="cell six">
-		<button type="button" class="right-magnet" ng-disabled="display.loading || selectedDocuments().length === 0" ng-click="selectDocuments()">
+		<!-- default nav -->
+		<button ng-if="display.listFrom" type="button" class="right-magnet" ng-disabled="display.loading || selectedDocuments().length === 0" ng-click="selectDocuments()">
 			<i18n>library.browse.add</i18n>
 		</button>
+
+		<!-- virtual document add button -->
+		<virtual-media-library-button
+				ng-if="!display.listFrom"
+				documents="documents"
+				folders="folders"
+				selected-virtual-folder="selectedVirtualFolder"
+				on-click="selectDocuments()">
+		</virtual-media-library-button>
 	</div>
 </div>
 
 <div class="row browse">
+	<!-- nav folder -->
 	<nav class="four cell vertical zero-mobile">
 		<ul class="height-minus300">
 			<li workflow="workspace.create">
@@ -75,22 +86,38 @@
 					<i18n>workspace.publicDocuments</i18n>
 				</a>
 			</li>
+
+			<!-- virtual folder -->
+			<virtual-media-library
+					selected-virtual-folder="selectedVirtualFolder"
+					on-click="resetRegularDisplay()">
+			</virtual-media-library>
 		</ul>
 	</nav>
 
-		<!--VIEW MODE-->
-		<div class="cell right-magnet">
-			<div class="choice-view">
-				<i class="show-icons" ng-class="{ selected: isViewMode('icons') }" ng-click="changeViewMode('icons')"></i>
-				<i class="show-list" ng-class="{ selected: isViewMode('list') }" ng-click="changeViewMode('list')"></i>
-			</div>
+	<!--VIEW MODE-->
+	<div ng-if="display.listFrom" class="cell right-magnet">
+		<div class="choice-view">
+			<i class="show-icons" ng-class="{ selected: isViewMode('icons') }" ng-click="changeViewMode('icons')"></i>
+			<i class="show-list" ng-class="{ selected: isViewMode('list') }" ng-click="changeViewMode('list')"></i>
 		</div>
+	</div>
 
-	<div class="cell eight height-five twelve-mobile browse-list height-minus300 overflowx-hd" on-bottom-scroll="documentList.increment()">
+	<!-- documents view by icons or list -->
+	<div ng-if="display.listFrom" class="cell eight height-five twelve-mobile browse-list height-minus300 overflowx-hd" on-bottom-scroll="documentList.increment()">
 		<div class="reduce-block-eight" ng-if="!documents.length && !folders.length" style="text-align: center; margin-top: 40px">
 			<i18n>library.browse.notfound</i18n>
 		</div>
 		<container ng-hide="!documents.length && !folders.length" template="documents-view" guard-ignore-template></container>
 	</div>
+
+	<!-- virtual folder document view -->
+	<virtual-media-library-document-view class="cell eight height-five twelve-mobile browse-list height-minus300 overflowx-hd"
+										 ng-if="!display.listFrom"
+										 search="display.search"
+										 selected-virtual-folder="selectedVirtualFolder">
+	</virtual-media-library-document-view>
+
+
 </div>
 <div class="row"></div>

package/dist/template/media-library/record.html

@@ -0,0 +1 @@
+<recorder ng-model="record" on-upload="insertRecord" protected></recorder>

package/dist/template/media-library/virtual-media-library/virtual-media-content.html

@@ -0,0 +1,56 @@
+<div class="icons-view" style="overflow: auto" ng-if="vm.selectedVirtualFolder">
+
+    <!--  empty state message -->
+    <div class="reduce-block-eight" ng-if="!vm.folders.length && !vm.documents.length" style="text-align: center; margin-top: 40px">
+        <i18n>library.browse.notfound</i18n>
+    </div>
+
+    <!-- folder part area -->
+    <div class="element reduce-block-six" ng-repeat="folder in vm.folders | orderBy: orderFieldFolder">
+        <explorer ng-model="folder.selected" on-open="vm.mediaServiceLibrary.openedTree.openFolder(folder)">
+            <div class="img container">
+                <i class="folder-large"></i>
+            </div>
+            <legend>
+                <a class="medium-text">[[folder.name]]</a>
+            </legend>
+        </explorer>
+    </div>
+
+    <!-- documents part area -->
+    <div class="element reduce-block-six" ng-repeat="document in vm.documents">
+        <explorer ng-model="document.selected"
+                  ng-click="vm.updateSelection(document)" on-open="selectDocument(document)"
+                  ng-switch="vm.getRole(document)">
+
+            <!-- img content -->
+            <div class="img container" ng-switch-when="img">
+                <div class="clip">
+                    <img image-lazy-load="vm.getThumbUrl(document)"/>
+                    <div class="absolute" ng-if="display.loading && display.loading.indexOf(document) !== -1">
+                        <img skin-src="/img/illustrations/loading.gif" />
+                    </div>
+                </div>
+            </div>
+
+            <!-- container video -->
+            <div class="img container video" ng-switch-when="video"
+                 ng-style="{'background-image': videoThumbUrl(document)}">
+                <svg class="icon-video" width="48" height="48">
+                    <use xlink:href="/workspace/public/img/illustrations.svg#icon-play"></use>
+                </svg>
+            </div>
+
+            <!-- default file -->
+            <div class="img container" ng-switch-default>
+                <i class="[[vm.getRole(document)]]-large"></i>
+            </div>
+
+            <!-- legend content -->
+            <legend>
+                <a class="medium-text">[[document.name]]</a>
+                <a><strong class="small-text">[[document.ownerName]]</strong></a>
+            </legend>
+        </explorer>
+    </div>
+</div>

package/dist/template/media-library/virtual-media-library/virtual-media-folder.html

@@ -0,0 +1,7 @@
+<nav class="vertical mobile-navigation" ng-if="vm.folderServiceTree.trees.length > 0">
+     <ul style="border-left: none;">
+         <li data-ng-repeat="folder in vm.folderServiceTree.trees">
+             <folder-tree-inner folder="folder" tree-props="vm.folderServiceTree"></folder-tree-inner>
+         </li>
+     </ul>
+ </nav>

package/gulpfile.js

@@ -12,25 +12,28 @@ if (argv.springboard) {
     springboardPath = argv.springboard;
     console.log('Using springboard at ' + springboardPath);
 }
-gulp.task('clean:types', function (cb) {
+
+function cleanTypes(cb) {
     rimraf('./types/src', cb);
-});
-gulp.task("do-build", ["clean:types"], function () {
+}
+
+function doBuild() {
     return gulp.src('./')
         .pipe(webpack(require('./webpack.config.js')))
         .on('error', function handleError() {
             this.emit('end');
         })
         .pipe(gulp.dest('./'));
-});
-gulp.task("build", ["do-build"], function () {
+}
+
+function build() {
     return gulp.src('./bundle/ng-app.js')
     .pipe(gap.prependText('window.springboardBuildDate="'+new Date().toISOString()+'";\n'))
     .pipe(gap.prependText('window.infrafrontVersion="'+pjson.version+'";\n'))
     .pipe(gulp.dest("./bundle/"));
-});
+}
 
-gulp.task("build-dev", ["clean:types"], () => {
+function buildDev() {
     webpack.plugins = [];
     return gulp.src('./')
         .pipe(webpack(require('./webpack-dev.config.js')))
@@ -38,11 +41,10 @@ gulp.task("build-dev", ["clean:types"], () => {
             this.emit('end');
         })
         .pipe(gulp.dest('./'));
-});
+}
 
-gulp.task('update', ['build-dev'], () => {
+function update(cb) {
     GlobManager.js().then(f => {
-        //console.log("founded js: ",f.length,f.join(","))
         f.forEach((file) => {
             const split = file.split('/');
             const fileName = split[split.length - 1];
@@ -61,25 +63,42 @@ gulp.task('update', ['build-dev'], () => {
                 .pipe(gulp.dest(split.slice(0, split.length - 1).join('/')));
         });
     });
-})
+    cb();
+}
 
-gulp.task("watch", ["clean:types"], () => {
-    gulp.watch('**/*.ts', () => gulp.start('update'));
-    gulp.watch('**/*.html', () => {
-        const apps = [];
-        GlobManager.html().then(f => {
-            f.forEach((file) => {
-                const app = file.split('/public/template/entcore')[0];
-                if (apps.indexOf(app) === -1) {
-                    apps.push(app);
-                    console.log('copy to ' + app + '/public/template/entcore')
-                    gulp.src('./src/template/**/*')
-                        .pipe(gulp.dest(app + '/public/template/entcore'));
-                }
-            });
-        })
-    });
-});
+function copyHtml(cb) {
+    const apps = [];
+    GlobManager.html().then(f => {
+        f.forEach((file) => {
+            const app = file.split('/public/template/entcore')[0];
+            if (apps.indexOf(app) === -1) {
+                apps.push(app);
+                console.log('copy to ' + app + '/public/template/entcore')
+                gulp.src('./src/template/**/*')
+                    .pipe(gulp.dest(app + '/public/template/entcore'));
+            }
+        });
+    })
+    cb();
+}
+
+gulp.task('clean:types', cleanTypes);
+gulp.task("do-build", doBuild);
+gulp.task("build", build);
+gulp.task("build-dev", buildDev);
+gulp.task('update', update);
+gulp.task('copy-html', copyHtml);
+
+function watchTs() {
+    return gulp.watch('./src/ts/**/*.ts', gulp.series('clean:types','build-dev','update'));
+}
+
+function watchHtml() {
+    return gulp.watch('./src/template/**/*.html', gulp.series('clean:types', 'copy-html'));
+}
+
+gulp.task('watch-ts', watchTs);
+gulp.task('watch-html', watchHtml);
 
 const GlobManager = {
     _js: null,
@@ -116,3 +135,7 @@ const GlobManager = {
         return GlobManager._html;
     }
 }
+
+// Exports Tasks
+exports.watch = gulp.parallel('watch-ts', 'watch-html');
+exports.build = gulp.series('clean:types','do-build', 'build');

package/package.json

@@ -1,7 +1,24 @@
 {
   "name": "entcore",
-  "version": "4.6.0-dev.0",
+  "version": "4.6.0-dev.202210281154",
   "description": "",
+  "scripts": {
+    "dev:watch": "npx gulp watch --springboard=../${SPRINGBOARD} 2>/dev/null",
+    "release:build": "node_modules/gulp/bin/gulp.js build ${EXTRAS}",
+    "test": "karma start",
+    "test:compatibility": "karma start karma-compatibility.conf.js",
+    "test:end-to-end": "npx wdio"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/opendigitaleducation/infra-front.git"
+  },
+  "author": "",
+  "license": "AGPL-3.0",
+  "bugs": {
+    "url": "https://github.com/opendigitaleducation/infra-front/issues"
+  },
+  "homepage": "https://github.com/opendigitaleducation/infra-front",
   "main": "gulpfile.js",
   "types": "./types/src/ts/entcore.d.ts",
   "dependencies": {
@@ -14,9 +31,9 @@
     "conventional-changelog": "3.0.6",
     "core-js": "^2.4.1",
     "entcore-toolkit": "^1.0.0",
-    "gulp": "^3.9.1",
-    "gulp-rename": "^1.2.2",
-    "gulp-watch": "^4.3.5",
+    "gulp": "^4.0.2",
+    "gulp-rename": "^2.0.0",
+    "gulp-watch": "^5.0.1",
     "humane-js": "^3.2.2",
     "jquery": "^3.5.1",
     "meow": "8.0.0",
@@ -35,12 +52,16 @@
     "webpack-stream": "^3.2.0"
   },
   "devDependencies": {
-    "@types/ua-parser-js": "^0.7.35",
+    "@types/angular": "1.7.4",
     "@types/core-js": "0.9.46",
     "@types/jasmine": "2.8.8",
     "@types/jquery": "^3.3.32",
     "@types/pixi.js": "4.5.7",
+    "@types/ua-parser-js": "^0.7.35",
     "@types/webdriverio": "4.13.0",
+    "@wdio/browserstack-service": "^7.20.7",
+    "@wdio/jasmine-framework": "^7.20.7",
+    "@wdio/selenium-standalone-service": "^7.20.7",
     "angular-mocks": "1.3.20",
     "gulp-append-prepend": "^1.0.6",
     "jasmine": "2.8.0",
@@ -53,24 +74,7 @@
     "mathjax": "2.7.5",
     "rimraf": "2.6.2",
     "ts-node": "7.0.1",
-    "wdio-browserstack-service": "0.1.18",
-    "wdio-jasmine-framework": "0.3.8",
-    "wdio-selenium-standalone-service": "0.0.11",
-    "webdriverio": "4.14.1"
-  },
-  "scripts": {
-    "test": "karma start",
-    "test:compatibility": "karma start karma-compatibility.conf.js",
-    "test:end-to-end": "npx wdio"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/opendigitaleducation/infra-front.git"
-  },
-  "author": "",
-  "license": "AGPL-3.0",
-  "bugs": {
-    "url": "https://github.com/opendigitaleducation/infra-front/issues"
+    "webdriverio": "7.20.7"
   },
-  "homepage": "https://github.com/opendigitaleducation/infra-front"
+  "files": ["bundle", "types", "dist"]
 }

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

@@ -65,3 +65,4 @@ export * from "./libraryPrompt";
 export * from "./dragndrop";
 export * from "./structureTree";
 export * from "./toast";
+export * from "./virtual-folder";

package/types/src/ts/directives/virtual-folder/index.d.ts

@@ -0,0 +1,4 @@
+export * from "./virtual-media-library-document-view.directive";
+export * from "./virtual-media-library.directive";
+export * from "./virtual-media-library-button.directive";
+export * from "./virtual-media-library.model";

package/types/src/ts/directives/virtual-folder/virtual-media-library-button.directive.d.ts

@@ -0,0 +1,2 @@
+import { Directive } from "../../ng-start";
+export declare const virtualMediaLibraryButton: Directive;

package/types/src/ts/directives/virtual-folder/virtual-media-library-document-view.directive.d.ts

@@ -0,0 +1,2 @@
+import { Directive } from "../../ng-start";
+export declare const virtualMediaLibraryDocumentView: Directive;

package/types/src/ts/directives/virtual-folder/virtual-media-library.directive.d.ts

@@ -0,0 +1,2 @@
+import { Directive } from "../../ng-start";
+export declare const virtualMediaLibrary: Directive;

package/types/src/ts/entcore.d.ts

@@ -22,7 +22,9 @@ export * from './toasts';
 export * from "./embedder";
 export * from "./stringutils/index";
 export * from "./tracking";
+export * from "./video";
 export { Embedder } from "./embedder";
 export { DatepickerDelegate } from "./ng-app";
 export { FolderTreeProps } from "./directives/folderTree";
+export { IVirtualMediaLibraryScope } from "./directives/virtual-folder";
 export { FolderPickerProps, FolderPickerSource, FolderPickerSourceBlob, FolderPickerSourceFile } from "./directives/folderPicker";

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

@@ -0,0 +1,6 @@
+import { IObjectGuardDelegate } from "../navigationGuard";
+export declare class VideoRecordGuardModel implements IObjectGuardDelegate {
+    hasRecorded: boolean;
+    guardObjectIsDirty(): boolean;
+    guardObjectReset(): void;
+}

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

@@ -0,0 +1,4 @@
+export * from './VideoController';
+export * from './VideoEventTrackerService';
+export * from './VideoRecorder';
+export * from './VideoUploadService';