entcore 4.6.0-dev.1 → 4.6.0-dev.202211041719

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.1",
+  "version": "4.6.0-dev.202211041719",
   "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",
@@ -36,12 +53,15 @@
   },
   "devDependencies": {
     "@types/angular": "1.7.4",
-    "@types/ua-parser-js": "^0.7.35",
     "@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",
@@ -54,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/entcore.d.ts

@@ -22,6 +22,7 @@ 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";

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';

package/CHANGELOG.md

@@ -1,185 +0,0 @@
-
-# [3.5.0](https://github.com/opendigitaleducation/infra-front/compare/3.4.3...3.5.0) (2019-04-29)
-
-
-### Bug Fixes
-
-* Directory:
-    * fix performance issue when retrieving filtered classes
-* Workspace:
-    * enable downloading trashed documents
-
-
-### Features
-
-* enable forcing a user to revalidate terms and conditions
-
-
-## [3.4.3](https://github.com/opendigitaleducation/infra-front/compare/3.4.2...3.4.3) (2019-04-16)
-
-
-### Bug Fixes
-
-* Smart banner:
-    * enable i18n for smart banner and overrides per theme. Also adds profile exclusion per theme.
-
-
-## [3.4.2](https://github.com/opendigitaleducation/infra-front/compare/3.4.1...3.4.2) (2019-04-09)
-
-
-### Bug Fixes
-
-* Editor:
-    * fix a bug with a plain text pasting. Now it converts the text to editor model.
-* Miscellaneous:
-    * chrome 73+ handles differently click target when selecting, fix the target detection on checkTool
-
-
-## [3.4.1](https://github.com/opendigitaleducation/infra-front/compare/3.4.0...3.4.1) (2019-03-25)
-
-
-### Features
-
-* Calendar:
-    * hide week switcher on month display
-
-
-# [3.4.0](https://github.com/opendigitaleducation/infra-front/compare/3.3.6...3.4.0) (2019-03-04)
-
-
-### Bug Fixes
-
-* Behaviours:
-    * fix workflow and behaviours for unavailable applications
-* Editor:
-    * fix the bug where the inline editor was moving on resize
-    * avoid clipping image when changing size to small or medium
-    * add upload visibility on base 64 import
-* Image editor:
-    * add a spinner when saving image
-    * display settings according to rights
-* Share panel:
-    * Display the 'show more' button on inherited shares
-* Workspace:
-    * Avoid undefined shared array in folders
-* Miscellaneous:
-    * remove the style 'user-select: none' when touching a resizable element
-
-
-### Features
-
-* Workspace:
-    * pre-3.4 Revisions of document compatible with the restoration mechanism
-* CI:
-    * use `Jenkinsfile` to build infra-front
-
-
-
-## [3.3.6](https://github.com/opendigitaleducation/infra-front/compare/3.3.5...3.3.6) (2019-02-18)
-
-
-### Bug Fixes
-
-
-* Workspace:
-    * fix cycle in the document hierarchy (document should not be able to move (or copy) into self or descendant)
-
-
-## [3.3.5](https://github.com/opendigitaleducation/infra-front/compare/3.3.4...3.3.5) (2019-02-12)
-
-
-### Bug Fixes
-
-* Smart banner:
-    * remove the store name
-
-
-
-## [3.3.4](https://github.com/opendigitaleducation/infra-front/compare/3.3.2...3.3.4) (2019-01-22)
-
-
-### Bug Fixes
-
-* Editor:
-    * fix pasted font-size (use the correct scaling)
-    * use "font[size]" attribute to style font-size on copy/paste
-
-
-
-## [3.3.2](https://github.com/opendigitaleducation/infra-front/compare/3.3.1...3.3.2) (2019-01-10)
-
-
-### Bug Fixes
-
-* Share panel:
-    * renamed button class
-
-
-## [3.3.1](https://github.com/opendigitaleducation/infra-front/compare/3.3.0...3.3.1) (2019-01-07)
-
-
-### Bug Fixes
-
-* Miscellaneous:
-    * include hash's theme when building ts
-
-
-# [3.3.0](https://github.com/opendigitaleducation/infra-front/compare/2.3.3...3.3.0) (2018-12-26)
-
-
-### Bug Fixes
-
-* Editor:
-    * delete zws char at the beginning of the line when press delete
-    * fix editor when pressing enter in a text which contains a <br>
-    * fix line deletion
-    * fix pressing enter at the start of a line
-    * fix span merging, respect order while merging
-    * fix the siblings tree position after pressing enter
-    * rewrite css applying functionalities
-    * catch and clean the clipboard
-    * fix new line when in styled list
-    * create a new line with zero-width space after list
-    * selection fixes on delete and empty editor
-    * detect CMD key on mac os x
-    * apply selected color and selected background to multicolor lines
-    * fix apply style to a block node
-    * fix IE compatibility issue
-    * fix selection issue with safari
-    * whitelist possible tags for new line
-    * let browser handle the paste event when non-html content
-    * fix some style issue when pasting image from editor
-    * let ie11 handles the pasting event
-    * remove editor content when pressing enter while selecting the editor
-    * removes condition when applying colors
-    * fix workspace path
-* Workspace:
-    * updated class for spinner
-    * changed spinner class when copying
-    * issues with searching when copying or moving
-    * adding tooltip for ellipsis
-    * add feedback on 403 error
-    * fix javascript exception when notifying contrib
-    * prefetch loading screen to avoid locked screen
-* Share panel:
-    * wait users filtering before displaying 'No results'
-* Media library:
-    * fix wrong feedback color for dictaphone
-    
-    
-### Features
-
-
-* Workspace:
-    * issues with searching when copying or moving
-    * adding tooltip for ellipsis
-* Media library:
-    * multiple URL patterns for embed videos
-    * adding image class to make icons in media lib uniform
-    * documents ordered by created date in media library
-* Share panel:
-    *  Hide input placeholder if no results
-* Smart banner:
-    * adds smart banner
-* Miscellaneous:
-    * adding auto-size class on lightboxes h2

package/CONTRIBUTING.md

@@ -1,53 +0,0 @@
-Contributing
----
-
-## Running unit tests
-
-```shell
-# install dependencies:
-npm install
-
-# run unit tests on local firefox and chrome:
-npm run test
-
-# override the default browsers, e.g. run unit tests only on local firefox:
-npm run test -- --browsers=Firefox
-
-# /!\ needs env. variables BROWSERSTACK_USERNAME and BROWSERSTACK_ACCESSKEY
-# run unit tests on browserStack:
-npm run test:compatibility
-# only on ie11:
-npm run test:compatibility -- --browsers=bs_ie_11_windows10
-```
-
-## Running end-to-end tests
-
-```shell
-# /!\ needs env. variables E2E_USERNAME and E2E_PASSWORD
-# which are the credentials to connect to the entcore platform
-E2E_USERNAME=myUsername E2E_PASSWORD=myPassword npm run test:end-to-end
-
-# On BrowserStack browsers
-BROWSERSTACK=true E2E_USERNAME=myUsername E2E_PASSWORD=myPassword npm run test:end-to-end
-
-# With a different base URL (default is http://localhost:8090/)
-E2E_BASE_URL=http://my-example.com E2E_USERNAME=myUsername E2E_PASSWORD=myPassword npm run test:end-to-end
-```
-
-
-## choices
-
-- why karma?
-
-Karma is a javascript test runner that runs unit tests in browser environments.
-Most alternative test runners run tests in the node.js environment.
-
-- why jasmine?
-
-Jasmine is a full-featured (assertions, mocks, etc.) test framework.
-A lot of resources can be found in the web about Jasmine.
-
-- why webdriver.io?
-
-Webdriver.io is a low level API to write functional tests using the standard web driver api.
-

package/Jenkinsfile

@@ -1,27 +0,0 @@
-#!/usr/bin/env groovy
-
-pipeline {
-  agent any
-    stages {
-      stage('Init') {
-        steps {
-          checkout scm
-          sh './build.sh deps'
-        }
-      }
-      stage('Build') {
-        steps {
-          sh './build.sh build'
-        }
-      }
-      stage('Publish') {
-        steps {
-          configFileProvider([configFile(fileId: '.npmrc-infra-front', variable: 'NPMRC')]) {
-            sh 'cp $NPMRC .npmrc'
-            sh './build.sh publish'
-          }
-        }
-      }
-    }
-}
-

package/bower.json

@@ -1,30 +0,0 @@
-{
-  "name": "js-infra",
-  "homepage": "https://github.com/entcore/js-infra",
-  "authors": [
-    "WSE <tech@web-education.net>"
-  ],
-  "description": "",
-  "main": "",
-  "moduleType": [],
-  "license": "AGPL",
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests"
-  ],
-  "dependencies": {
-    "lodash": "~4.8.2",
-    "jquery": "~2.2.3",
-    "moment": "^2.12.0",
-    "humane-js": "^3.2.2",
-    "angular": "1.2.0-rc.2",
-    "angular-sanitize": "1.2.0-rc.2",
-    "angular-route": "1.2.0-rc.2",
-    "underscore": "^1.8.3",
-    "core.js": "^2.4.1",
-    "ua-parser-js": "^0.7.23"
-  }
-}

package/browsers.json

@@ -1,40 +0,0 @@
-[
-  {
-    "name": "bs_chrome_latest_windows10",
-    "browser": "Chrome",
-    "os": "Windows",
-    "os_version": "10"
-  },
-  {
-    "name": "bs_edge_latest_windows10",
-    "browser": "Edge",
-    "os": "Windows",
-    "os_version": "10"
-  },
-  {
-    "name": "bs_ie_11_windows10",
-    "browser": "IE",
-    "browser_version": "11",
-    "os": "Windows",
-    "os_version": "10"
-  },
-  {
-    "name": "bs_ie_11_windows8",
-    "browser": "IE",
-    "browser_version": "11",
-    "os": "Windows",
-    "os_version": "8.1"
-  },
-  {
-    "name": "bs_firefox_latest_windows10",
-    "browser": "Firefox",
-    "os": "Windows",
-    "os_version": "10"
-  },
-  {
-    "name": "bs_safari_latest_macOS_HS",
-    "browser": "Safari",
-    "os": "OS X",
-    "os_version": "High Sierra"
-  }
-]