Upload
@@ -195,5 +199,15 @@Upload
+ + + + + + + + + + diff --git a/demo-shell-ng2/app/components/setting/setting.component.css b/demo-shell-ng2/app/components/setting/setting.component.css index 91992ec4aa0..abbadd44969 100644 --- a/demo-shell-ng2/app/components/setting/setting.component.css +++ b/demo-shell-ng2/app/components/setting/setting.component.css @@ -1,6 +1,6 @@ .setting-card.mdl-card { - width: 320px; - height: 320px; + width: 100%; + height: 100%; } .setting-card > .mdl-card__title { @@ -30,6 +30,6 @@ display: table-row; } -.adf-setting-input-padding{ +.adf-setting-input-padding { padding-top: 0px !important; } diff --git a/demo-shell-ng2/app/polyfills.ts b/demo-shell-ng2/app/polyfills.ts index d5be0fad928..541adc72dc1 100644 --- a/demo-shell-ng2/app/polyfills.ts +++ b/demo-shell-ng2/app/polyfills.ts @@ -1,16 +1,17 @@ import 'core-js/es6'; import 'core-js/es7/reflect'; +import 'intl'; -// IE 8-11 -require('zone.js/dist/zone'); +require('zone.js/dist/zone'); // IE 8-11 +require('element.scrollintoviewifneeded-polyfill'); // IE/FF if (process.env.ENV === 'production') { - // Production + // Production } else { - // Development + // Development - Error['stackTraceLimit'] = Infinity; + Error['stackTraceLimit'] = Infinity; - require('zone.js/dist/long-stack-trace-zone'); + require('zone.js/dist/long-stack-trace-zone'); } diff --git a/demo-shell-ng2/app/vendor.ts b/demo-shell-ng2/app/vendor.ts index 91d7764380b..9883f4891e2 100644 --- a/demo-shell-ng2/app/vendor.ts +++ b/demo-shell-ng2/app/vendor.ts @@ -32,39 +32,44 @@ import 'ng2-alfresco-webscript'; import 'ng2-alfresco-userinfo'; // Polyfill(s) for dialogs -require('script!dialog-polyfill/dialog-polyfill'); +require('script-loader!dialog-polyfill/dialog-polyfill'); import 'dialog-polyfill/dialog-polyfill.css'; // Flags import 'flag-icon-css/css/flag-icon.min.css'; -import '../public/css/app.css'; -import '../public/css/muli-font.css'; - // Load the Angular Material 2 stylesheet import '../public/css/angular-material.css'; +// Google Material Design Lite +import 'material-design-lite/material.js'; +import 'material-design-lite/dist/material.orange-blue.min.css'; +import 'material-design-icons/iconfont/material-icons.css'; + +import '../public/css/app.css'; +import '../public/css/muli-font.css'; + import 'ng2-activiti-form/stencils/runtime.ng1'; import 'ng2-activiti-form/stencils/runtime.adf'; import 'ng2-charts'; import 'chart.js'; -require('script!raphael/raphael.min.js'); +require('script-loader!raphael/raphael.min.js'); -require('script!moment/min/moment.min.js'); +require('script-loader!moment/min/moment.min.js'); import 'md-date-time-picker/dist/css/mdDateTimePicker.css'; -require('script!md-date-time-picker/dist/js/mdDateTimePicker.min.js'); -require('script!md-date-time-picker/dist/js/draggabilly.pkgd.min.js'); +require('script-loader!md-date-time-picker/dist/js/mdDateTimePicker.min.js'); +require('script-loader!md-date-time-picker/dist/js/draggabilly.pkgd.min.js'); require('pdfjs-dist/web/compatibility.js'); // Setting worker path to worker bundle. let pdfjsLib = require('pdfjs-dist'); if (process.env.ENV === 'production') { - pdfjsLib.PDFJS.workerSrc = './pdf.worker.js'; + pdfjsLib.PDFJS.workerSrc = './pdf.worker.js'; } else { - pdfjsLib.PDFJS.workerSrc = '../../node_modules/pdfjs-dist/build/pdf.worker.js'; + pdfjsLib.PDFJS.workerSrc = '../../node_modules/pdfjs-dist/build/pdf.worker.js'; } require('pdfjs-dist/web/pdf_viewer.js'); diff --git a/demo-shell-ng2/config/helpers.js b/demo-shell-ng2/config/helpers.js index 15dc4a5a468..a11fa771d6c 100644 --- a/demo-shell-ng2/config/helpers.js +++ b/demo-shell-ng2/config/helpers.js @@ -1,7 +1,10 @@ var path = require('path'); + var _root = path.resolve(__dirname, '..'); + function root(args) { args = Array.prototype.slice.call(arguments, 0); return path.join.apply(path, [_root].concat(args)); } + exports.root = root; diff --git a/demo-shell-ng2/config/karma.conf.js b/demo-shell-ng2/config/karma.conf.js index c3b4a58f9e4..c7bf96fe26f 100644 --- a/demo-shell-ng2/config/karma.conf.js +++ b/demo-shell-ng2/config/karma.conf.js @@ -1,37 +1,73 @@ var webpackConfig = require('./webpack.test'); module.exports = function (config) { - var _config = { - basePath: '', + var _config = { + basePath: '', - frameworks: ['jasmine'], + frameworks: ['jasmine'], - files: [ - { pattern: './config/karma-test-shim.js', watched: false } - ], + files: [ + './node_modules/hammerjs/hammer.js', - preprocessors: { - './config/karma-test-shim.js': ['webpack', 'sourcemap'] - }, + { pattern: './config/karma-test-shim.js', watched: false } + ], - webpack: webpackConfig, + preprocessors: { + './config/karma-test-shim.js': ['webpack', 'sourcemap'] + }, - webpackMiddleware: { - stats: 'errors-only' - }, + webpack: webpackConfig, - webpackServer: { - noInfo: true - }, + webpackMiddleware: { + stats: 'errors-only' + }, - reporters: ['mocha'], - port: 9876, - colors: true, - logLevel: config.LOG_INFO, - autoWatch: false, - browsers: ['Chrome'], - singleRun: true - }; + port: 9876, - config.set(_config); + // level of logging + // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG + logLevel: config.LOG_INFO, + + colors: true, + + autoWatch: true, + + captureTimeout: 180000, + browserDisconnectTimeout: 180000, + browserDisconnectTolerance: 3, + browserNoActivityTimeout: 300000, + + browsers: ['Chrome'], + + customLaunchers: { + Chrome_travis_ci: { + base: 'Chrome', + flags: ['--no-sandbox'] + } + }, + + // Karma plugins loaded + plugins: [ + require('../node_modules/karma-jasmine'), + require('../node_modules/karma-coverage'), + require('../node_modules/karma-sourcemap-loader'), + require('../node_modules/karma-chrome-launcher'), + require('../node_modules/karma-mocha-reporter'), + require('../node_modules/karma-webpack'), + require('../node_modules/karma-jasmine-html-reporter') + ], + + webpackServer: { + noInfo: true + }, + + reporters: ['mocha'] + + }; + + if (process.env.TRAVIS) { + config.browsers = ['Chrome_travis_ci']; + } + + config.set(_config); }; diff --git a/demo-shell-ng2/config/loaders/license-check.js b/demo-shell-ng2/config/loaders/license-check.js new file mode 100644 index 00000000000..6a15ac03e2a --- /dev/null +++ b/demo-shell-ng2/config/loaders/license-check.js @@ -0,0 +1,67 @@ +var path = require('path'); +var loaderUtils = require('loader-utils'); +var fs = require('fs'); + +var licenseFileUtf8Store = undefined; + +function readLicenseHeaderFile(licenseFilePath) { + if (licenseFileUtf8Store) { + return licenseFileUtf8Store; + } + + if (fs.existsSync(licenseFilePath)) { + licenseFileUtf8Store = fs.readFileSync(licenseFilePath, 'utf8').split(/\r?\n/); + return licenseFileUtf8Store; + } + + throw new Error('The license header file path is wrong ' + licenseFilePath); +} + +function isFileEmpty(fileContents) { + return fileContents.toString('utf8').trim() === ''; +} + +function readCurrentFile(fileContent) { + return fileContent.toString('utf8').split(/\r?\n/); +} + +function isLicenseHeaderPresent(currentFileContent, licenseFilePath) { + if (!isFileEmpty(currentFileContent)) { + var currentFileUtf8 = readCurrentFile(currentFileContent), + licenseFileUtf8 = readLicenseHeaderFile(licenseFilePath); + skipStrict = 0; + + if(currentFileUtf8[0] === '"use strict";' ) { + skipStrict = 1; + } + + for (var i = skipStrict; i < licenseFileUtf8.length; i++) { + if (currentFileUtf8[i + skipStrict] !== licenseFileUtf8[i]) { + return false; + } + } + } + return true; +} + +function report(hasHeader, emitter, filename) { + if (hasHeader) return; + emitter('Missing license header file : ' + filename); +} + +function licenseCheck(webpackInstance, input, options) { + var isLicensePresent = isLicenseHeaderPresent(input, options.licenseFile); + + var emitter = options.emitErrors ? webpackInstance.emitError : webpackInstance.emitWarning; + + report(isLicensePresent, emitter, webpackInstance.resourcePath); +} + +module.exports = function(input, map) { + this.cacheable && this.cacheable(); + var callback = this.async(); + + var options = loaderUtils.getOptions(this); + licenseCheck(this, input, options); + callback(null, input, map); +}; diff --git a/demo-shell-ng2/config/webpack.common.js b/demo-shell-ng2/config/webpack.common.js index 6f4c13f5d55..ee7a199828e 100644 --- a/demo-shell-ng2/config/webpack.common.js +++ b/demo-shell-ng2/config/webpack.common.js @@ -1,22 +1,27 @@ -var webpack = require('webpack'); -var HtmlWebpackPlugin = require('html-webpack-plugin'); -var ExtractTextPlugin = require('extract-text-webpack-plugin'); -var helpers = require('./helpers'); -var path = require('path'); -var fs = require('fs'); -var glob = require('glob'); -var CopyWebpackPlugin = require('copy-webpack-plugin'); +const webpack = require('webpack'); +const HtmlWebpackPlugin = require('html-webpack-plugin'); +const CopyWebpackPlugin = require('copy-webpack-plugin'); +const ExtractTextPlugin = require("extract-text-webpack-plugin"); +const helpers = require('./helpers'); +const path = require('path'); -const rootPath = helpers.root('node_modules'); - -var pattern = '+(alfresco-js-api|ng2-alfresco|ng2-activiti)*'; -var options = { - cwd: rootPath, - realpath: true -}; - -var alfrescoLibs = glob.sync(pattern, options); -// console.dir(alfrescoLibs); +const alfrescoLibs = [ + 'ng2-activiti-analytics', + 'ng2-activiti-diagrams', + 'ng2-activiti-form', + 'ng2-activiti-processlist', + 'ng2-activiti-tasklist', + 'ng2-alfresco-core', + 'ng2-alfresco-datatable', + 'ng2-alfresco-documentlist', + 'ng2-alfresco-login', + 'ng2-alfresco-search', + 'ng2-alfresco-tag', + 'ng2-alfresco-upload', + 'ng2-alfresco-userinfo', + 'ng2-alfresco-viewer', + 'ng2-alfresco-webscript' +]; module.exports = { entry: { @@ -25,162 +30,146 @@ module.exports = { 'app': './app/main.ts' }, - resolve: { - extensions: ['', '.ts', '.js'], - modules: [ - helpers.root('app'), - helpers.root('node_modules') - ], - root: rootPath, - fallback: rootPath - }, - resolveLoader: { alias: { - 'systemjs-loader': helpers.root('config', 'loaders', 'system.js'), - 'debug-loader': helpers.root('config', 'loaders', 'debug.js') - }, - fallback: rootPath + "license-check": path.resolve(__dirname, "./loaders/license-check") + } }, + module: { - preLoaders: [ + rules: [ { + enforce: 'pre', test: /\.js$/, - include: [ - ...alfrescoLibs - ], - loader: 'source-map-loader' - } - ], - loaders: [ + include: [helpers.root('app'), helpers.root('../ng2-components')], + loader: 'source-map-loader', + exclude: [ /node_modules/, /public/, /resources/, /dist/] + }, { + enforce: 'pre', test: /\.ts$/, - loaders: ['awesome-typescript-loader', 'angular2-template-loader', 'systemjs-loader'], - exclude: ['node_modules','public'] + loader: 'tslint-loader', + include: [helpers.root('app')], + options: { + emitErrors: true + }, + exclude: [ /node_modules/, /public/, /resources/, /dist/] }, { - test: /\.js$/, - include: [ - ...alfrescoLibs - ], - loaders: ['angular2-template-loader', 'source-map-loader', 'systemjs-loader'] + enforce: 'pre', + test: /\.ts$/, + use: 'source-map-loader', + exclude: [ /public/, /resources/, /dist/] }, { - test: /\.html$/, - exclude: alfrescoLibs, - loader: 'html' + test: /\.ts$/, + include: [helpers.root('app'), helpers.root('../ng2-components')], + loader: [ + 'ts-loader', + 'angular2-template-loader' + ], + exclude: [ /node_modules/, /public/, /resources/, /dist/] }, { test: /\.html$/, - include: alfrescoLibs, - loader: 'html', - query: { - interpolate: true - } + loader: 'html-loader', + exclude: [ /node_modules/, /public/, /resources/, /dist/] }, { - test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)$/, - loader: 'file?name=assets/[name].[hash].[ext]' + test: /\.css$/, + exclude: [helpers.root('app'), helpers.root('../ng2-components')], + loader: ExtractTextPlugin.extract({ + fallback: 'style-loader', + use: 'css-loader?sourceMap' + }) }, { test: /\.css$/, - exclude: [ - helpers.root('app'), - ...alfrescoLibs - ], - loader: ExtractTextPlugin.extract('style', 'css?sourceMap') + include: [helpers.root('app'), helpers.root('../ng2-components')], + loader: 'raw-loader' }, { - test: /\.css$/, - include: [ - helpers.root('app'), - ...alfrescoLibs - ], - loader: 'raw' + test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)$/, + loader: 'file-loader?name=assets/[name].[hash].[ext]' + }, + { + enforce: 'pre', + test: /\.ts$/, + loader: 'license-check', + include: helpers.root('app'), + options: { + emitErrors: true, + licenseFile: path.resolve(__dirname, '../assets/license_header.txt') + }, + exclude: [/node_modules/, /bundles/, /dist/, /demo/], } ] }, plugins: [ - - new webpack.WatchIgnorePlugin([ new RegExp('^((?!(ng2-activiti|ng2-alfresco|demo-shell-ng2)).)((?!(src|app)).)*$')]), + // Workaround for angular/angular#11580 + new webpack.ContextReplacementPlugin( + // The (\\|\/) piece accounts for path separators in *nix and Windows + /angular(\\|\/)core(\\|\/)@angular/, + helpers.root('./app'), // location of your src + {} // a map of your routes + ), + new HtmlWebpackPlugin({ + template: './index.html' + }), new CopyWebpackPlugin([ + ... alfrescoLibs.map(lib => { + return { + context: `../ng2-components/${lib}/bundles/assets/` , + from: '**/*', + to: `assets/` + } + }), + { + context: 'resources/i18n', + from: '**/*.json', + to: 'resources/i18n' + }, + ... alfrescoLibs.map(lib => { + return { + context: 'node_modules', + from: `${lib}/src/i18n/*.json`, + to: 'node_modules' + } + }), + { + from: 'favicon-96x96.png' + }, + { + from: 'node_modules/pdfjs-dist/build/pdf.worker.js', + to: 'pdf.worker.js' + }, { - from: 'versions.json' - },{ - context: 'node_modules', - from: 'element.scrollintoviewifneeded-polyfill/index.js', - to: 'js/element.scrollintoviewifneeded-polyfill.js', - flatten: true - },{ - context: 'node_modules', - from: 'classlist-polyfill/src/index.js', - to: 'js/classlist-polyfill.js', - flatten: true - }, { - context: 'node_modules', - from: 'intl/dist/Intl.min.js', - to: 'js/Intl.min.js', - flatten: true - }, { - context: 'node_modules', - from: 'web-animations-js/web-animations.min.js', - to: 'js/web-animations.min.js', - flatten: true - }, { - context: 'node_modules', - from: 'core-js/client/shim.min.js', - to: 'js/shim.min.js', - flatten: true - }, { - context: 'node_modules', - from: 'es6-shim/es6-shim.min.js', - to: 'js/es6-shim.min.js', - flatten: true - }, { - context: 'node_modules', - from: 'es5-shim/es5-shim.min.js', - to: 'js/es5-shim.min.js', - flatten: true - }, { - context: 'node_modules', - from: 'systemjs/dist/system-polyfills.js', - to: 'js/system-polyfills.js', - flatten: true - }, { - context: 'node_modules', - from: 'material-design-lite/material.min.js', - to: 'js/material.min.js', - flatten: true - }, { - context: 'node_modules', - from: 'material-design-lite/material.min.js', - to: 'js/material.min.js', - flatten: true - }, { - context: 'node_modules', - from: 'material-design-icons/iconfont/', - to: 'css/iconfont/', - flatten: true - }, { context: 'public', from: '', to: '' + }, + { + from: 'versions.json' } ]), new webpack.optimize.CommonsChunkPlugin({ name: ['app', 'vendor', 'polyfills'] - }), - - new HtmlWebpackPlugin({ - template: 'index.html' }) ], + devServer: { + contentBase: helpers.root('dist'), + compress: true, + port: 3000, + historyApiFallback: true, + host: '0.0.0.0', + inline: true + }, + node: { - fs: 'empty', - module: false + fs: 'empty' } }; diff --git a/demo-shell-ng2/config/webpack.dev.js b/demo-shell-ng2/config/webpack.dev.js index 2816a0faeb4..9b3824a5aff 100644 --- a/demo-shell-ng2/config/webpack.dev.js +++ b/demo-shell-ng2/config/webpack.dev.js @@ -1,8 +1,9 @@ -var webpackMerge = require('webpack-merge'); -var ExtractTextPlugin = require('extract-text-webpack-plugin'); -var commonConfig = require('./webpack.common.js'); -var helpers = require('./helpers'); -var CopyWebpackPlugin = require('copy-webpack-plugin'); +const webpack = require('webpack'); +const webpackMerge = require('webpack-merge'); +const ExtractTextPlugin = require('extract-text-webpack-plugin'); +const commonConfig = require('./webpack.common.js'); +const helpers = require('./helpers'); +const path = require('path'); module.exports = webpackMerge(commonConfig, { @@ -14,55 +15,38 @@ module.exports = webpackMerge(commonConfig, { chunkFilename: '[id].chunk.js' }, + resolve: { + alias: { + "ng2-alfresco-core$": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-core/index.ts'), + "ng2-alfresco-datatable$": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-datatable/index.ts'), + "ng2-activiti-form/stencils/runtime.ng1$": path.resolve(__dirname, '../../ng2-components/ng2-activiti-form/stencils/runtime.ng1'), + "ng2-activiti-form/stencils/runtime.adf$": path.resolve(__dirname, '../../ng2-components/ng2-activiti-form/stencils/runtime.adf'), + "ng2-activiti-diagrams$": path.resolve(__dirname, '../../ng2-components/ng2-activiti-diagrams/index.ts'), + "ng2-activiti-analytics$": path.resolve(__dirname, '../../ng2-components/ng2-activiti-analytics/index.ts'), + "ng2-activiti-form$": path.resolve(__dirname, '../../ng2-components/ng2-activiti-form/index.ts'), + "ng2-activiti-tasklist$": path.resolve(__dirname, '../../ng2-components/ng2-activiti-tasklist/index.ts'), + "ng2-activiti-processlist$": path.resolve(__dirname, '../../ng2-components/ng2-activiti-processlist/index.ts'), + "ng2-alfresco-documentlist$": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-documentlist/index.ts'), + "ng2-alfresco-login$": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-login/index.ts'), + "ng2-alfresco-search$": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-search/index.ts'), + "ng2-alfresco-social$": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-social/index.ts'), + "ng2-alfresco-tag$": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-tag/index.ts'), + "ng2-alfresco-upload$": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-upload/index.ts'), + "ng2-alfresco-viewer$": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-viewer/index.ts'), + "ng2-alfresco-webscript$": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-webscript/index.ts'), + "ng2-alfresco-userinfo$": path.resolve(__dirname, '../../ng2-components/ng2-alfresco-userinfo/index.ts') + }, + extensions: ['.ts', '.js'], + modules: [path.resolve(__dirname, '../node_modules')] + }, + plugins: [ - new ExtractTextPlugin('[name].css'), - new CopyWebpackPlugin([ - { - from: 'favicon-96x96.png' - }, - { - from: 'node_modules/pdfjs-dist/build/pdf.worker.js', - to: 'pdf.worker.js' - }, - { - context: 'resources/i18n', - from: '**/*.json', - to: 'resources/i18n' - }, - // Copy i18n folders for all modules with ng2-alfresco- prefix - { - context: 'node_modules', - from: 'ng2-alfresco-*/src/i18n/*.json', - to: 'node_modules' - }, - // Copy i18n folders for all modules with ng2-activiti- prefix - { - context: 'node_modules', - from: 'ng2-activiti-*/src/i18n/*.json', - to: 'node_modules' - }, - // Copy asstes folders for all modules with ng2-activiti- prefix - { - context: 'node_modules', - from: 'ng2-activiti-*/src/assets/images/*.*', - to: 'assets/images', - flatten: true - }, - // Copy asstes folders for all modules with ng2-alfresco- prefix - { - context: 'node_modules', - from: 'ng2-alfresco-*/src/assets/images/*.*', - to: 'assets/images', - flatten: true + new webpack.NoEmitOnErrorsPlugin(), + new ExtractTextPlugin('[name].[hash].css'), + new webpack.LoaderOptionsPlugin({ + htmlLoader: { + minimize: false // workaround for ng2 } - ]) - ], - - devServer: { - host: '0.0.0.0', - port: 3000, - inline: true, - historyApiFallback: true, - stats: 'minimal' - } + }) + ] }); diff --git a/demo-shell-ng2/config/webpack.prod.js b/demo-shell-ng2/config/webpack.prod.js index 1b73b19959c..8ed049c3cb7 100644 --- a/demo-shell-ng2/config/webpack.prod.js +++ b/demo-shell-ng2/config/webpack.prod.js @@ -1,104 +1,79 @@ -var webpack = require('webpack'); -var webpackMerge = require('webpack-merge'); -var ExtractTextPlugin = require('extract-text-webpack-plugin'); -var CopyWebpackPlugin = require('copy-webpack-plugin'); -var commonConfig = require('./webpack.common.js'); -var helpers = require('./helpers'); +const webpack = require('webpack'); +const webpackMerge = require('webpack-merge'); +const ExtractTextPlugin = require('extract-text-webpack-plugin'); +const commonConfig = require('./webpack.common.js'); +const helpers = require('./helpers'); +const CopyWebpackPlugin = require('copy-webpack-plugin'); const ENV = process.env.NODE_ENV = process.env.ENV = 'production'; -module.exports = webpackMerge(commonConfig, { - devtool: 'source-map', - - output: { - path: helpers.root('dist'), - publicPath: '/', - filename: '[name].[hash].js', - chunkFilename: '[id].[hash].chunk.js' - }, - - htmlLoader: { - minimize: false // workaround for ng2 - }, +const alfrescoLibs = [ + 'ng2-activiti-analytics', + 'ng2-activiti-diagrams', + 'ng2-activiti-form', + 'ng2-activiti-processlist', + 'ng2-activiti-tasklist', + 'ng2-alfresco-core', + 'ng2-alfresco-datatable', + 'ng2-alfresco-documentlist', + 'ng2-alfresco-login', + 'ng2-alfresco-search', + 'ng2-alfresco-tag', + 'ng2-alfresco-upload', + 'ng2-alfresco-userinfo', + 'ng2-alfresco-viewer', + 'ng2-alfresco-webscript' +]; - plugins: [ - // Define env variables to help with builds - // Reference: https://webpack.github.io/docs/list-of-plugins.html#defineplugin - new webpack.DefinePlugin({ - 'process.env': { - 'ENV': JSON.stringify(ENV) - } - }), - - // Reference: http://webpack.github.io/docs/list-of-plugins.html#noerrorsplugin - // Only emit files when there are no errors - new webpack.NoErrorsPlugin(), +module.exports = webpackMerge(commonConfig, { - // Reference: http://webpack.github.io/docs/list-of-plugins.html#dedupeplugin - // Dedupe modules in the output - new webpack.optimize.DedupePlugin(), + devtool: 'source-map', - // Reference: http://webpack.github.io/docs/list-of-plugins.html#uglifyjsplugin - // Minify all javascript, switch loaders to minimizing mode - new webpack.optimize.UglifyJsPlugin({ - output:{ - comments: false - }, - mangle: { - keep_fnames: true - }, - compressor: { - screw_ie8: true, - warnings: false - } - }), + output: { + path: helpers.root('dist'), + publicPath: '/', + filename: '[name].[hash].js', + chunkFilename: '[id].[hash].chunk.js' + }, - // Extract css files - // Reference: https://github.com/webpack/extract-text-webpack-plugin - // Disabled when in test mode or not in build mode - new ExtractTextPlugin('[name].[hash].css'), + resolve: { + extensions: ['.ts', '.js'], + modules: [helpers.root('node_modules')] + }, - // Copy assets from the public folder - // Reference: https://github.com/kevlened/copy-webpack-plugin - new CopyWebpackPlugin([ - { - from: 'favicon-96x96.png' - }, - { - from: 'node_modules/pdfjs-dist/build/pdf.worker.js', - to: 'pdf.worker.js' - }, - { - context: 'resources/i18n', - from: '**/*.json', - to: 'resources/i18n' - }, - // Copy i18n folders for all modules with ng2-alfresco- prefix - { - context: 'node_modules', - from: 'ng2-alfresco-*/src/i18n/*.json', - to: 'node_modules' - }, - // Copy i18n folders for all modules with ng2-activiti- prefix - { - context: 'node_modules', - from: 'ng2-activiti-*/src/i18n/*.json', - to: 'node_modules' - }, - // Copy asstes folders for all modules with ng2-activiti- prefix - { - context: 'node_modules', - from: 'ng2-activiti-*/src/assets/images/*.*', - to: 'assets/images', - flatten : true - }, - // Copy asstes folders for all modules with ng2-alfresco- prefix - { - context: 'node_modules', - from: 'ng2-alfresco-*/src/assets/images/*.*', - to: 'assets/images', - flatten : true - } - ]) - ] + plugins: [ + new CopyWebpackPlugin([ + ... alfrescoLibs.map(lib => { + return { + context: `node_modules/${lib}/bundles/assets/` , + from: '**/*', + to: `assets/` + } + }) + ]), + new webpack.NoEmitOnErrorsPlugin(), + new webpack.optimize.UglifyJsPlugin({ // https://github.com/angular/angular/issues/10618 + mangle: { + keep_fnames: true + }, + compress: { + warnings: false + }, + output: { + comments: false + }, + sourceMap: true + }), + new ExtractTextPlugin('[name].[hash].css'), + new webpack.DefinePlugin({ + 'process.env': { + 'ENV': JSON.stringify(ENV) + } + }), + new webpack.LoaderOptionsPlugin({ + htmlLoader: { + minimize: false // workaround for ng2 + } + }) + ] }); diff --git a/demo-shell-ng2/config/webpack.test.js b/demo-shell-ng2/config/webpack.test.js index c9bcd38d21d..c03156628c8 100644 --- a/demo-shell-ng2/config/webpack.test.js +++ b/demo-shell-ng2/config/webpack.test.js @@ -1,78 +1,46 @@ -var helpers = require('./helpers'); -var fs = require('fs'); -var glob = require('glob'); - -const rootPath = helpers.root('node_modules'); - -var pattern = '+(alfresco-js-api|ng2-alfresco|ng2-activiti)*'; -var options = { - cwd: rootPath, - realpath: true -}; - -var alfrescoLibs = glob.sync(pattern, options); +const webpack = require('webpack'); +const helpers = require('./helpers'); module.exports = { - devtool: 'inline-source-map', - - resolve: { - extensions: ['', '.ts', '.js'], - modules: [ - helpers.root('app'), - helpers.root('node_modules') - ], - root: rootPath, - fallback: rootPath - }, - resolveLoader: { - alias: { - 'systemjs-loader': helpers.root('config', 'loaders', 'system.js') - }, - fallback: rootPath - }, - - module: { - preLoaders: [ - { - test: /\.js$/, - include: [ - ...alfrescoLibs - ], - loader: 'source-map-loader' - } - ], - loaders: [ - { - test: /\.ts$/, - loaders: ['awesome-typescript-loader', 'angular2-template-loader', 'systemjs-loader'], - exclude: ['node_modules','public'] - }, - { - test: /\.js$/, - include: [ - ...alfrescoLibs - ], - loaders: ['angular2-template-loader', 'source-map-loader', 'systemjs-loader'] - }, - { - test: /\.html$/, - loader: 'html' - - }, - { - test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)$/, - loader: 'null' - }, - { - test: /\.css$/, - loader: 'raw' - } + devtool: 'inline-source-map', + + resolve: { + extensions: ['.ts', '.js'], + modules: [helpers.root('../ng2-components'), helpers.root('node_modules')] + }, + + module: { + rules: [ + { + test: /\.ts$/, + loaders: ['ts-loader', 'angular2-template-loader'], + exclude: [ /public/, /resources/, /dist/] + }, + { + test: /\.html$/, + loader: 'html-loader', + exclude: [ /public/, /resources/, /dist/] + + }, + { + test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)$/, + loader: 'null-loader' + }, + { + test: /\.css$/, + loader: ['to-string-loader', 'css-loader'], + exclude: [ /public/, /resources/, /dist/] + } + ] + }, + + plugins: [ + new webpack.ContextReplacementPlugin( + // The (\\|\/) piece accounts for path separators in *nix and Windows + /angular(\\|\/)core(\\|\/)(esm(\\|\/)src|src)(\\|\/)linker/, + helpers.root('./src'), // location of your src + {} // a map of your routes + ) ] - }, - - node: { - fs: 'empty', - module: false - } } diff --git a/demo-shell-ng2/index.html b/demo-shell-ng2/index.html index 0e8d01209c3..7e93895ca92 100644 --- a/demo-shell-ng2/index.html +++ b/demo-shell-ng2/index.html @@ -7,13 +7,6 @@ - - - - - - - - - - - - +
+  }})
- {{data.getValue(row, col)}}
+
- {{data.getValue(row, col)}}
+
@@ -95,7 +101,7 @@
-
-
-
diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.spec.ts b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.spec.ts
index 0727ec7a13e..d6694b778fd 100644
--- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.spec.ts
+++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.spec.ts
@@ -20,6 +20,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing';
import { CoreModule } from 'ng2-alfresco-core';
import { MdCheckboxChange } from '@angular/material';
import { DataTableComponent } from './datatable.component';
+import { DataTableCellComponent } from './datatable-cell.component';
import {
DataRow,
DataColumn,
@@ -40,7 +41,10 @@ describe('DataTable', () => {
imports: [
CoreModule.forRoot()
],
- declarations: [DataTableComponent]
+ declarations: [
+ DataTableCellComponent,
+ DataTableComponent
+ ]
}).compileComponents();
}));
@@ -48,7 +52,7 @@ describe('DataTable', () => {
fixture = TestBed.createComponent(DataTableComponent);
dataTable = fixture.componentInstance;
element = fixture.debugElement.nativeElement;
- fixture.detectChanges();
+ //fixture.detectChanges();
});
beforeEach(() => {
@@ -103,7 +107,7 @@ describe('DataTable', () => {
let data = new ObjectDataTableAdapter([], []);
expect(table.data).toBeUndefined();
- table.ngOnChanges({'data': new SimpleChange('123', data)});
+ table.ngOnChanges({'data': new SimpleChange('123', data, true)});
expect(table.data).toEqual(data);
});
@@ -415,86 +419,4 @@ describe('DataTable', () => {
expect(event.target.src).toBe(originalSrc);
});
- it('should disable the action if there is no permission and disableWithNoPermission true', () => {
-
- dataTable.data = new ObjectDataTableAdapter(
- [{id: 1, name: 'xyz', allowableOperations: ['create', 'update']}],
- []
- );
-
- let row = dataTable.data.getRows();
- let actions = [
- {
- disableWithNoPermission: true,
- permission: 'delete',
- target: 'folder',
- title: 'action2'
- }
- ];
-
- let updateActions = dataTable.checkPermissions(row[0], actions);
- expect(updateActions[0].disabled).toBe(true);
- });
-
- it('should not disable the action if there is no permission and disableWithNoPermission false', () => {
-
- dataTable.data = new ObjectDataTableAdapter(
- [{id: 1, name: 'xyz', allowableOperations: ['create', 'update']}],
- []
- );
-
- let row = dataTable.data.getRows();
- let actions = [
- {
- disableWithNoPermission: false,
- permission: 'delete',
- target: 'folder',
- title: 'action2'
- }
- ];
-
- let updateActions = dataTable.checkPermissions(row[0], actions);
- expect(updateActions[0].disabled).toBeUndefined();
- });
-
- it('should not disable the action if there is the right permission', () => {
-
- dataTable.data = new ObjectDataTableAdapter(
- [{ id: 1, name: 'xyz', allowableOperations: ['create', 'update', 'delete'] }],
- []
- );
-
- let row = dataTable.data.getRows();
- let actions = [
- {
- permission: 'delete',
- target: 'folder',
- title: 'action2'
- }
- ];
-
- let updateActions = dataTable.checkPermissions(row[0], actions);
- expect(updateActions[0].disabled).toBeUndefined();
- });
-
- it('should not disable the action if there are no permissions', () => {
-
- dataTable.data = new ObjectDataTableAdapter(
- [{id: 1, name: 'xyz', allowableOperations: null}],
- []
- );
-
- let row = dataTable.data.getRows();
- let actions = [
- {
- permission: 'delete',
- target: 'folder',
- title: 'action2'
- }
- ];
-
- let updateActions = dataTable.checkPermissions(row[0], actions);
- expect(updateActions[0].disabled).toBeUndefined();
- });
-
});
diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts
index 0cde9dd3abb..d9130df2b22 100644
--- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts
+++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts
@@ -18,6 +18,7 @@
import {
Component,
OnChanges,
+ SimpleChange,
SimpleChanges,
Input,
Output,
@@ -28,7 +29,7 @@ import {
ContentChild,
Optional
} from '@angular/core';
-import { DataTableAdapter, DataRow, DataColumn, DataSorting, DataRowEvent, ObjectDataTableAdapter } from '../../data/index';
+import { DataTableAdapter, DataRow, DataColumn, DataSorting, DataRowEvent, ObjectDataTableAdapter, ObjectDataRow } from '../../data/index';
import { DataCellEvent } from './data-cell.event';
import { DataRowActionEvent } from './data-row-action.event';
import { DataColumnListComponent } from 'ng2-alfresco-core';
@@ -37,7 +38,6 @@ import { MdCheckboxChange } from '@angular/material';
declare var componentHandler;
@Component({
- moduleId: module.id,
selector: 'alfresco-datatable',
styleUrls: ['./datatable.component.css'],
templateUrl: './datatable.component.html'
@@ -49,6 +49,9 @@ export class DataTableComponent implements AfterContentInit, OnChanges {
@Input()
data: DataTableAdapter;
+ @Input()
+ rows: any[] = [];
+
@Input()
multiselect: boolean = false;
@@ -97,10 +100,25 @@ export class DataTableComponent implements AfterContentInit, OnChanges {
}
ngOnChanges(changes: SimpleChanges) {
- if (changes['data'] && changes['data'].currentValue) {
+ if (this.isPropertyChanged(changes['data'])) {
this.loadTable();
return;
}
+
+ if (this.isPropertyChanged(changes['rows'])) {
+ if (this.data) {
+ this.data.setRows(this.convertToRowsData(changes['rows'].currentValue));
+ }
+ return;
+ }
+ }
+
+ isPropertyChanged(property: SimpleChange): boolean {
+ return property && property.currentValue ? true : false;
+ }
+
+ convertToRowsData(rows: any []): ObjectDataRow[] {
+ return rows.map(row => new ObjectDataRow(row));
}
loadTable() {
@@ -111,7 +129,7 @@ export class DataTableComponent implements AfterContentInit, OnChanges {
}
if (!this.data) {
- this.data = new ObjectDataTableAdapter([], schema);
+ this.data = new ObjectDataTableAdapter(this.rows, schema);
} else {
this.setHtmlColumnConfigurationOnObjectAdapter(schema);
}
@@ -236,37 +254,11 @@ export class DataTableComponent implements AfterContentInit, OnChanges {
getRowActions(row: DataRow, col: DataColumn): any[] {
let event = new DataCellEvent(row, col, []);
this.showRowActionsMenu.emit(event);
-
- return this.checkPermissions(row, event.value.actions);
- }
-
- checkPermissions(row: DataRow, actions: any[]) {
- let actionsPermission = [];
- actions.forEach((action) => {
- actionsPermission.push(this.checkPermission(row, action));
- });
- return actionsPermission;
- }
-
- checkPermission(row: DataRow, action) {
- if (action.permission) {
- if (this.hasPermissions(row)) {
- let permissions = row.getValue('allowableOperations');
- let findPermission = permissions.find(permission => permission === action.permission);
- if (!findPermission && action.disableWithNoPermission === true) {
- action.disabled = true;
- }
- }
- }
- return action;
- }
-
- private hasPermissions(row: DataRow): boolean {
- return row.getValue('allowableOperations') ? true : false;
+ return event.value.actions;
}
onExecuteRowAction(row: DataRow, action: any) {
- if (action.disabled) {
+ if (action.disabled || action.disabled) {
event.stopPropagation();
} else {
this.executeRowAction.emit(new DataRowActionEvent(row, action));
diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/index.ts b/ng2-components/ng2-alfresco-datatable/src/components/datatable/index.ts
index 37153cd18f6..0e872f6241b 100644
--- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/index.ts
+++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/index.ts
@@ -17,3 +17,4 @@
export * from './datatable.component';
export * from './no-content-template.component';
+export * from './datatable-cell.component';
diff --git a/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.spec.ts b/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.spec.ts
index e69a226dcd9..b774c76b990 100644
--- a/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.spec.ts
+++ b/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.spec.ts
@@ -101,7 +101,7 @@ describe('PaginationComponent', () => {
it('should update the summary on input pagination parameter change', () => {
spyOn(paginationComponent, 'updateSummary');
- paginationComponent.ngOnChanges({pagination: new SimpleChange(null, new PaginationData(0, 0, 0, 20, true))});
+ paginationComponent.ngOnChanges({pagination: new SimpleChange(null, new PaginationData(0, 0, 0, 20, true), true)});
expect(paginationComponent.updateSummary).toHaveBeenCalled();
});
diff --git a/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.ts b/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.ts
index 3643ac9c654..6d5a9d19086 100644
--- a/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.ts
+++ b/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.ts
@@ -20,7 +20,6 @@ import { PaginationData } from '../../models/pagination.data';
import { Pagination } from 'alfresco-js-api';
@Component({
- moduleId: module.id,
selector: 'alfresco-pagination',
templateUrl: './pagination.component.html',
styleUrls: ['./pagination.component.css']
diff --git a/ng2-components/ng2-alfresco-datatable/src/data/object-datatable-adapter.ts b/ng2-components/ng2-alfresco-datatable/src/data/object-datatable-adapter.ts
index d1eb3cd7716..0f8a5136521 100644
--- a/ng2-components/ng2-alfresco-datatable/src/data/object-datatable-adapter.ts
+++ b/ng2-components/ng2-alfresco-datatable/src/data/object-datatable-adapter.ts
@@ -25,6 +25,33 @@ export class ObjectDataTableAdapter implements DataTableAdapter {
private _sorting: DataSorting;
private _rows: DataRow[];
private _columns: DataColumn[];
+ private icons: string[] = [
+ 'empty_doc_lib.svg',
+ 'ft_ic_archive.svg',
+ 'ft_ic_audio.svg',
+ 'ft_ic_database.svg',
+ 'ft_ic_document.svg',
+ 'ft_ic_ebook.svg',
+ 'ft_ic_folder.svg',
+ 'ft_ic_folder_empty.svg',
+ 'ft_ic_form.svg',
+ 'ft_ic_google_docs.svg',
+ 'ft_ic_google_drawings.svg',
+ 'ft_ic_google_forms.svg',
+ 'ft_ic_google_sheets.svg',
+ 'ft_ic_google_slides.svg',
+ 'ft_ic_miscellaneous.svg',
+ 'ft_ic_ms_excel.svg',
+ 'ft_ic_ms_powerpoint.svg',
+ 'ft_ic_ms_word.svg',
+ 'ft_ic_pdf.svg',
+ 'ft_ic_presentation.svg',
+ 'ft_ic_raster_image.svg',
+ 'ft_ic_spreadsheet.svg',
+ 'ft_ic_vector_image.svg',
+ 'ft_ic_video.svg',
+ 'ft_ic_website.svg'
+ ];
selectedRow: DataRow;
@@ -111,9 +138,21 @@ export class ObjectDataTableAdapter implements DataTableAdapter {
}
}
+ if (col.type === 'icon') {
+ const iconName = row.getValue(col.key);
+ if (this.icons.indexOf(iconName) > -1) {
+ return this.getImagePath(iconName);
+ }
+ return this.getImagePath('ft_ic_miscellaneous.svg');
+ }
+
return value;
}
+ getImagePath(id: string): any {
+ return require('./../assets/images/' + id);
+ }
+
getSorting(): DataSorting {
return this._sorting;
}
diff --git a/ng2-components/ng2-alfresco-datatable/tsconfig.json b/ng2-components/ng2-alfresco-datatable/tsconfig.json
index 28919f9cc52..42e2a54cc86 100644
--- a/ng2-components/ng2-alfresco-datatable/tsconfig.json
+++ b/ng2-components/ng2-alfresco-datatable/tsconfig.json
@@ -16,22 +16,37 @@
"noFallthroughCasesInSwitch": true,
"removeComments": true,
"declaration": true,
+ "outDir": "./dist",
+ "baseUrl" : "./",
+ "paths": {
+ "ng2-alfresco-core": ["../ng2-alfresco-core/"],
+ "ng2-alfresco-datatable": ["../ng2-alfresco-datatable/"],
+ "ng2-activiti-diagrams": ["../ng2-activiti-diagrams/"],
+ "ng2-activiti-analytics":["../ng2-activiti-analytics/"],
+ "ng2-activiti-form":["../ng2-activiti-form/"],
+ "ng2-activiti-tasklist": ["../ng2-activiti-tasklist/"],
+ "ng2-activiti-processlist": ["../ng2-activiti-processlist/"],
+ "ng2-alfresco-documentlist": ["../ng2-alfresco-documentlist/"],
+ "ng2-alfresco-login": ["../ng2-alfresco-login/"],
+ "ng2-alfresco-search": ["../ng2-alfresco-search/"],
+ "ng2-alfresco-social": ["../ng2-alfresco-social/"],
+ "ng2-alfresco-tag": ["../ng2-alfresco-tag/"],
+ "ng2-alfresco-upload": ["../ng2-alfresco-upload/"],
+ "ng2-alfresco-viewer": ["../ng2-alfresco-viewer/"],
+ "ng2-alfresco-webscript": ["../ng2-alfresco-webscript/"],
+ "ng2-alfresco-userinfo": ["../ng2-alfresco-userinfo"],
+ "alfresco-js-api": ["../node_modules/alfresco-js-api/"]
+ },
"lib": [
"es2015",
"dom"
],
- "typeRoots": [
- "node_modules/@types"
- ],
"suppressImplicitAnyIndexErrors": true
},
"exclude": [
"demo",
"node_modules",
- "dist",
- "tools",
- "gulpfile.ts",
- "gulpfile.d.ts"
+ "dist"
],
"angularCompilerOptions": {
"strictMetadataEmit": false,
diff --git a/ng2-components/ng2-alfresco-datatable/tslint.json b/ng2-components/ng2-alfresco-datatable/tslint.json
deleted file mode 100644
index acc666937ed..00000000000
--- a/ng2-components/ng2-alfresco-datatable/tslint.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
- "rules": {
- "align": [
- true,
- "parameters",
- "statements"
- ],
- "ban": false,
- "class-name": true,
- "comment-format": [
- true,
- "check-space"
- ],
- "curly": true,
- "eofline": true,
- "forin": true,
- "indent": [
- true,
- "spaces"
- ],
- "interface-name": false,
- "jsdoc-format": true,
- "label-position": true,
- "label-undefined": true,
- "max-line-length": [
- true,
- 180
- ],
- "member-ordering": [
- true,
- "static-before-instance",
- "variables-before-functions"
- ],
- "no-any": false,
- "no-arg": true,
- "no-bitwise": false,
- "no-conditional-assignment": true,
- "no-consecutive-blank-lines": true,
- "no-console": [
- true,
- "debug",
- "info",
- "time",
- "timeEnd",
- "trace"
- ],
- "no-construct": true,
- "no-constructor-vars": false,
- "no-debugger": true,
- "no-duplicate-key": true,
- "no-duplicate-variable": true,
- "no-empty": false,
- "no-eval": true,
- "no-inferrable-types": false,
- "no-internal-module": true,
- "no-require-imports": false,
- "no-shadowed-variable": true,
- "no-switch-case-fall-through": true,
- "no-trailing-whitespace": true,
- "no-unreachable": true,
- "no-unused-expression": true,
- "no-unused-variable": true,
- "no-use-before-declare": true,
- "no-var-keyword": true,
- "no-var-requires": true,
- "object-literal-sort-keys": false,
- "one-line": [
- true,
- "check-open-brace",
- "check-catch",
- "check-else",
- "check-whitespace"
- ],
- "quotemark": [
- true,
- "single",
- "avoid-escape"
- ],
- "radix": true,
- "semicolon": true,
- "switch-default": true,
- "trailing-comma": [
- true,
- {
- "multiline": "never",
- "singleline": "never"
- }
- ],
- "triple-equals": [
- true,
- "allow-null-check"
- ],
- "typedef": false,
- "typedef-whitespace": [
- true,
- {
- "call-signature": "nospace",
- "index-signature": "nospace",
- "parameter": "nospace",
- "property-declaration": "nospace",
- "variable-declaration": "nospace"
- }
- ],
- "use-strict": false,
- "variable-name": [
- true,
- "check-format",
- "allow-leading-underscore",
- "ban-keywords"
- ],
- "whitespace": [
- true,
- "check-branch",
- "check-operator",
- "check-separator",
- "check-type",
- "check-module",
- "check-decl"
- ]
- }
-}
diff --git a/ng2-components/ng2-alfresco-datatable/webpack.build.js b/ng2-components/ng2-alfresco-datatable/webpack.build.js
new file mode 100644
index 00000000000..29afcdceb94
--- /dev/null
+++ b/ng2-components/ng2-alfresco-datatable/webpack.build.js
@@ -0,0 +1,17 @@
+const webpack = require('webpack');
+const webpackMerge = require('webpack-merge');
+const commonConfig = require('./config/webpack.common.js');
+
+module.exports = webpackMerge(commonConfig, {
+
+ output: {
+ filename: './bundles/[name].js',
+ library: '[name]',
+ libraryTarget: 'umd',
+ chunkFilename: '[id].chunk.js'
+ },
+
+ entry: {
+ "ng2-alfresco-datatable": "./index.ts"
+ }
+});
diff --git a/ng2-components/ng2-alfresco-datatable/webpack.test.js b/ng2-components/ng2-alfresco-datatable/webpack.test.js
new file mode 100644
index 00000000000..b6f4929fa4f
--- /dev/null
+++ b/ng2-components/ng2-alfresco-datatable/webpack.test.js
@@ -0,0 +1,8 @@
+const webpack = require('webpack');
+const webpackMerge = require('webpack-merge');
+const testConfig = require('./config/webpack.test.js');
+
+module.exports = webpackMerge(testConfig, {
+
+
+});
diff --git a/ng2-components/ng2-alfresco-documentlist/.gitignore b/ng2-components/ng2-alfresco-documentlist/.gitignore
index fb23a7fef52..8dd503835e2 100644
--- a/ng2-components/ng2-alfresco-documentlist/.gitignore
+++ b/ng2-components/ng2-alfresco-documentlist/.gitignore
@@ -1,6 +1,7 @@
npm-debug.log
node_modules
.idea
+.npmrc
typings
coverage
dist
diff --git a/ng2-components/ng2-alfresco-documentlist/.npmignore b/ng2-components/ng2-alfresco-documentlist/.npmignore
index 8bb008aff40..cb0b8b2890e 100644
--- a/ng2-components/ng2-alfresco-documentlist/.npmignore
+++ b/ng2-components/ng2-alfresco-documentlist/.npmignore
@@ -1,5 +1,6 @@
npm-debug.log
.idea
+.npmrc
coverage/
demo/
diff --git a/ng2-components/ng2-alfresco-documentlist/README.md b/ng2-components/ng2-alfresco-documentlist/README.md
index a663399537d..ed30263f79f 100644
--- a/ng2-components/ng2-alfresco-documentlist/README.md
+++ b/ng2-components/ng2-alfresco-documentlist/README.md
@@ -192,6 +192,7 @@ The properties currentFolderId, folderNode and node are the entry initialization
| `rowFilter` | `RowFilter` | | Custom row filter, [see more](#custom-row-filter). |
| `imageResolver` | `ImageResolver` | | Custom image resolver, [see more](#custom-image-resolver). |
| `allowDropFiles` | boolean | false | Toggle file drop support for rows (see **ng2-alfresco-core/UploadDirective** for more details) |
+| `sorting` | string[] | | Defines default sorting. The format is an array of 2 strings `[key, direction]` i.e. `['name', 'desc']` or `['name', 'asc']`. Set this value only if you want to override default sorting detected by the component based on columns. |
### Events
@@ -206,6 +207,42 @@ _For a complete example source code please refer to
[DocumentList Demo](https://github.com/Alfresco/alfresco-ng2-components/tree/master/ng2-components/ng2-alfresco-documentlist/demo)
repository._
+### DOM Events
+
+Below are the DOM events the DocumentList component emits.
+All of them are `bubbling`, meaning you can handle them in any component up the parent hierarchy, even if DocumentList is wrapped by another component(s).
+
+| Name | Description |
+| --- | --- |
+| node-click | Raised when user clicks the node |
+| node-dblclick | Raised when user double-clicks the node |
+
+Every event is represented by a [CustomEvent](https://developer.mozilla.org/en/docs/Web/API/CustomEvent) instance, having at least the following properties as part of the `Event.detail` property value:
+
+```ts
+{
+ sender: DocumentListComponent,
+ node: MinimalNodeEntity
+}
+```
+
+#### Handling DOM events
+
+Here's a basic example on handling DOM events in the parent elements:
+
+```html
+++``` + ### Setting default folder You can set current folder path by assigning a value for `currentFolderId` property. @@ -1098,7 +1135,6 @@ npm start | Command | Description | | --- | --- | | npm run build | Build component | -| npm run build:w | Build component and keep watching the changes | | npm run test | Run unit tests in the console | | npm run test-browser | Run unit tests in the browser | npm run coverage | Run unit tests and display code coverage report | diff --git a/ng2-components/ng2-alfresco-documentlist/config/assets/license_header.txt b/ng2-components/ng2-alfresco-documentlist/config/assets/license_header.txt new file mode 100644 index 00000000000..58ad8b656b2 --- /dev/null +++ b/ng2-components/ng2-alfresco-documentlist/config/assets/license_header.txt @@ -0,0 +1,16 @@ +/*! + * @license + * Copyright 2016 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ diff --git a/ng2-components/ng2-alfresco-documentlist/config/assets/license_header_add.txt b/ng2-components/ng2-alfresco-documentlist/config/assets/license_header_add.txt new file mode 100644 index 00000000000..b38baa97165 --- /dev/null +++ b/ng2-components/ng2-alfresco-documentlist/config/assets/license_header_add.txt @@ -0,0 +1,14 @@ +@license +Copyright 2016 Alfresco Software, Ltd. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/ng2-components/ng2-alfresco-documentlist/config/assets/tslint.json b/ng2-components/ng2-alfresco-documentlist/config/assets/tslint.json new file mode 100644 index 00000000000..611a015c7ec --- /dev/null +++ b/ng2-components/ng2-alfresco-documentlist/config/assets/tslint.json @@ -0,0 +1,118 @@ +{ + "rules": { + "align": [ + true, + "parameters", + "statements" + ], + "ban": false, + "class-name": true, + "comment-format": [ + true, + "check-space" + ], + "curly": true, + "eofline": true, + "forin": true, + "indent": [ + true, + "spaces" + ], + "interface-name": false, + "jsdoc-format": true, + "label-position": true, + "max-line-length": [ + true, + 180 + ], + "member-ordering": [ + true, + "static-before-instance", + "variables-before-functions" + ], + "no-any": false, + "no-arg": true, + "no-bitwise": false, + "no-conditional-assignment": true, + "no-consecutive-blank-lines": true, + "no-console": [ + true, + "debug", + "info", + "time", + "timeEnd", + "trace" + ], + "no-construct": true, + "no-constructor-vars": false, + "no-debugger": true, + "no-duplicate-variable": true, + "no-empty": false, + "no-eval": true, + "no-inferrable-types": false, + "no-internal-module": true, + "no-require-imports": false, + "no-shadowed-variable": true, + "no-switch-case-fall-through": true, + "no-trailing-whitespace": true, + "no-unused-expression": true, + "no-unused-variable": true, + "no-use-before-declare": true, + "no-var-keyword": true, + "no-var-requires": true, + "object-literal-sort-keys": false, + "one-line": [ + true, + "check-open-brace", + "check-catch", + "check-else", + "check-whitespace" + ], + "quotemark": [ + true, + "single", + "avoid-escape" + ], + "radix": true, + "semicolon": true, + "switch-default": true, + "trailing-comma": [ + true, + { + "multiline": "never", + "singleline": "never" + } + ], + "triple-equals": [ + true, + "allow-null-check" + ], + "typedef": false, + "typedef-whitespace": [ + true, + { + "call-signature": "nospace", + "index-signature": "nospace", + "parameter": "nospace", + "property-declaration": "nospace", + "variable-declaration": "nospace" + } + ], + "use-strict": false, + "variable-name": [ + true, + "check-format", + "allow-leading-underscore", + "ban-keywords" + ], + "whitespace": [ + true, + "check-branch", + "check-operator", + "check-separator", + "check-type", + "check-module", + "check-decl" + ] + } +} diff --git a/ng2-components/ng2-alfresco-documentlist/config/custom-loaders/file-loader-multi.js b/ng2-components/ng2-alfresco-documentlist/config/custom-loaders/file-loader-multi.js new file mode 100644 index 00000000000..dfbf93e76e0 --- /dev/null +++ b/ng2-components/ng2-alfresco-documentlist/config/custom-loaders/file-loader-multi.js @@ -0,0 +1,70 @@ +var path = require('path'); +var loaderUtils = require('loader-utils'); + +module.exports = function(content) { + this.cacheable && this.cacheable(); + if(!this.emitFile) throw new Error('emitFile is required from module system'); + + var query = loaderUtils.getOptions(this) || {}; + var configKey = query.config || 'multiFileLoader'; + var options = this.options[configKey] || {}; + var config = { + publicPath: false, + useRelativePath: false, + name: '[hash].[ext]' + }; + + // options takes precedence over config + Object.keys(options).forEach(function(attr) { + config[attr] = options[attr]; + }); + + // query takes precedence over config and options + Object.keys(query).forEach(function(attr) { + config[attr] = query[attr]; + }); + + var context = config.context || this.options.context; + var url = loaderUtils.interpolateName(this, config.name, { + context: context, + content: content, + regExp: config.regExp + }); + var path = loaderUtils.interpolateName(this, '[path]', { + context: context, + content: content, + regExp: config.regExp + }); + + var outputPath = ''; + + if (config.outputPath) { + outputPath = ( + typeof config.outputPath === 'function' + ? config.outputPath(url, path) + : config.outputPath + url + ); + } else { + outputPath = url; + } + + var publicPath = JSON.stringify(url); + + if (config.publicPath) { + publicPath = JSON.stringify( + typeof config.publicPath === 'function' + ? config.publicPath(url, path) + : config.publicPath + url + ); + } + + publicPath = '__webpack_public_path__ + ' + publicPath; + + if (query.emitFile === undefined || query.emitFile) { + this.emitFile(outputPath, content); + } + + return 'module.exports = ' + publicPath + ';'; +}; + +module.exports.raw = true; diff --git a/ng2-components/ng2-alfresco-documentlist/config/custom-loaders/license-check.js b/ng2-components/ng2-alfresco-documentlist/config/custom-loaders/license-check.js new file mode 100644 index 00000000000..6a15ac03e2a --- /dev/null +++ b/ng2-components/ng2-alfresco-documentlist/config/custom-loaders/license-check.js @@ -0,0 +1,67 @@ +var path = require('path'); +var loaderUtils = require('loader-utils'); +var fs = require('fs'); + +var licenseFileUtf8Store = undefined; + +function readLicenseHeaderFile(licenseFilePath) { + if (licenseFileUtf8Store) { + return licenseFileUtf8Store; + } + + if (fs.existsSync(licenseFilePath)) { + licenseFileUtf8Store = fs.readFileSync(licenseFilePath, 'utf8').split(/\r?\n/); + return licenseFileUtf8Store; + } + + throw new Error('The license header file path is wrong ' + licenseFilePath); +} + +function isFileEmpty(fileContents) { + return fileContents.toString('utf8').trim() === ''; +} + +function readCurrentFile(fileContent) { + return fileContent.toString('utf8').split(/\r?\n/); +} + +function isLicenseHeaderPresent(currentFileContent, licenseFilePath) { + if (!isFileEmpty(currentFileContent)) { + var currentFileUtf8 = readCurrentFile(currentFileContent), + licenseFileUtf8 = readLicenseHeaderFile(licenseFilePath); + skipStrict = 0; + + if(currentFileUtf8[0] === '"use strict";' ) { + skipStrict = 1; + } + + for (var i = skipStrict; i < licenseFileUtf8.length; i++) { + if (currentFileUtf8[i + skipStrict] !== licenseFileUtf8[i]) { + return false; + } + } + } + return true; +} + +function report(hasHeader, emitter, filename) { + if (hasHeader) return; + emitter('Missing license header file : ' + filename); +} + +function licenseCheck(webpackInstance, input, options) { + var isLicensePresent = isLicenseHeaderPresent(input, options.licenseFile); + + var emitter = options.emitErrors ? webpackInstance.emitError : webpackInstance.emitWarning; + + report(isLicensePresent, emitter, webpackInstance.resourcePath); +} + +module.exports = function(input, map) { + this.cacheable && this.cacheable(); + var callback = this.async(); + + var options = loaderUtils.getOptions(this); + licenseCheck(this, input, options); + callback(null, input, map); +}; diff --git a/ng2-components/ng2-alfresco-documentlist/config/helpers.js b/ng2-components/ng2-alfresco-documentlist/config/helpers.js new file mode 100644 index 00000000000..a11fa771d6c --- /dev/null +++ b/ng2-components/ng2-alfresco-documentlist/config/helpers.js @@ -0,0 +1,10 @@ +var path = require('path'); + +var _root = path.resolve(__dirname, '..'); + +function root(args) { + args = Array.prototype.slice.call(arguments, 0); + return path.join.apply(path, [_root].concat(args)); +} + +exports.root = root; diff --git a/ng2-components/ng2-alfresco-documentlist/config/webpack.common.js b/ng2-components/ng2-alfresco-documentlist/config/webpack.common.js new file mode 100644 index 00000000000..52a680e87e4 --- /dev/null +++ b/ng2-components/ng2-alfresco-documentlist/config/webpack.common.js @@ -0,0 +1,124 @@ +const webpack = require('webpack'); +const helpers = require('./helpers'); +const fs = require('fs'); +const path = require('path'); + +module.exports = { + + resolveLoader: { + alias: { + "file-multi-loader": path.resolve(__dirname, "./custom-loaders/file-loader-multi"), + "license-check": path.resolve(__dirname, "./custom-loaders/license-check") + } + }, + + // require those dependencies but don't bundle them + externals: [ + /^\@angular\//, + /^rxjs\//, + 'moment', + 'raphael', + 'ng2-charts', + 'alfresco-js-api', + 'ng2-alfresco-core', + 'ng2-alfresco-datatable', + 'ng2-activiti-analytics', + 'ng2-activiti-diagrams', + 'ng2-activiti-form', + "ng2-activiti-tasklist", + 'ng2-alfresco-documentlist' + ], + + module: { + rules: [ + { + enforce: 'pre', + test: /\.js$/, + loader: 'source-map-loader', + exclude: [/node_modules/, /bundles/, /dist/, /demo/] + }, + { + enforce: 'pre', + test: /\.ts$/, + use: 'source-map-loader', + exclude: [/node_modules/, /bundles/, /dist/, /demo/] + }, + { + enforce: 'pre', + test: /\.ts$/, + loader: 'tslint-loader', + options: { + emitErrors: true, + configFile: path.resolve(__dirname, './assets/tslint.json') + }, + exclude: [/node_modules/, /bundles/, /dist/, /demo/] + }, + { + test: /\.ts$/, + use: ['ts-loader', 'angular2-template-loader'], + exclude: [/node_modules/, /bundles/, /dist/, /demo/] + }, + { + test: /\.html$/, + loader: 'html-loader', + exclude: [/node_modules/, /bundles/, /dist/, /demo/] + }, + { + test: /\.css$/, + loader: ['to-string-loader', 'css-loader'], + exclude: [/node_modules/, /bundles/, /dist/, /demo/] + },{ + enforce: 'pre', + test: /\.ts$/, + loader: 'license-check', + options: { + emitErrors: true, + licenseFile: path.resolve(__dirname, './assets/license_header.txt') + }, + exclude: [/node_modules/, /bundles/, /dist/, /demo/, /rendering-queue.services.ts/ ], + }, + { + test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)$/, + loader: 'file-multi-loader', + query: { + name: '[name].[hash].[ext]', + outputPath: (url, resourcePath)=> { + return resourcePath.replace('src', 'bundles') + url; + }, + publicPath: (url, resourcePath)=> { + var component = resourcePath.substring(0, resourcePath.indexOf('src')); + var path = resourcePath.replace(component, '').replace('src/', ''); + return path + url; + } + } + } + ] + }, + + resolve: { + extensions: ['.ts', '.js'], + symlinks: false, + modules: [ + '../ng2-components', 'node_modules' + ] + }, + + plugins: [ + new webpack.NoEmitOnErrorsPlugin(), + + new webpack.BannerPlugin(fs.readFileSync(path.resolve(__dirname, './assets/license_header_add.txt'), 'utf8')), + + new webpack.ContextReplacementPlugin( + /angular(\\|\/)core(\\|\/)@angular/, + helpers.root('./src'), + {} + ) + ], + + devtool: 'cheap-module-source-map', + + node: { + fs: 'empty', + module: false + } +}; diff --git a/ng2-components/ng2-alfresco-documentlist/config/webpack.test.js b/ng2-components/ng2-alfresco-documentlist/config/webpack.test.js new file mode 100644 index 00000000000..486fed8c159 --- /dev/null +++ b/ng2-components/ng2-alfresco-documentlist/config/webpack.test.js @@ -0,0 +1,85 @@ +const webpack = require('webpack'); +const helpers = require('./helpers'); + +const ENV = process.env.NODE_ENV = process.env.ENV = 'production'; + +module.exports = { + + devtool: 'inline-source-map', + + resolve: { + extensions: ['.ts', '.js'], + symlinks: false, + modules: [helpers.root('../ng2-components'), helpers.root('node_modules')] + }, + + module: { + rules: [ + { + enforce: 'pre', + test: /\.js$/, + loader: 'source-map-loader', + exclude: [/node_modules/, /bundles/, /dist/, /demo/] + }, + { + test: /\.ts$/, + loaders: ['ts-loader?' + JSON.stringify({ transpileOnly: true}), 'angular2-template-loader'], + exclude: [/node_modules/, /bundles/, /dist/, /demo/] + }, + { + test: /\.html$/, + loader: 'html-loader', + exclude: [/node_modules/, /bundles/, /dist/, /demo/] + }, + { + test: /\.css$/, + loader: ['to-string-loader', 'css-loader'], + exclude: [/node_modules/, /bundles/, /dist/, /demo/] + }, + { + test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico|pdf)$/, + loader: 'file-loader', + query: { + name: '[path][name].[ext]', + outputPath: (url)=> { + return url.replace('src', 'dist'); + } + } + }, + { + enforce: 'post', + test: /\.ts$/, + loader: 'istanbul-instrumenter-loader', + exclude: [ + /node_modules/, + /test/ + ] + } + ] + }, + + plugins: [ + new webpack.NoEmitOnErrorsPlugin(), + + new webpack.ContextReplacementPlugin( + /angular(\\|\/)core(\\|\/)@angular/, + helpers.root('./src'), + {} + ), + new webpack.DefinePlugin({ + 'process.env': { + 'ENV': JSON.stringify(ENV) + } + }), + new webpack.LoaderOptionsPlugin({ + htmlLoader: { + minimize: false // workaround for ng2 + } + }) + ], + + node: { + fs: 'empty', + module: false + } +}; diff --git a/ng2-components/ng2-alfresco-documentlist/demo/package.json b/ng2-components/ng2-alfresco-documentlist/demo/package.json index 32251822d01..6e15b9c75c5 100644 --- a/ng2-components/ng2-alfresco-documentlist/demo/package.json +++ b/ng2-components/ng2-alfresco-documentlist/demo/package.json @@ -5,41 +5,43 @@ "author": "Alfresco Software, Ltd.", "main": "index.js", "scripts": { - "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings dist", + "clean": "npm run clean-build && rimraf dist node_modules typings dist", "clean-build" : "rimraf 'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts'", "postinstall": "npm run build", "start": "npm run build && concurrently \"npm run tsc:w\" \"npm run server\" ", "server": "wsrv -o -s -l", "build": "npm run tslint && npm run clean-build && npm run tsc", "build:w": "npm run tslint && rimraf dist && npm run tsc:w", - "travis": "npm link ng2-alfresco-core ng2-alfresco-datatable", + "travis": "npm link ng2-alfresco-core ng2-alfresco-datatable ng2-alfresco-documentlist", "tsc": "tsc", "tsc:w": "tsc -w", "tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts -e '{,**/}**.d.ts'" }, "license": "Apache-2.0", "dependencies": { - "@angular/common": "2.2.2", - "@angular/compiler": "2.2.2", - "@angular/compiler-cli": "2.2.2", - "@angular/core": "2.2.2", - "@angular/forms": "2.2.2", - "@angular/http": "2.2.2", - "@angular/platform-browser": "2.2.2", - "@angular/platform-browser-dynamic": "2.2.2", + "@angular/animations": "~4.0.0", + "@angular/common": "~4.0.0", + "@angular/compiler": "~4.0.0", + "@angular/core": "~4.0.0", + "@angular/forms": "~4.0.0", + "@angular/http": "~4.0.0", + "@angular/platform-browser": "~4.0.0", + "@angular/platform-browser-dynamic": "~4.0.0", + "@angular/router": "~4.0.0", + "@angular/material": "2.0.0-beta.1", - "@angular/router": "3.2.2", - "@angular/upgrade": "2.2.2", + "alfresco-js-api": "~1.5.0", "core-js": "2.4.1", + "hammerjs": "2.0.8", + "ng2-alfresco-core": "1.5.0", + "ng2-translate": "5.0.0", "reflect-metadata": "0.1.10", - "rxjs": "5.0.0-beta.12", + "rxjs": "5.1.0", "systemjs": "0.19.27", - "zone.js": "0.6.26", - "ng2-translate": "2.5.0", - "alfresco-js-api": "~1.4.0", - "ng2-alfresco-core": "1.4.0", - "ng2-alfresco-datatable": "1.4.0", - "ng2-alfresco-documentlist": "1.4.0", + "zone.js": "0.7.6", + + "ng2-alfresco-datatable": "1.5.0", + "ng2-alfresco-documentlist": "1.5.0", "material-design-icons": "2.2.3", "material-design-lite": "1.2.1", "intl": "^1.2.5" diff --git a/ng2-components/ng2-alfresco-documentlist/demo/systemjs.config.js b/ng2-components/ng2-alfresco-documentlist/demo/systemjs.config.js index bfb3f615bff..cc70793519d 100644 --- a/ng2-components/ng2-alfresco-documentlist/demo/systemjs.config.js +++ b/ng2-components/ng2-alfresco-documentlist/demo/systemjs.config.js @@ -22,6 +22,9 @@ '@angular/router': 'npm:@angular/router/bundles/router.umd.js', '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js', '@angular/material': 'npm:@angular/material/bundles/material.umd.js', + '@angular/animations': 'npm:@angular/animations/bundles/animations.umd.min.js', + '@angular/animations/browser':'npm:@angular/animations/bundles/animations-browser.umd.js', + '@angular/platform-browser/animations': 'npm:@angular/platform-browser/bundles/platform-browser-animations.umd.js', // other libraries 'rxjs': 'npm:rxjs', @@ -40,11 +43,11 @@ rxjs: { defaultExtension: 'js' }, - 'ng2-translate': { defaultExtension: 'js' }, - 'alfresco-js-api': { main: './alfresco-js-api.js', defaultExtension: 'js'}, - 'ng2-alfresco-core': { main: './index.js', defaultExtension: 'js'}, - 'ng2-alfresco-datatable': { main: './index.js', defaultExtension: 'js'}, - 'ng2-alfresco-documentlist': { main: './index.js', defaultExtension: 'js'} + 'ng2-translate': {defaultExtension: 'js'}, + 'alfresco-js-api': {main: './alfresco-js-api.js', defaultExtension: 'js'}, + 'ng2-alfresco-core': {main: './bundles/ng2-alfresco-core.js', defaultExtension: 'js'}, + 'ng2-alfresco-datatable': {main: './bundles/ng2-alfresco-datatable.js', defaultExtension: 'js'}, + 'ng2-alfresco-documentlist': {main: './bundles/ng2-alfresco-documentlist.js', defaultExtension: 'js'} } }); })(this); diff --git a/ng2-components/ng2-alfresco-documentlist/demo/tslint.json b/ng2-components/ng2-alfresco-documentlist/demo/tslint.json index 54ed5e7fc2e..8e3f8b16ac1 100644 --- a/ng2-components/ng2-alfresco-documentlist/demo/tslint.json +++ b/ng2-components/ng2-alfresco-documentlist/demo/tslint.json @@ -35,7 +35,7 @@ ], "no-any": false, "no-arg": true, - "no-bitwise": true, + "no-bitwise": false, "no-conditional-assignment": true, "no-consecutive-blank-lines": true, "no-console": [ @@ -51,11 +51,11 @@ "no-debugger": true, "no-duplicate-key": true, "no-duplicate-variable": true, - "no-empty": true, + "no-empty": false, "no-eval": true, "no-inferrable-types": false, "no-internal-module": true, - "no-require-imports": true, + "no-require-imports": false, "no-shadowed-variable": true, "no-switch-case-fall-through": true, "no-trailing-whitespace": true, diff --git a/ng2-components/ng2-alfresco-documentlist/gulpfile.ts b/ng2-components/ng2-alfresco-documentlist/gulpfile.ts deleted file mode 100755 index ebf8207f0d2..00000000000 --- a/ng2-components/ng2-alfresco-documentlist/gulpfile.ts +++ /dev/null @@ -1,307 +0,0 @@ -import * as gulp from 'gulp'; -import * as util from 'gulp-util'; -import * as runSequence from 'run-sequence'; -import * as gulpLoadPlugins from 'gulp-load-plugins'; -import * as merge from 'merge-stream'; -import * as rimraf from 'rimraf'; -import { join } from 'path'; -import * as Builder from 'systemjs-builder'; -var autoprefixer = require('autoprefixer'); -import * as cssnano from 'cssnano'; -import * as filter from 'gulp-filter'; -import * as sourcemaps from 'gulp-sourcemaps'; - -var APP_SRC = `.`; -var CSS_PROD_BUNDLE = 'main.css'; -var JS_PROD_SHIMS_BUNDLE = 'shims.js'; -var NG_FACTORY_FILE = 'main-prod'; - -const BUILD_TYPES = { - DEVELOPMENT: 'dev', - PRODUCTION: 'prod' -}; - -function normalizeDependencies(deps) { - deps - .filter((d) => !/\*/.test(d.src)) // Skip globs - .forEach((d) => d.src = require.resolve(d.src)); - return deps; -} - -function filterDependency(type: string, d): boolean { - const t = d.buildType || d.env; - d.buildType = t; - if (!t) { - d.buildType = Object.keys(BUILD_TYPES).map(k => BUILD_TYPES[k]); - } - if (!(d.buildType instanceof Array)) { - (++
+ ++ ... + +d).env = [d.buildType]; - } - return d.buildType.indexOf(type) >= 0; -} - -function getInjectableDependency() { - var APP_ASSETS = [ - {src: `src/css/main.css`, inject: true, vendor: false}, - ]; - - var NPM_DEPENDENCIES = [ - {src: 'zone.js/dist/zone.js', inject: 'libs'}, - {src: 'core-js/client/shim.min.js', inject: 'shims'}, - {src: 'systemjs/dist/system.src.js', inject: 'shims', buildType:'dev'} - ]; - - return normalizeDependencies(NPM_DEPENDENCIES.filter(filterDependency.bind(null, 'dev'))) - .concat(APP_ASSETS.filter(filterDependency.bind(null, 'dev'))); -} - -const plugins = gulpLoadPlugins(); - -let tsProjects: any = {}; - -function makeTsProject(options: Object = {}) { - let optionsHash = JSON.stringify(options); - if (!tsProjects[optionsHash]) { - let config = Object.assign({ - typescript: require('typescript') - }, options); - tsProjects[optionsHash] = - plugins.typescript.createProject('tsconfig.json', config); - } - return tsProjects[optionsHash]; -} - -gulp.task('build.html_css', () => { - const gulpConcatCssConfig = { - targetFile: CSS_PROD_BUNDLE, - options: { - rebaseUrls: false - } - }; - - const processors = [ - autoprefixer({ - browsers: [ - 'ie >= 10', - 'ie_mob >= 10', - 'ff >= 30', - 'chrome >= 34', - 'safari >= 7', - 'opera >= 23', - 'ios >= 7', - 'android >= 4.4', - 'bb >= 10' - ] - }) - ]; - - const reportPostCssError = (e: any) => util.log(util.colors.red(e.message)); - - processors.push( - cssnano({ - discardComments: {removeAll: true}, - discardUnused: false, // unsafe, see http://goo.gl/RtrzwF - zindex: false, // unsafe, see http://goo.gl/vZ4gbQ - reduceIdents: false // unsafe, see http://goo.gl/tNOPv0 - }) - ); - - /** - * Processes the CSS files within `src/client` excluding those in `src/client/assets` using `postcss` with the - * configured processors - * Execute the appropriate component-stylesheet processing method based on user stylesheet preference. - */ - function processComponentStylesheets() { - return gulp.src(join('src/**', '*.css')) - .pipe(plugins.cached('process-component-css')) - .pipe(plugins.postcss(processors)) - .on('error', reportPostCssError); - } - - - /** - * Get a stream of external css files for subsequent processing. - */ - function getExternalCssStream() { - return gulp.src(getExternalCss()) - .pipe(plugins.cached('process-external-css')); - } - - /** - * Get an array of filenames referring to all external css stylesheets. - */ - function getExternalCss() { - return getInjectableDependency().filter(dep => /\.css$/.test(dep.src)).map(dep => dep.src); - } - - /** - * Processes the external CSS files using `postcss` with the configured processors. - */ - function processExternalCss() { - return getExternalCssStream() - .pipe(plugins.postcss(processors)) - .pipe(plugins.concatCss(gulpConcatCssConfig.targetFile, gulpConcatCssConfig.options)) - .on('error', reportPostCssError); - } - - return merge(processComponentStylesheets(), processExternalCss()); - -}); - -gulp.task('build.bundles.app', (done) => { - var BUNDLER_OPTIONS = { - format: 'umd', - minify: false, - mangle: false, - sourceMaps: true - }; - var CONFIG_TYPESCRIPT = { - baseURL: '.', - transpiler: 'typescript', - typescriptOptions: { - module: 'cjs' - }, - map: { - typescript: 'node_modules/typescript/lib/typescript.js', - '@angular': 'node_modules/@angular', - rxjs: 'node_modules/rxjs', - 'ng2-translate': 'node_modules/ng2-translate', - 'alfresco-js-api': 'node_modules/alfresco-js-api/dist/alfresco-js-api', - 'ng2-alfresco-core': 'node_modules/ng2-alfresco-core/', - 'ng2-activiti-diagrams': 'node_modules/ng2-activiti-diagrams/', - 'ng2-activiti-analytics': 'node_modules/ng2-activiti-analytics/', - 'ng2-alfresco-datatable': 'node_modules/ng2-alfresco-datatable/', - 'ng2-alfresco-documentlist': 'node_modules/ng2-alfresco-documentlist/', - 'ng2-activiti-form': 'node_modules/ng2-activiti-form/', - 'ng2-alfresco-login': 'node_modules/ng2-alfresco-login/', - 'ng2-activiti-processlist': 'node_modules/ng2-activiti-processlist/', - 'ng2-alfresco-search': 'node_modules/ng2-alfresco-search/', - 'ng2-activiti-tasklist': 'node_modules/ng2-activiti-tasklist/', - 'ng2-alfresco-tag': 'node_modules/ng2-alfresco-tag/', - 'ng2-alfresco-upload': 'node_modules/ng2-alfresco-upload/', - 'ng2-alfresco-userinfo': 'node_modules/ng2-alfresco-userinfo/', - 'ng2-alfresco-viewer': 'node_modules/ng2-alfresco-viewer/', - 'ng2-alfresco-webscript': 'node_modules/ng2-alfresco-webscript/' - }, - paths: { - '*': '*.js' - }, - meta: { - 'node_modules/@angular/*': {build: false}, - 'node_modules/rxjs/*': {build: false}, - 'node_modules/ng2-translate/*': {build: false}, - 'node_modules/ng2-alfresco-core/*': {build: false}, - 'node_modules/ng2-activiti-diagrams/*': {build: false}, - 'node_modules/ng2-activiti-analytics/*': {build: false}, - 'node_modules/ng2-alfresco-datatable/*': {build: false}, - 'node_modules/ng2-alfresco-documentlist/*': {build: false}, - 'node_modules/ng2-activiti-form/*': {build: false}, - 'node_modules/ng2-alfresco-login/*': {build: false}, - 'node_modules/ng2-activiti-processlist/*': {build: false}, - 'node_modules/ng2-alfresco-search/*': {build: false}, - 'node_modules/ng2-activiti-tasklist/*': {build: false}, - 'node_modules/ng2-alfresco-tag/*': {build: false}, - 'node_modules/ng2-alfresco-upload/*': {build: false}, - 'node_modules/ng2-alfresco-userinfo/*': {build: false}, - 'node_modules/ng2-alfresco-viewer/*': {build: false}, - 'node_modules/ng2-alfresco-webscript/*': {build: false} - } - }; - - var pkg = require('./package.json'); - var namePkg = pkg.name; - - var builder = new Builder(CONFIG_TYPESCRIPT); - builder - .buildStatic(APP_SRC + "/index", 'bundles/' + namePkg + '.js', BUNDLER_OPTIONS) - .then(function () { - return done(); - }) - .catch(function (err) { - return done(err); - }); -}); - -gulp.task('build.assets.prod', () => { - return gulp.src([ - join('src/**', '*.ts'), - 'index.ts', - join('src/**', '*.css'), - join('src/**', '*.html'), - '!'+join('*/**', '*.d.ts'), - '!'+join('*/**', '*.spec.ts'), - '!gulpfile.ts']) - -}); - -gulp.task('build.bundles', () => { - merge(bundleShims()); - - /** - * Returns the shim files to be injected. - */ - function getShims() { - let libs = getInjectableDependency() - .filter(d => /\.js$/.test(d.src)); - - return libs.filter(l => l.inject === 'shims') - .concat(libs.filter(l => l.inject === 'libs')) - .concat(libs.filter(l => l.inject === true)) - .map(l => l.src); - } - - /** - * Bundles the shim files. - */ - function bundleShims() { - return gulp.src(getShims()) - .pipe(plugins.concat(JS_PROD_SHIMS_BUNDLE)) - // Strip the first (global) 'use strict' added by reflect-metadata, but don't strip any others to avoid unintended scope leaks. - .pipe(plugins.replace(/('|")use strict\1;var Reflect;/, 'var Reflect;')) - .pipe(gulp.dest('bundles')); - } - -}); - -gulp.task('build.js.prod', () => { - const INLINE_OPTIONS = { - base: APP_SRC, - target: 'es5', - useRelativePaths: true, - removeLineBreaks: true - }; - - let tsProject = makeTsProject(); - let src = [ - join('src/**/*.ts'), - join('!src/**/*.d.ts'), - join('!src/**/*.spec.ts'), - `!src/**/${NG_FACTORY_FILE}.ts` - ]; - - let result = gulp.src(src) - .pipe(plugins.plumber()) - .pipe(plugins.inlineNg2Template(INLINE_OPTIONS)) - .pipe(sourcemaps.init()) - .pipe(tsProject()) - .once('error', function (e: any) { - this.once('finish', () => process.exit(1)); - }); - - return result.js - .pipe(plugins.template()) - .pipe(sourcemaps.write()) - .pipe(gulp.dest('src')) - .on('error', (e: any) => { - console.log(e); - }); -}); - -gulp.task('build.prod', (done: any) => - runSequence( - 'build.assets.prod', - 'build.html_css', - 'build.js.prod', - 'build.bundles', - 'build.bundles.app', - done)); diff --git a/ng2-components/ng2-alfresco-documentlist/karma-test-shim.js b/ng2-components/ng2-alfresco-documentlist/karma-test-shim.js index a8e0869510e..64b94c4ab5e 100644 --- a/ng2-components/ng2-alfresco-documentlist/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-documentlist/karma-test-shim.js @@ -1,117 +1,25 @@ -// Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -jasmine.DEFAULT_TIMEOUT_INTERVAL = 100000; +require('core-js/es6'); +require('core-js/es7/reflect'); -window.componentHandler = { - upgradeAllRegistered: function () { - }, - upgradeElement: function () { - } -}; +require('zone.js/dist/zone'); +require('zone.js/dist/long-stack-trace-zone'); +require('zone.js/dist/proxy'); +require('zone.js/dist/sync-test'); +require('zone.js/dist/jasmine-patch'); +require('zone.js/dist/async-test'); +require('zone.js/dist/fake-async-test'); -__karma__.loaded = function() {}; +jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000; -var builtPath = '/base/src/'; +var appContext = require.context('./src', true, /\.spec\.ts/); +appContext.keys().forEach(appContext); -function isJsFile(path) { - return path.slice(-3) == '.js'; -} -function isSpecFile(path) { - return /\.spec\.(.*\.)?js$/.test(path); -} +var testing = require('@angular/core/testing'); +var browser = require('@angular/platform-browser-dynamic/testing'); -function isBuiltFile(path) { - return isJsFile(path) && (path.substr(0, builtPath.length) == builtPath); -} +testing.TestBed.initTestEnvironment(browser.BrowserDynamicTestingModule, browser.platformBrowserDynamicTesting()); -var allSpecFiles = Object.keys(window.__karma__.files) - .filter(isSpecFile) - .filter(isBuiltFile); -var paths = { - // paths serve as alias - 'npm:': 'base/node_modules/' -}; - -var map = { - 'app': 'base/src', - // angular bundles - '@angular/core': 'npm:@angular/core/bundles/core.umd.js', - '@angular/common': 'npm:@angular/common/bundles/common.umd.js', - '@angular/compiler': 'npm:@angular/compiler/bundles/compiler.umd.js', - '@angular/platform-browser': 'npm:@angular/platform-browser/bundles/platform-browser.umd.js', - '@angular/platform-browser-dynamic': 'npm:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js', - '@angular/http': 'npm:@angular/http/bundles/http.umd.js', - '@angular/router': 'npm:@angular/router/bundles/router.umd.js', - '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js', - '@angular/material': 'npm:@angular/material/bundles/material.umd.js', - - // testing - '@angular/core/testing': 'npm:@angular/core/bundles/core-testing.umd.js', - '@angular/common/testing': 'npm:@angular/common/bundles/common-testing.umd.js', - '@angular/compiler/testing': 'npm:@angular/compiler/bundles/compiler-testing.umd.js', - '@angular/platform-browser/testing': 'npm:@angular/platform-browser/bundles/platform-browser-testing.umd.js', - '@angular/platform-browser-dynamic/testing': 'npm:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic-testing.umd.js', - '@angular/http/testing': 'npm:@angular/http/bundles/http-testing.umd.js', - '@angular/router/testing': 'npm:@angular/router/bundles/router-testing.umd.js', - '@angular/forms/testing': 'npm:@angular/forms/bundles/forms-testing.umd.js', - - // other libraries - 'rxjs': 'npm:rxjs', - 'ng2-translate': 'npm:ng2-translate', - 'hammerjs': 'npm:hammerjs', - - 'alfresco-js-api': 'npm:alfresco-js-api/dist', - 'ng2-alfresco-core': 'npm:ng2-alfresco-core', - 'ng2-alfresco-datatable': 'npm:ng2-alfresco-datatable' -}; - -var packages = { - 'app': { main: 'main.js', defaultExtension: 'js' }, - 'rxjs': { defaultExtension: 'js' }, - 'ng2-translate': { defaultExtension: 'js' }, - 'hammerjs': {main: './hammerjs.js', defaultExtension: 'js'}, - - 'alfresco-js-api': { main: './alfresco-js-api.js', defaultExtension: 'js'}, - 'ng2-alfresco-core': { main: './index.js', defaultExtension: 'js'}, - 'ng2-alfresco-datatable': { main: './index.js', defaultExtension: 'js'} -}; - -var config = { - paths: paths, - map: map, - packages: packages -}; - -System.config(config); - -System.import('@angular/core/testing') - .then(initTestBed) - .then(initTesting); - -function initTestBed(){ - return Promise.all([ - System.import('@angular/core/testing'), - System.import('@angular/platform-browser-dynamic/testing') - ]) - .then(function (providers) { - var coreTesting = providers[0]; - var browserTesting = providers[1]; - - coreTesting.TestBed.initTestEnvironment( - browserTesting.BrowserDynamicTestingModule, - browserTesting.platformBrowserDynamicTesting()); - }) -} - -// Import all spec files and start karma -function initTesting () { - return Promise.all( - allSpecFiles.map(function (moduleName) { - return System.import(moduleName); - }) - ) - .then(__karma__.start, __karma__.error); -} diff --git a/ng2-components/ng2-alfresco-documentlist/karma.conf.js b/ng2-components/ng2-alfresco-documentlist/karma.conf.js index fe1de2aada0..8c0e83bd7e1 100644 --- a/ng2-components/ng2-alfresco-documentlist/karma.conf.js +++ b/ng2-components/ng2-alfresco-documentlist/karma.conf.js @@ -1,71 +1,36 @@ -'use strict'; +var webpackConfig = require('./webpack.test'); module.exports = function (config) { - var configuration = { + var _config = { basePath: '.', frameworks: ['jasmine-ajax', 'jasmine'], files: [ - // System.js for module loading - 'node_modules/systemjs/dist/system.src.js', - - // Polyfills - 'node_modules/core-js/client/shim.js', - 'node_modules/reflect-metadata/Reflect.js', - - // zone.js - 'node_modules/zone.js/dist/zone.js', - 'node_modules/zone.js/dist/long-stack-trace-zone.js', - 'node_modules/zone.js/dist/proxy.js', - 'node_modules/zone.js/dist/sync-test.js', - 'node_modules/zone.js/dist/jasmine-patch.js', - 'node_modules/zone.js/dist/async-test.js', - 'node_modules/zone.js/dist/fake-async-test.js', - 'node_modules/hammerjs/hammer.js', - - // RxJs - { pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false }, - { pattern: 'node_modules/rxjs/**/*.js.map', included: false, watched: false }, - - // Paths loaded via module imports: - // Angular itself - {pattern: 'node_modules/@angular/**/*.js', included: false, watched: false}, - {pattern: 'node_modules/@angular/**/*.js.map', included: false, watched: false}, - - 'node_modules/alfresco-js-api/dist/alfresco-js-api.js', - - {pattern: 'node_modules/ng2-translate/**/*.js', included: false, watched: false}, - - 'karma-test-shim.js', - - // paths loaded via module imports - {pattern: 'src/**/*.js', included: false, watched: true}, - {pattern: 'src/**/*.html', included: true, served: true, watched: true}, - {pattern: 'src/**/*.css', included: true, served: true, watched: true}, - - - // ng2-components - { pattern: 'node_modules/ng2-alfresco-core/src/**/*.js', included: false, served: true, watched: false }, - { pattern: 'node_modules/ng2-alfresco-core/index.js', included: false, served: true, watched: false }, - - { pattern: 'node_modules/ng2-alfresco-datatable/src/**/*.js', included: false, served: true, watched: false }, - { pattern: 'node_modules/ng2-alfresco-datatable/index.js', included: false, served: true, watched: false }, - { pattern: 'src/assets/images/empty_doc_lib.svg', included: false, served: true, watched: false }, - - // paths to support debugging with source maps in dev tools - {pattern: 'src/**/*.ts', included: false, watched: false}, - {pattern: 'src/**/*.js.map', included: false, watched: false} + './node_modules/hammerjs/hammer.js', + + //diagrams + './node_modules/chart.js/dist/Chart.js', + './node_modules/alfresco-js-api/dist/alfresco-js-api.js', + './node_modules/raphael/raphael.js', + './node_modules/moment/min/moment.min.js', + './node_modules/md-date-time-picker/dist/js/mdDateTimePicker.js', + + {pattern: './node_modules/ng2-translate/**/*.js', included: false, watched: false}, + {pattern: './node_modules/ng2-charts/**/*.js', included: false, served: true, watched: false}, + {pattern: './node_modules/md-date-time-picker/**/*.js', included: false, served: true, watched: false}, + {pattern: './node_modules/moment/**/*.js', included: false, served: true, watched: false}, + + {pattern: 'karma-test-shim.js', watched: false}, + {pattern: './src/assets/**/*.*', included: false, served: true, watched: false}, + {pattern: './src/i18n/**/*.*', included: false, served: true, watched: false}, + {pattern: './src/**/*.ts', included: false, served: true, watched: false} ], - exclude: [ - 'node_modules/**/*spec.js' - ], + webpack: webpackConfig, - // proxied base paths - proxies: { - // required for component assets fetched by Angular's compiler - '/src/': '/base/src/' + webpackMiddleware: { + stats: 'errors-only' }, port: 9876, @@ -94,29 +59,35 @@ module.exports = function (config) { // Karma plugins loaded plugins: [ - 'karma-jasmine', - 'karma-coverage', - 'karma-jasmine-ajax', - 'karma-chrome-launcher', - 'karma-mocha-reporter', - 'karma-jasmine-html-reporter' + require('./node_modules/karma-jasmine'), + require('./node_modules/karma-coverage'), + require('./node_modules/karma-sourcemap-loader'), + require('./node_modules/karma-jasmine-ajax'), + require('./node_modules/karma-chrome-launcher'), + require('./node_modules/karma-mocha-reporter'), + require('./node_modules/karma-webpack'), + require('./node_modules/karma-jasmine-html-reporter') ], + webpackServer: { + noInfo: true + }, + // Coverage reporter generates the coverage reporters: ['mocha', 'coverage', 'kjhtml'], - // Source files that you wanna generate coverage for. - // Do not include tests or libraries (these files will be instrumented by Istanbul) preprocessors: { - 'src/**/!(*spec|index|*mock|*model|*event).js': 'coverage' + 'karma-test-shim.js': ['webpack', 'sourcemap'], + './src/**/!(*spec|index|*mock|*model|*event).js': 'coverage' }, coverageReporter: { includeAllSources: true, - dir: 'coverage/', + dir: 'coverage', subdir: 'report', reporters: [ {type: 'text'}, + {type: 'text-summary'}, {type: 'json', file: 'coverage-final.json'}, {type: 'html'}, {type: 'lcov'} @@ -125,8 +96,8 @@ module.exports = function (config) { }; if (process.env.TRAVIS) { - configuration.browsers = ['Chrome_travis_ci']; + config.browsers = ['Chrome_travis_ci']; } - config.set(configuration) + config.set(_config); }; diff --git a/ng2-components/ng2-alfresco-documentlist/package.json b/ng2-components/ng2-alfresco-documentlist/package.json index 8fb0f3a01b6..05dfd9a5c8b 100644 --- a/ng2-components/ng2-alfresco-documentlist/package.json +++ b/ng2-components/ng2-alfresco-documentlist/package.json @@ -1,30 +1,18 @@ { "name": "ng2-alfresco-documentlist", "description": "Alfresco Angular2 Document List Component", - "version": "1.4.0", + "version": "1.5.0", "author": "Alfresco Software, Ltd.", "scripts": { - "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", - "clean-build": "rimraf index.js index.js.map index.d.ts 'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", - "build": "npm run clean-build && npm run tslint && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && npm run tsc:w && license-check && npm run build.umd", - "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", - "tsc": "tsc", - "tsc:w": "tsc -w", - "pretest": "npm run build", - "test": "karma start karma.conf.js --reporters mocha,coverage --single-run", - "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", - "posttest": "remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", + "clean": "rimraf dist node_modules typings bundles coverage .npmrc", + "rimraf": "rimraf", + "build": "webpack --config webpack.build.js --progress --profile --bail", + "test": "karma start karma.conf.js --reporters mocha,coverage --single-run --component", + "test-browser": "karma start karma.conf.js --reporters kjhtml --component", "coverage": "npm run test && wsrv -o -p 9875 ./coverage/report", - "publish:prod": "npm run test && npm publish", - "travis": "npm link ng2-alfresco-core ng2-alfresco-datatable", - "gulp": "gulp", - "build.umd": "gulp build.prod --color --env-config prod --build-type prod", - "reinstall": "npm cache clean && npm install" + "prepublish" : "npm run build" }, - "main": "./index.js", - "module": "./index.js", - "typings": "./index.d.ts", + "main": "bundles/ng2-alfresco-documentlist.js", "repository": { "type": "git", "url": "https://github.com/Alfresco/alfresco-ng2-components.git" @@ -32,7 +20,6 @@ "bugs": { "url": "https://github.com/Alfresco/alfresco-ng2-components/issues" }, - "license": "Apache-2.0", "contributors": [ { "name": "Denys Vuika", @@ -54,77 +41,79 @@ "alfresco" ], "dependencies": { - "@angular/common": "2.2.2", - "@angular/compiler": "2.2.2", - "@angular/core": "2.2.2", - "@angular/forms": "2.2.2", - "@angular/http": "2.2.2", + "@angular/animations": "~4.0.0", + "@angular/common": "~4.0.0", + "@angular/compiler": "~4.0.0", + "@angular/core": "~4.0.0", + "@angular/forms": "~4.0.0", + "@angular/http": "~4.0.0", + "@angular/platform-browser": "~4.0.0", + "@angular/platform-browser-dynamic": "~4.0.0", + "@angular/router": "~4.0.0", + "@angular/material": "2.0.0-beta.1", - "@angular/platform-browser": "2.2.2", - "@angular/platform-browser-dynamic": "2.2.2", - "@angular/router": "3.2.2", - "alfresco-js-api": "~1.4.0", + "alfresco-js-api": "~1.5.0", "core-js": "2.4.1", "hammerjs": "2.0.8", - "ng2-alfresco-core": "1.4.0", - "ng2-alfresco-datatable": "1.4.0", - "ng2-translate": "2.5.0", + "ng2-alfresco-core": "1.5.0", + "ng2-alfresco-datatable": "1.5.0", + "ng2-translate": "5.0.0", "reflect-metadata": "0.1.10", - "rxjs": "5.0.0-beta.12", + "rxjs": "5.1.0", "systemjs": "0.19.27", - "zone.js": "0.6.26" + "zone.js": "0.7.6" }, "devDependencies": { "@types/hammerjs": "^2.0.34", "@types/jasmine": "2.5.35", "@types/node": "6.0.45", + "angular2-template-loader": "^0.6.2", "autoprefixer": "^6.5.4", - "concurrently": "^2.2.0", - "cpx": "1.3.1", + "copy-webpack-plugin": "^4.0.1", + "css-loader": "^0.23.1", + "css-to-string-loader": "^0.1.2", "cssnano": "^3.8.1", - "gulp": "^3.9.1", - "gulp-autoprefixer": "^3.1.1", - "gulp-cached": "^1.1.1", - "gulp-concat": "^2.6.1", - "gulp-concat-css": "^2.3.0", - "gulp-filter": "^4.0.0", - "gulp-inline-ng2-template": "^4.0.0", - "gulp-load-plugins": "^1.4.0", - "gulp-plumber": "^1.1.0", - "gulp-postcss": "^6.2.0", - "gulp-replace": "^0.5.4", - "gulp-sourcemaps": "^1.9.1", - "gulp-template": "^4.0.0", - "gulp-typescript": "^3.1.3", - "gulp-uglify": "^2.0.0", - "gulp-util": "^3.0.7", + "extract-text-webpack-plugin": "^2.0.0-rc.3", + "file-loader": "0.11.1", + "html-loader": "^0.4.4", + "html-webpack-plugin": "^2.28.0", + "istanbul-instrumenter-loader": "0.2.0", + "jasmine-ajax": "^3.2.0", "jasmine-core": "2.4.1", - "karma": "0.13.22", - "karma-chrome-launcher": "1.0.1", - "karma-coverage": "1.0.0", - "karma-jasmine": "1.0.2", + "karma": "^0.13.22", + "karma-chrome-launcher": "~1.0.1", + "karma-coverage": "^1.1.1", + "karma-jasmine": "~1.0.2", "karma-jasmine-ajax": "^0.1.13", "karma-jasmine-html-reporter": "0.2.0", - "karma-mocha-reporter": "2.0.3", - "license-check": "1.1.5", + "karma-mocha-reporter": "^2.2.2", + "karma-remap-istanbul": "^0.6.0", + "karma-sourcemap-loader": "^0.3.7", + "karma-systemjs": "^0.16.0", + "karma-webpack": "^2.0.2", + "loader-utils": "^1.1.0", "merge-stream": "^1.0.1", - "remap-istanbul": "0.6.3", - "rimraf": "2.5.2", + "null-loader": "^0.1.1", + "package-json-merge": "0.0.1", + "raw-loader": "^0.5.1", + "remap-istanbul": "^0.6.3", + "rimraf": "^2.5.4", "run-sequence": "^1.2.2", + "script-loader": "0.7.0", + "source-map-loader": "^0.1.6", + "style-loader": "^0.13.1", "systemjs-builder": "^0.15.34", - "traceur": "0.0.91", + "to-string-loader": "^1.1.4", + "traceur": "^0.0.91", + "ts-loader": "^2.0.0", "ts-node": "^1.7.0", - "tslint": "3.15.1", - "typescript": "^2.0.3", - "wsrv": "^0.1.5" + "tslint": "^4.4.2", + "tslint-loader": "^3.3.0", + "typescript": "^2.1.6", + "webpack": "^2.2.1", + "webpack-dev-server": "^2.3.0", + "webpack-merge": "2.6.1", + "wsrv": "^0.1.7" }, - "license-check-config": { - "src": [ - "./src/**/*.js" - ], - "path": "assets/license_header.txt", - "blocking": true, - "logInfo": false, - "logError": true - } + "license": "Apache-2.0" } diff --git a/ng2-components/ng2-alfresco-documentlist/src/assets/document-list.service.mock.ts b/ng2-components/ng2-alfresco-documentlist/src/assets/document-list.service.mock.ts index 6a168873036..0fdfc469aa5 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/assets/document-list.service.mock.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/assets/document-list.service.mock.ts @@ -38,7 +38,7 @@ export class DocumentListServiceMock extends DocumentListService { authService?: AlfrescoAuthenticationService, contentService?: AlfrescoContentService, apiService?: AlfrescoApiService, - logService?: LogService, + logService?: LogService ) { super(authService, contentService, apiService, logService); } diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.spec.ts index 56744a769f7..1365facf188 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.spec.ts @@ -50,7 +50,7 @@ describe('DocumentListBreadcrumb', () => { }); it('should update document list on click', (done) => { - let documentList = new DocumentListComponent(null, null, null); + let documentList = new DocumentListComponent(null, null, null, null); spyOn(documentList, 'loadFolderByNodeId').and.stub(); let node = { id: '-id-', name: 'name' }; diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.ts b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.ts index c462817deee..c14b2249b7d 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.ts @@ -20,7 +20,6 @@ import { MinimalNodeEntryEntity, PathElementEntity } from 'alfresco-js-api'; import { DocumentListComponent } from '../document-list.component'; @Component({ - moduleId: module.id, selector: 'alfresco-document-list-breadcrumb', templateUrl: './breadcrumb.component.html', styleUrls: ['./breadcrumb.component.css'] diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-action/content-action-list.component.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-action/content-action-list.component.spec.ts index ffcaaa044e4..493d10c5422 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/content-action/content-action-list.component.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-action/content-action-list.component.spec.ts @@ -27,7 +27,7 @@ describe('ContentColumnList', () => { beforeEach(() => { let documentListService = new DocumentListServiceMock(); - documentList = new DocumentListComponent(documentListService, null, null); + documentList = new DocumentListComponent(documentListService, null, null, null); actionList = new ContentActionListComponent(documentList); }); diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-action/content-action.component.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-action/content-action.component.spec.ts index bd8b614b26a..40f24becc2d 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/content-action/content-action.component.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-action/content-action.component.spec.ts @@ -38,7 +38,7 @@ describe('ContentAction', () => { documentActions = new DocumentActionsService(null, null); folderActions = new FolderActionsService(null); - documentList = new DocumentListComponent(documentServiceMock, null, null); + documentList = new DocumentListComponent(documentServiceMock, null, null, null); actionList = new ContentActionListComponent(documentList); }); diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-action/content-action.component.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-action/content-action.component.ts index 07cf03f0d0a..017e295c593 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/content-action/content-action.component.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-action/content-action.component.ts @@ -47,6 +47,9 @@ export class ContentActionComponent implements OnInit, OnChanges { @Input() disableWithNoPermission: boolean; + @Input() + disabled: boolean = false; + @Output() execute = new EventEmitter(); @@ -68,7 +71,8 @@ export class ContentActionComponent implements OnInit, OnChanges { icon: this.icon, permission: this.permission, disableWithNoPermission: this.disableWithNoPermission, - target: this.target + target: this.target, + disabled: this.disabled }); if (this.handler) { diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column-list.component.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column-list.component.spec.ts index 8fd4daad64f..8827f8d124e 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column-list.component.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column-list.component.spec.ts @@ -28,8 +28,10 @@ describe('ContentColumnList', () => { beforeEach(() => { let service = new DocumentListServiceMock(); - documentList = new DocumentListComponent(service, null, null); + documentList = new DocumentListComponent(service, null, null, null); columnList = new ContentColumnListComponent(documentList); + + documentList.ngOnInit(); }); it('should register column within parent document list', () => { diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column.component.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column.component.spec.ts index eec2eb92024..1f8d05e04ca 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column.component.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-column/content-column.component.spec.ts @@ -27,8 +27,10 @@ describe('ContentColumn', () => { beforeEach(() => { let service = new DocumentListServiceMock(); - documentList = new DocumentListComponent(service, null, null); + documentList = new DocumentListComponent(service, null, null, null); columnList = new ContentColumnListComponent(documentList); + + documentList.ngOnInit(); }); it('should register model within parent column list', () => { diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.spec.ts index aa8c89ddaa2..31db4c803e2 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.spec.ts @@ -157,11 +157,171 @@ describe('DocumentList', () => { let actions = documentList.getNodeActions(new FolderNode()); expect(actions.length).toBe(1); - expect(actions[0]).toBe(folderMenu); + expect(actions[0].target).toBe(folderMenu.target); actions = documentList.getNodeActions(new FileNode()); expect(actions.length).toBe(1); - expect(actions[0]).toBe(documentMenu); + expect(actions[0].target).toBe(documentMenu.target); + }); + + it('should disable the action if there is no permission for the file and disableWithNoPermission true', () => { + let documentMenu = new ContentActionModel({ + disableWithNoPermission: true, + permission: 'delete', + target: 'document', + title: 'FileAction' + }); + + documentList.actions = [ + documentMenu + ]; + + let nodeFile = {entry: {isFile: true, name: 'xyz', allowableOperations: ['create', 'update']}}; + + let actions = documentList.getNodeActions(nodeFile); + expect(actions.length).toBe(1); + expect(actions[0].title).toEqual('FileAction'); + expect(actions[0].disabled).toBe(true); + + }); + + it('should disable the action if there is no permission for the folder and disableWithNoPermission true', () => { + let documentMenu = new ContentActionModel({ + disableWithNoPermission: true, + permission: 'delete', + target: 'folder', + title: 'FolderAction' + }); + + documentList.actions = [ + documentMenu + ]; + + let nodeFile = {entry: {isFolder: true, name: 'xyz', allowableOperations: ['create', 'update']}}; + + let actions = documentList.getNodeActions(nodeFile); + expect(actions.length).toBe(1); + expect(actions[0].title).toEqual('FolderAction'); + expect(actions[0].disabled).toBe(true); + + }); + + it('should not disable the action if there is no permission for the file and disableWithNoPermission false', () => { + let documentMenu = new ContentActionModel({ + disableWithNoPermission: false, + permission: 'delete', + target: 'document', + title: 'FileAction' + }); + + documentList.actions = [ + documentMenu + ]; + + let nodeFile = {entry: {isFile: true, name: 'xyz', allowableOperations: ['create', 'update']}}; + + let actions = documentList.getNodeActions(nodeFile); + expect(actions.length).toBe(1); + expect(actions[0].title).toEqual('FileAction'); + expect(actions[0].disabled).toBeUndefined(true); + }); + + it('should not disable the action if there is no permission for the folder and disableWithNoPermission false', () => { + let documentMenu = new ContentActionModel({ + disableWithNoPermission: false, + permission: 'delete', + target: 'folder', + title: 'FolderAction' + }); + + documentList.actions = [ + documentMenu + ]; + + let nodeFile = {entry: {isFolder: true, name: 'xyz', allowableOperations: ['create', 'update']}}; + + let actions = documentList.getNodeActions(nodeFile); + expect(actions.length).toBe(1); + expect(actions[0].title).toEqual('FolderAction'); + expect(actions[0].disabled).toBeUndefined(true); + }); + + it('should not disable the action if there is the right permission for the file', () => { + let documentMenu = new ContentActionModel({ + disableWithNoPermission: true, + permission: 'delete', + target: 'document', + title: 'FileAction' + }); + + documentList.actions = [ + documentMenu + ]; + + let nodeFile = {entry: {isFile: true, name: 'xyz', allowableOperations: ['create', 'update', 'delete']}}; + + let actions = documentList.getNodeActions(nodeFile); + expect(actions.length).toBe(1); + expect(actions[0].title).toEqual('FileAction'); + expect(actions[0].disabled).toBeUndefined(); + }); + + it('should not disable the action if there is the right permission for the folder', () => { + let documentMenu = new ContentActionModel({ + disableWithNoPermission: true, + permission: 'delete', + target: 'folder', + title: 'FolderAction' + }); + + documentList.actions = [ + documentMenu + ]; + + let nodeFile = {entry: {isFolder: true, name: 'xyz', allowableOperations: ['create', 'update', 'delete']}}; + + let actions = documentList.getNodeActions(nodeFile); + expect(actions.length).toBe(1); + expect(actions[0].title).toEqual('FolderAction'); + expect(actions[0].disabled).toBeUndefined(); + }); + + it('should not disable the action if there are no permissions for the file', () => { + let documentMenu = new ContentActionModel({ + permission: 'delete', + target: 'document', + title: 'FileAction' + }); + + documentList.actions = [ + documentMenu + ]; + + let nodeFile = {entry: {isFile: true, name: 'xyz', allowableOperations: null}}; + + let actions = documentList.getNodeActions(nodeFile); + expect(actions.length).toBe(1); + expect(actions[0].title).toEqual('FileAction'); + expect(actions[0].disabled).toBeUndefined(); + }); + + it('should not disable the action if there are no permissions for the folder', () => { + let documentMenu = new ContentActionModel({ + permission: 'delete', + target: 'folder', + title: 'FolderAction' + }); + + documentList.actions = [ + documentMenu + ]; + + let nodeFile = {entry: {isFolder: true, name: 'xyz', allowableOperations: null}}; + + let actions = documentList.getNodeActions(nodeFile); + expect(actions.length).toBe(1); + expect(actions[0].title).toEqual('FolderAction'); + expect(actions[0].disabled).toBeUndefined(); }); it('should find no content actions', () => { @@ -460,7 +620,7 @@ describe('DocumentList', () => { }); documentList.currentFolderId = 'wrong-id'; - documentList.ngOnChanges({currentFolderId: new SimpleChange(null, documentList.currentFolderId)}); + documentList.ngOnChanges({currentFolderId: new SimpleChange(null, documentList.currentFolderId, true)}); }); it('should require dataTable to check empty template', () => { @@ -513,6 +673,19 @@ describe('DocumentList', () => { expect(documentList.onNodeClick).toHaveBeenCalledWith(node); }); + it('should emit node-click DOM event', (done) => { + let node = new NodeMinimalEntry(); + let row = new ShareDataRow(node); + let event = new DataRowEvent(row, null); + + const htmlElement = fixture.debugElement.nativeElement as HTMLElement; + htmlElement.addEventListener('node-click', (e: CustomEvent) => { + done(); + }); + + documentList.onRowClick(event); + }); + it('should emit [nodeDblClick] event on row double-click', () => { let node = new NodeMinimalEntry(); let row = new ShareDataRow(node); @@ -523,10 +696,23 @@ describe('DocumentList', () => { expect(documentList.onNodeDblClick).toHaveBeenCalledWith(node); }); + it('should emit node-dblclick DOM event', (done) => { + let node = new NodeMinimalEntry(); + let row = new ShareDataRow(node); + let event = new DataRowEvent(row, null); + + const htmlElement = fixture.debugElement.nativeElement as HTMLElement; + htmlElement.addEventListener('node-dblclick', (e: CustomEvent) => { + done(); + }); + + documentList.onRowDblClick(event); + }); + it('should load folder by ID on init', () => { documentList.currentFolderId = '1d26e465-dea3-42f3-b415-faa8364b9692'; spyOn(documentList, 'loadFolderNodesByFolderNodeId').and.returnValue(Promise.resolve()); - documentList.ngOnChanges({folderNode: new SimpleChange(null, documentList.currentFolderId)}); + documentList.ngOnChanges({folderNode: new SimpleChange(null, documentList.currentFolderId, true)}); expect(documentList.loadFolderNodesByFolderNodeId).toHaveBeenCalled(); }); }); diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts index 95c4393b8dd..5416dd916e3 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts @@ -16,7 +16,7 @@ */ import { - Component, OnInit, Input, OnChanges, Output, SimpleChanges, EventEmitter, + Component, OnInit, Input, OnChanges, Output, SimpleChanges, EventEmitter, ElementRef, AfterContentInit, TemplateRef, NgZone, ViewChild, HostListener, ContentChild } from '@angular/core'; import { Subject } from 'rxjs/Rx'; @@ -28,7 +28,8 @@ import { ObjectDataColumn, DataCellEvent, DataRowActionEvent, - DataColumn + DataColumn, + DataSorting } from 'ng2-alfresco-datatable'; import { DocumentListService } from './../services/document-list.service'; import { ContentActionModel } from './../models/content-action.model'; @@ -38,7 +39,6 @@ import { NodeEntityEvent, NodeEntryEvent } from './node.event'; declare var module: any; @Component({ - moduleId: module.id, selector: 'alfresco-document-list', styleUrls: ['./document-list.component.css'], templateUrl: './document-list.component.html' @@ -49,12 +49,10 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni static DOUBLE_CLICK_NAVIGATION: string = 'dblclick'; static DEFAULT_PAGE_SIZE: number = 20; - baseComponentPath = module.id.replace('components/document-list.component.js', ''); - @ContentChild(DataColumnListComponent) columnList: DataColumnListComponent; @Input() - fallbackThumbnail: string = this.baseComponentPath + 'assets/images/ft_ic_miscellaneous.svg'; + fallbackThumbnail: string = require('../assets/images/ft_ic_miscellaneous.svg'); @Input() navigate: boolean = true; @@ -87,11 +85,14 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni pageSize: number = DocumentListComponent.DEFAULT_PAGE_SIZE; @Input() - emptyFolderImageUrl: string = this.baseComponentPath + 'assets/images/empty_doc_lib.svg'; + emptyFolderImageUrl: string = require('../assets/images/empty_doc_lib.svg'); @Input() allowDropFiles: boolean = false; + @Input() + sorting: string[]; + skipCount: number = 0; pagination: Pagination; @@ -153,9 +154,8 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni constructor(private documentListService: DocumentListService, private ngZone: NgZone, - private translateService: AlfrescoTranslationService) { - - this.data = new ShareDataTableAdapter(this.documentListService, this.baseComponentPath); + private translateService: AlfrescoTranslationService, + private el: ElementRef) { if (translateService) { translateService.addTranslationFolder('ng2-alfresco-documentlist', 'node_modules/ng2-alfresco-documentlist/src'); @@ -185,18 +185,13 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni } ngOnInit() { + this.data = new ShareDataTableAdapter(this.documentListService, null, this.getDefaultSorting()); this.data.thumbnails = this.thumbnails; this.contextActionHandler.subscribe(val => this.contextActionCallback(val)); this.enforceSingleClickNavigationForMobile(); } - private enforceSingleClickNavigationForMobile(): void { - if (this.isMobile()) { - this.navigationMode = DocumentListComponent.SINGLE_CLICK_NAVIGATION; - } - } - ngAfterContentInit() { let schema: DataColumn[] = []; @@ -205,7 +200,7 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni } if (!this.data) { - this.data = new ShareDataTableAdapter(this.documentListService, this.baseComponentPath, schema); + this.data = new ShareDataTableAdapter(this.documentListService, schema, this.getDefaultSorting()); } else if (schema && schema.length > 0) { this.data.setColumns(schema); } @@ -273,7 +268,7 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni return this.enablePagination && !this.isEmpty(); } - getNodeActions(node: MinimalNodeEntity): ContentActionModel[] { + getNodeActions(node: MinimalNodeEntity | any): ContentActionModel[] { let target = null; if (node && node.entry) { @@ -286,18 +281,39 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni } if (target) { - let ltarget = target.toLowerCase(); - - return this.actions.filter(entry => { + let actionsByTarget = this.actions.filter(entry => { return entry.target.toLowerCase() === ltarget; + }).map(action => new ContentActionModel(action)); + + actionsByTarget.forEach((action) => { + this.checkPermission(node, action); }); + + return actionsByTarget; } } return []; } + checkPermission(node: any, action: ContentActionModel): ContentActionModel { + if (action.permission) { + if (this.hasPermissions(node)) { + let permissions = node.entry.allowableOperations; + let findPermission = permissions.find(permission => permission === action.permission); + if (!findPermission && action.disableWithNoPermission === true) { + action.disabled = true; + } + } + } + return action; + } + + private hasPermissions(node: any): boolean { + return node.entry.allowableOperations ? true : false; + } + @HostListener('contextmenu', ['$event']) onShowContextMenu(e?: Event) { if (e && this.contextMenuActions) { @@ -343,7 +359,7 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni this.skipCount = 0; this.loadFolderNodesByFolderNodeId(node.id, this.pageSize, this.skipCount).catch(err => this.error.emit(err)); }) - .catch(err => this.error.emit(err)); + .catch(err => this.error.emit(err)); } loadFolderNodesByFolderNodeId(id: string, maxItems: number, skipCount: number): Promise { @@ -355,7 +371,8 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni skipCount: skipCount, rootFolderId: id }) - .subscribe(val => { + .subscribe( + val => { this.data.loadPage( val); this.pagination = val.list.pagination; resolve(true); @@ -399,7 +416,16 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni } onNodeClick(node: MinimalNodeEntity) { - let event = new NodeEntityEvent(node); + const domEvent = new CustomEvent('node-click', { + detail: { + sender: this, + node: node + }, + bubbles: true + }); + this.el.nativeElement.dispatchEvent(domEvent); + + const event = new NodeEntityEvent(node); this.nodeClick.emit(event); if (!event.defaultPrevented) { @@ -423,7 +449,16 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni } onNodeDblClick(node: MinimalNodeEntity) { - let event = new NodeEntityEvent(node); + const domEvent = new CustomEvent('node-dblclick', { + detail: { + sender: this, + node: node + }, + bubbles: true + }); + this.el.nativeElement.dispatchEvent(domEvent); + + const event = new NodeEntityEvent(node); this.nodeDblClick.emit(event); if (!event.defaultPrevented) { @@ -502,4 +537,19 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni onPermissionError(event) { this.permissionError.emit(event); } + + private enforceSingleClickNavigationForMobile(): void { + if (this.isMobile()) { + this.navigationMode = DocumentListComponent.SINGLE_CLICK_NAVIGATION; + } + } + + private getDefaultSorting(): DataSorting { + let defaultSorting: DataSorting; + if (this.sorting) { + const [ key, direction ] = this.sorting; + defaultSorting = new DataSorting(key, direction); + } + return defaultSorting; + } } diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.component.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.component.spec.ts index af4575649a0..f2ced055741 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.component.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.component.spec.ts @@ -176,7 +176,7 @@ describe('Document menu action', () => { describe('Check Permissions', () => { it('should get the folder permission when folderId is changed', async(() => { - let change = new SimpleChange('folder-id', 'new-folder-id'); + let change = new SimpleChange('folder-id', 'new-folder-id', true); component.ngOnChanges({ 'folderId': change }); jasmine.Ajax.requests.mostRecent().respondWith({ @@ -196,7 +196,7 @@ describe('Document menu action', () => { })); it('should disable the create button if folder does not have any allowable operations', async(() => { - let change = new SimpleChange('folder-id', 'new-folder-id'); + let change = new SimpleChange('folder-id', 'new-folder-id', true); component.ngOnChanges({ 'folderId': change }); jasmine.Ajax.requests.mostRecent().respondWith({ @@ -214,7 +214,7 @@ describe('Document menu action', () => { })); it('should disable the create button if folder does not have create permission', async(() => { - let change = new SimpleChange('folder-id', 'new-folder-id'); + let change = new SimpleChange('folder-id', 'new-folder-id', true); component.ngOnChanges({ 'folderId': change }); jasmine.Ajax.requests.mostRecent().respondWith({ @@ -233,7 +233,7 @@ describe('Document menu action', () => { it('should not disable the option when disableWithNoPermission is false', async(() => { component.disableWithNoPermission = false; - let change = new SimpleChange('folder-id', 'new-folder-id'); + let change = new SimpleChange('folder-id', 'new-folder-id', true); component.ngOnChanges({ 'folderId': change }); jasmine.Ajax.requests.mostRecent().respondWith({ @@ -251,7 +251,7 @@ describe('Document menu action', () => { })); it('should emit permission event error when user does not have create permission', async(() => { - let change = new SimpleChange('folder-id', 'new-folder-id'); + let change = new SimpleChange('folder-id', 'new-folder-id', true); component.ngOnChanges({ 'folderId': change }); jasmine.Ajax.requests.mostRecent().respondWith({ diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.component.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.component.ts index e6f4f9ce94b..6f36f4ecf0d 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.component.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-menu-action.component.ts @@ -28,7 +28,6 @@ declare let dialogPolyfill: any; const ERROR_FOLDER_ALREADY_EXIST = 409; @Component({ - moduleId: module.id, selector: 'alfresco-document-menu-action', styleUrls: ['./document-menu-action.component.css'], templateUrl: './document-menu-action.component.html' @@ -93,10 +92,8 @@ export class DocumentMenuActionComponent implements OnChanges { let errorMessagePlaceholder = this.getErrorMessage(error.response); this.message = this.formatString(errorMessagePlaceholder, [name]); this.error.emit({ message: this.message }); - this.logService.error(this.message); } else { this.error.emit(error); - this.logService.error(error); } } ); diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/empty-folder/empty-folder-content.component.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/empty-folder/empty-folder-content.component.spec.ts index 546deb3fcaf..aae664a9842 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/empty-folder/empty-folder-content.component.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/empty-folder/empty-folder-content.component.spec.ts @@ -28,7 +28,7 @@ describe('EmptyFolderContent', () => { beforeEach(() => { let documentListService = new DocumentListServiceMock(); - documentList = new DocumentListComponent(documentListService, null, null); + documentList = new DocumentListComponent(documentListService, null, null, null); documentList.dataTable = new DataTableComponent(null); emptyFolderContent = new EmptyFolderContentComponent(documentList); }); diff --git a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.spec.ts index 8916edaa63c..bd9f2e93db9 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.spec.ts @@ -22,38 +22,36 @@ import { FileNode, FolderNode/*, PageNode*/ } from './../assets/document-library describe('ShareDataTableAdapter', () => { - let basePath: string; let documentListService: DocumentListServiceMock; beforeEach(() => { - basePath = '/root/'; documentListService = new DocumentListServiceMock(); }); it('should setup rows and columns with constructor', () => { let schema = [ {}]; - let adapter = new ShareDataTableAdapter(null, null, schema); + let adapter = new ShareDataTableAdapter(null, schema); expect(adapter.getRows()).toEqual([]); expect(adapter.getColumns()).toEqual(schema); }); it('should setup columns when constructor is missing schema', () => { - let adapter = new ShareDataTableAdapter(null, null, null); + let adapter = new ShareDataTableAdapter(null, null); expect(adapter.getColumns()).toEqual([]); }); it('should set new columns', () => { let columns = [ {}, {}]; - let adapter = new ShareDataTableAdapter(null, null, null); + let adapter = new ShareDataTableAdapter(null, null); adapter.setColumns(columns); expect(adapter.getColumns()).toEqual(columns); }); it('should reset columns', () => { let columns = [ {}, {}]; - let adapter = new ShareDataTableAdapter(null, null, columns); + let adapter = new ShareDataTableAdapter(null, columns); expect(adapter.getColumns()).toEqual(columns); adapter.setColumns(null); @@ -62,7 +60,7 @@ describe('ShareDataTableAdapter', () => { it('should set new rows', () => { let rows = [ {}, {}]; - let adapter = new ShareDataTableAdapter(null, null, null); + let adapter = new ShareDataTableAdapter(null, null); expect(adapter.getRows()).toEqual([]); adapter.setRows(rows); @@ -71,7 +69,7 @@ describe('ShareDataTableAdapter', () => { it('should reset rows', () => { let rows = [ {}, {}]; - let adapter = new ShareDataTableAdapter(null, null, null); + let adapter = new ShareDataTableAdapter(null, null); adapter.setRows(rows); expect(adapter.getRows()).toEqual(rows); @@ -81,7 +79,7 @@ describe('ShareDataTableAdapter', () => { }); it('should sort new rows', () => { - let adapter = new ShareDataTableAdapter(null, null, null); + let adapter = new ShareDataTableAdapter(null, null); spyOn(adapter, 'sort').and.callThrough(); let rows = [ {}]; @@ -91,13 +89,13 @@ describe('ShareDataTableAdapter', () => { }); it('should fail when getting value for missing row', () => { - let adapter = new ShareDataTableAdapter(null, null, null); + let adapter = new ShareDataTableAdapter(null, null); let check = () => { return adapter.getValue(null, {}); }; expect(check).toThrowError(adapter.ERR_ROW_NOT_FOUND); }); it('should fail when getting value for missing column', () => { - let adapter = new ShareDataTableAdapter(null, null, null); + let adapter = new ShareDataTableAdapter(null, null); let check = () => { return adapter.getValue( {}, null); }; expect(check).toThrowError(adapter.ERR_COL_NOT_FOUND); }); @@ -106,7 +104,7 @@ describe('ShareDataTableAdapter', () => { it('should require path to load data', () => { spyOn(documentListService, 'getFolder').and.callThrough(); - let adapter = new ShareDataTableAdapter(documentListService, null, null); + let adapter = new ShareDataTableAdapter(documentListService, null); adapter.loadPath(null); expect(documentListService.getFolder).not.toHaveBeenCalled(); @@ -122,7 +120,7 @@ describe('ShareDataTableAdapter', () => { spyOn(documentListService, 'getFolder').and.callThrough(); documentListService.getFolderResult = page; - let adapter = new ShareDataTableAdapter(documentListService, null, null); + let adapter = new ShareDataTableAdapter(documentListService, null); adapter.loadPath(path); expect(documentListService.getFolder).toHaveBeenCalledWith(path, jasmine.anything()); @@ -147,7 +145,7 @@ describe('ShareDataTableAdapter', () => { }; let row = new ShareDataRow(file); - let adapter = new ShareDataTableAdapter(null, null, null); + let adapter = new ShareDataTableAdapter(null, null); let value = adapter.getValue(row, col); expect(value).toBe(dateValue); @@ -167,7 +165,7 @@ describe('ShareDataTableAdapter', () => { }; let row = new ShareDataRow(file); - let adapter = new ShareDataTableAdapter(null, null, null); + let adapter = new ShareDataTableAdapter(null, null); let value = adapter.getValue(row, col); expect(value).toBe(dateValue); @@ -185,7 +183,7 @@ describe('ShareDataTableAdapter', () => { }; let row = new ShareDataRow(file); - let adapter = new ShareDataTableAdapter(null, null, null); + let adapter = new ShareDataTableAdapter(null, null); let value = adapter.getValue(row, col); expect(value).toBe(rawValue); @@ -203,7 +201,7 @@ describe('ShareDataTableAdapter', () => { }; let row = new ShareDataRow(file); - let adapter = new ShareDataTableAdapter(null, null, null); + let adapter = new ShareDataTableAdapter(null, null); spyOn(console, 'error').and.stub(); let value = adapter.getValue(row, col); @@ -212,18 +210,18 @@ describe('ShareDataTableAdapter', () => { }); it('should generate fallback icon for a file thumbnail with unknown mime type', () => { - let adapter = new ShareDataTableAdapter(documentListService, basePath, null); + let adapter = new ShareDataTableAdapter(documentListService, null); let file = new FileNode('file', 'wrong-mime'); let row = new ShareDataRow(file); let col = { type: 'image', key: '$thumbnail' }; let value = adapter.getValue(row, col); - expect(value).toBe(`${basePath}assets/images/ft_ic_miscellaneous.svg`); + expect(value).toContain(`assets/images/ft_ic_miscellaneous.svg`); }); it('should generate fallback icon for a file thumbnail with missing mime type', () => { - let adapter = new ShareDataTableAdapter(documentListService, basePath, null); + let adapter = new ShareDataTableAdapter(documentListService, null); let file = new FileNode(); file.entry.content.mimeType = null; @@ -232,11 +230,11 @@ describe('ShareDataTableAdapter', () => { let col = { type: 'image', key: '$thumbnail' }; let value = adapter.getValue(row, col); - expect(value).toBe(`${basePath}assets/images/ft_ic_miscellaneous.svg`); + expect(value).toContain(`assets/images/ft_ic_miscellaneous.svg`); }); it('should generate fallback icon for a file with no content entry', () => { - let adapter = new ShareDataTableAdapter(documentListService, basePath, null); + let adapter = new ShareDataTableAdapter(documentListService, null); let file = new FileNode(); file.entry.content = null; @@ -245,19 +243,19 @@ describe('ShareDataTableAdapter', () => { let col = { type: 'image', key: '$thumbnail' }; let value = adapter.getValue(row, col); - expect(value).toBe(`${basePath}assets/images/ft_ic_miscellaneous.svg`); + expect(value).toContain(`assets/images/ft_ic_miscellaneous.svg`); }); it('should generate fallback icon when document service fails to find one', () => { spyOn(documentListService, 'getMimeTypeIcon').and.returnValue(null); - let adapter = new ShareDataTableAdapter(documentListService, basePath, null); + let adapter = new ShareDataTableAdapter(documentListService, null); let file = new FileNode(); let row = new ShareDataRow(file); let col = { type: 'image', key: '$thumbnail' }; let value = adapter.getValue(row, col); - expect(value).toBe(`${basePath}assets/images/ft_ic_miscellaneous.svg`); + expect(value).toContain(`assets/images/ft_ic_miscellaneous.svg`); }); it('should return image value unmodified', () => { @@ -266,7 +264,7 @@ describe('ShareDataTableAdapter', () => { let file = new FileNode(); file.entry['icon'] = imageUrl; - let adapter = new ShareDataTableAdapter(null, basePath, null); + let adapter = new ShareDataTableAdapter(null, null); let row = new ShareDataRow(file); let col = { type: 'image', key: 'icon' }; @@ -275,20 +273,20 @@ describe('ShareDataTableAdapter', () => { }); it('should resolve folder icon', () => { - let adapter = new ShareDataTableAdapter(null, basePath, null); + let adapter = new ShareDataTableAdapter(null, null); let row = new ShareDataRow(new FolderNode()); let col = { type: 'image', key: '$thumbnail' }; let value = adapter.getValue(row, col); - expect(value).toBe(`${basePath}assets/images/ft_ic_folder.svg`); + expect(value).toContain(`assets/images/ft_ic_folder.svg`); }); it('should resolve file thumbnail', () => { let imageUrl: string = 'http:// '; spyOn(documentListService, 'getDocumentThumbnailUrl').and.returnValue(imageUrl); - let adapter = new ShareDataTableAdapter(documentListService, basePath, null); + let adapter = new ShareDataTableAdapter(documentListService, null); adapter.thumbnails = true; let file = new FileNode(); @@ -301,7 +299,7 @@ describe('ShareDataTableAdapter', () => { }); it('should resolve fallback file icon for unknown node', () => { - let adapter = new ShareDataTableAdapter(null, basePath, null); + let adapter = new ShareDataTableAdapter(null, null); let file = new FileNode(); file.entry.isFile = false; @@ -311,11 +309,11 @@ describe('ShareDataTableAdapter', () => { let col = { type: 'image', key: '$thumbnail' }; let value = adapter.getValue(row, col); - expect(value).toBe(`${basePath}assets/images/ft_ic_miscellaneous.svg`); + expect(value).toContain(`assets/images/ft_ic_miscellaneous.svg`); }); it('should require document service to resolve thumbnail', () => { - let adapter = new ShareDataTableAdapter(null, basePath, null); + let adapter = new ShareDataTableAdapter(null, null); adapter.thumbnails = true; let file = new FileNode(); @@ -335,7 +333,7 @@ describe('ShareDataTableAdapter', () => { spyOn(console, 'error').and.stub(); spyOn(documentListService, 'getFolder').and.callThrough(); - let adapter = new ShareDataTableAdapter(documentListService, null, null); + let adapter = new ShareDataTableAdapter(documentListService, null); adapter.loadPath('/some/path').catch(err => { expect(err).toBe(error); done(); @@ -343,18 +341,18 @@ describe('ShareDataTableAdapter', () => { }); */ - it('should generate file icon path based on mime type', () => { - let fileName = 'custom-icon.svg'; + xit('should generate file icon path based on mime type', () => { + let fileName = 'dist/assets/empty_doc_lib.svg'; spyOn(documentListService, 'getMimeTypeIcon').and.returnValue(fileName); let file = new FileNode('file1', 'text/plain'); let row = new ShareDataRow(file); let col = {type: 'image', key: '$thumbnail'}; - let adapter = new ShareDataTableAdapter(documentListService, basePath, null); + let adapter = new ShareDataTableAdapter(documentListService, null); let value = adapter.getValue(row, col); - expect(value).toBe(`${basePath}assets/images/${fileName}`); + expect(value).toContain(`assets/images/${fileName}`); expect(documentListService.getMimeTypeIcon).toHaveBeenCalled(); }); @@ -364,7 +362,7 @@ describe('ShareDataTableAdapter', () => { let folder = new FolderNode(); let col = { key: 'name' }; - let adapter = new ShareDataTableAdapter(null, null, [col]); + let adapter = new ShareDataTableAdapter(null, [col]); adapter.setSorting(new DataSorting('name', 'asc')); adapter.setRows([ @@ -387,7 +385,7 @@ describe('ShareDataTableAdapter', () => { file2.entry['dateProp'] = new Date(2016, 6, 30, 13, 14, 2); let col = { key: 'dateProp' }; - let adapter = new ShareDataTableAdapter(null, null, [col]); + let adapter = new ShareDataTableAdapter(null, [col]); adapter.setRows([ new ShareDataRow(file2), @@ -413,7 +411,7 @@ describe('ShareDataTableAdapter', () => { let file4 = new FileNode('file4'); let col = { key: 'name' }; - let adapter = new ShareDataTableAdapter(documentListService, null, [col]); + let adapter = new ShareDataTableAdapter(documentListService, [col]); adapter.setSorting(new DataSorting('name', 'asc')); let page1 = new PageNode([file2, file1]); diff --git a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts index 0a723023fe3..4daad2b8491 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts @@ -41,10 +41,11 @@ export class ShareDataTableAdapter implements DataTableAdapter { selectedRow: DataRow; constructor(private documentListService: DocumentListService, - private basePath: string, - schema: DataColumn[] = []) { + schema: DataColumn[] = [], + sorting?: DataSorting) { this.rows = []; this.columns = schema || []; + this.sorting = sorting; } getRows(): Array { @@ -223,7 +224,7 @@ export class ShareDataTableAdapter implements DataTableAdapter { } getImagePath(id: string): any { - return `${this.basePath}assets/images/${id}`; + return require('../assets/images/' + id); } } diff --git a/ng2-components/ng2-alfresco-documentlist/src/models/content-action.model.ts b/ng2-components/ng2-alfresco-documentlist/src/models/content-action.model.ts index 00e36b25616..46a293b0216 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/models/content-action.model.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/models/content-action.model.ts @@ -21,7 +21,8 @@ export class ContentActionModel { handler: ContentActionHandler; target: string; permission: string; - disableWithNoPermission: boolean; + disableWithNoPermission: boolean = false; + disabled: boolean = false; constructor(obj?: any) { if (obj) { @@ -31,6 +32,7 @@ export class ContentActionModel { this.target = obj.target; this.permission = obj.permission; this.disableWithNoPermission = obj.disableWithNoPermission; + this.disabled = obj.disabled; } } } diff --git a/ng2-components/ng2-alfresco-documentlist/tsconfig.json b/ng2-components/ng2-alfresco-documentlist/tsconfig.json index 28919f9cc52..42e2a54cc86 100644 --- a/ng2-components/ng2-alfresco-documentlist/tsconfig.json +++ b/ng2-components/ng2-alfresco-documentlist/tsconfig.json @@ -16,22 +16,37 @@ "noFallthroughCasesInSwitch": true, "removeComments": true, "declaration": true, + "outDir": "./dist", + "baseUrl" : "./", + "paths": { + "ng2-alfresco-core": ["../ng2-alfresco-core/"], + "ng2-alfresco-datatable": ["../ng2-alfresco-datatable/"], + "ng2-activiti-diagrams": ["../ng2-activiti-diagrams/"], + "ng2-activiti-analytics":["../ng2-activiti-analytics/"], + "ng2-activiti-form":["../ng2-activiti-form/"], + "ng2-activiti-tasklist": ["../ng2-activiti-tasklist/"], + "ng2-activiti-processlist": ["../ng2-activiti-processlist/"], + "ng2-alfresco-documentlist": ["../ng2-alfresco-documentlist/"], + "ng2-alfresco-login": ["../ng2-alfresco-login/"], + "ng2-alfresco-search": ["../ng2-alfresco-search/"], + "ng2-alfresco-social": ["../ng2-alfresco-social/"], + "ng2-alfresco-tag": ["../ng2-alfresco-tag/"], + "ng2-alfresco-upload": ["../ng2-alfresco-upload/"], + "ng2-alfresco-viewer": ["../ng2-alfresco-viewer/"], + "ng2-alfresco-webscript": ["../ng2-alfresco-webscript/"], + "ng2-alfresco-userinfo": ["../ng2-alfresco-userinfo"], + "alfresco-js-api": ["../node_modules/alfresco-js-api/"] + }, "lib": [ "es2015", "dom" ], - "typeRoots": [ - "node_modules/@types" - ], "suppressImplicitAnyIndexErrors": true }, "exclude": [ "demo", "node_modules", - "dist", - "tools", - "gulpfile.ts", - "gulpfile.d.ts" + "dist" ], "angularCompilerOptions": { "strictMetadataEmit": false, diff --git a/ng2-components/ng2-alfresco-documentlist/tslint.json b/ng2-components/ng2-alfresco-documentlist/tslint.json deleted file mode 100644 index acc666937ed..00000000000 --- a/ng2-components/ng2-alfresco-documentlist/tslint.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "rules": { - "align": [ - true, - "parameters", - "statements" - ], - "ban": false, - "class-name": true, - "comment-format": [ - true, - "check-space" - ], - "curly": true, - "eofline": true, - "forin": true, - "indent": [ - true, - "spaces" - ], - "interface-name": false, - "jsdoc-format": true, - "label-position": true, - "label-undefined": true, - "max-line-length": [ - true, - 180 - ], - "member-ordering": [ - true, - "static-before-instance", - "variables-before-functions" - ], - "no-any": false, - "no-arg": true, - "no-bitwise": false, - "no-conditional-assignment": true, - "no-consecutive-blank-lines": true, - "no-console": [ - true, - "debug", - "info", - "time", - "timeEnd", - "trace" - ], - "no-construct": true, - "no-constructor-vars": false, - "no-debugger": true, - "no-duplicate-key": true, - "no-duplicate-variable": true, - "no-empty": false, - "no-eval": true, - "no-inferrable-types": false, - "no-internal-module": true, - "no-require-imports": false, - "no-shadowed-variable": true, - "no-switch-case-fall-through": true, - "no-trailing-whitespace": true, - "no-unreachable": true, - "no-unused-expression": true, - "no-unused-variable": true, - "no-use-before-declare": true, - "no-var-keyword": true, - "no-var-requires": true, - "object-literal-sort-keys": false, - "one-line": [ - true, - "check-open-brace", - "check-catch", - "check-else", - "check-whitespace" - ], - "quotemark": [ - true, - "single", - "avoid-escape" - ], - "radix": true, - "semicolon": true, - "switch-default": true, - "trailing-comma": [ - true, - { - "multiline": "never", - "singleline": "never" - } - ], - "triple-equals": [ - true, - "allow-null-check" - ], - "typedef": false, - "typedef-whitespace": [ - true, - { - "call-signature": "nospace", - "index-signature": "nospace", - "parameter": "nospace", - "property-declaration": "nospace", - "variable-declaration": "nospace" - } - ], - "use-strict": false, - "variable-name": [ - true, - "check-format", - "allow-leading-underscore", - "ban-keywords" - ], - "whitespace": [ - true, - "check-branch", - "check-operator", - "check-separator", - "check-type", - "check-module", - "check-decl" - ] - } -} diff --git a/ng2-components/ng2-alfresco-documentlist/webpack.build.js b/ng2-components/ng2-alfresco-documentlist/webpack.build.js new file mode 100644 index 00000000000..8246ca3c84f --- /dev/null +++ b/ng2-components/ng2-alfresco-documentlist/webpack.build.js @@ -0,0 +1,17 @@ +const webpack = require('webpack'); +const webpackMerge = require('webpack-merge'); +const commonConfig = require('./config/webpack.common.js'); + +module.exports = webpackMerge(commonConfig, { + + output: { + filename: './bundles/[name].js', + library: '[name]', + libraryTarget: 'umd', + chunkFilename: '[id].chunk.js' + }, + + entry: { + "ng2-alfresco-documentlist": "./index.ts" + } +}); diff --git a/ng2-components/ng2-alfresco-documentlist/webpack.test.js b/ng2-components/ng2-alfresco-documentlist/webpack.test.js new file mode 100644 index 00000000000..b6f4929fa4f --- /dev/null +++ b/ng2-components/ng2-alfresco-documentlist/webpack.test.js @@ -0,0 +1,8 @@ +const webpack = require('webpack'); +const webpackMerge = require('webpack-merge'); +const testConfig = require('./config/webpack.test.js'); + +module.exports = webpackMerge(testConfig, { + + +}); diff --git a/ng2-components/ng2-alfresco-login/.gitignore b/ng2-components/ng2-alfresco-login/.gitignore index fb23a7fef52..8dd503835e2 100644 --- a/ng2-components/ng2-alfresco-login/.gitignore +++ b/ng2-components/ng2-alfresco-login/.gitignore @@ -1,6 +1,7 @@ npm-debug.log node_modules .idea +.npmrc typings coverage dist diff --git a/ng2-components/ng2-alfresco-login/.npmignore b/ng2-components/ng2-alfresco-login/.npmignore index 8bb008aff40..cb0b8b2890e 100644 --- a/ng2-components/ng2-alfresco-login/.npmignore +++ b/ng2-components/ng2-alfresco-login/.npmignore @@ -1,5 +1,6 @@ npm-debug.log .idea +.npmrc coverage/ demo/ diff --git a/ng2-components/ng2-alfresco-login/README.md b/ng2-components/ng2-alfresco-login/README.md index b5ea5646869..d06660d9e5b 100644 --- a/ng2-components/ng2-alfresco-login/README.md +++ b/ng2-components/ng2-alfresco-login/README.md @@ -106,8 +106,8 @@ This component allow to authenticate to Alfresco One and Alfresco Activiti. Usage example of this component : **main.ts** -```ts +```ts import { NgModule, Component } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; @@ -153,9 +153,22 @@ export class AppComponent { export class AppModule { } platformBrowserDynamic().bootstrapModule(AppModule); - ``` +#### Properties + +| Name | Type | Default Value | Description | +| --- | --- | --- | --- | +| `providers` | string | ECM | Possible valid value are ECM, BPM or ALL. The default behaviour of this component will logged in only in the ECM . If you want log in in both system the correct value to use is ALL | +| `disableCsrf` | boolean | false | To prevent the CSRF Token from been submitted. Only for Activiti call | +| `needHelpLink` | string | '' | It will change the url of the NEED HELP link in the footer | +| `registerLink` | string | '' | It will change the url of the REGISTER link in the footer | +| `logoImageUrl` | string | Alfresco logo image | To change the logo image with a customised image | +| `backgroundImageUrl` | string | Alfresco background image | To change the background image with a customised image | +| `fieldsValidation` | { [key: string]: any; }, extra?: { [key: string]: any; } | | Use it to customise the validation rules of the login form | +| `showRememberMe` | boolean | false | Toggle `Remember me` checkbox visibility | +| `showLoginActions` | boolean | false | Toggle extra actions visibility (`Need Help`, `Register`, etc.) | + #### Events | Name | Description | @@ -164,19 +177,6 @@ platformBrowserDynamic().bootstrapModule(AppModule); | `onError` | The event is emitted when the login fails | | `executeSubmit` | The event is emitted when the form is submitted | -#### Options - -| Name | Options | Default | Description | Mandatory -| --- | --- | --- | --- | --- -| `providers` | *string* | ECM | Possible valid value are ECM, BPM or ALL. The default behaviour of this component will logged in only in the ECM . If you want log in in both system the correct value to use is ALL | -| `disableCsrf` | *boolean* | false | To prevent the CSRF Token from been submitted. Only for Activiti call | -| `needHelpLink` | *string* | '' | It will change the url of the NEED HELP link in the footer | -| `registerLink` | *string* | '' | It will change the url of the REGISTER link in the footer | -| `logoImageUrl` | *string* | Alfresco logo image | To change the logo image with a customised image | -| `backgroundImageUrl` | *string* | Alfresco background image | To change the background image with a customised image | -| `fieldsValidation` | *map* { [key: string]: any; }, extra?: { [key: string]: any; } | null | Use it to customise the validation rules of the login form | - - ## Change footer content 
@@ -370,7 +370,6 @@ npm start
| Command | Description |
| --- | --- |
| npm run build | Build component |
-| npm run build:w | Build component and keep watching the changes |
| npm run test | Run unit tests in the console |
| npm run test-browser | Run unit tests in the browser
| npm run coverage | Run unit tests and display code coverage report |
diff --git a/ng2-components/ng2-alfresco-login/config/assets/license_header.txt b/ng2-components/ng2-alfresco-login/config/assets/license_header.txt
new file mode 100644
index 00000000000..58ad8b656b2
--- /dev/null
+++ b/ng2-components/ng2-alfresco-login/config/assets/license_header.txt
@@ -0,0 +1,16 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
diff --git a/ng2-components/ng2-alfresco-login/config/assets/license_header_add.txt b/ng2-components/ng2-alfresco-login/config/assets/license_header_add.txt
new file mode 100644
index 00000000000..b38baa97165
--- /dev/null
+++ b/ng2-components/ng2-alfresco-login/config/assets/license_header_add.txt
@@ -0,0 +1,14 @@
+@license
+Copyright 2016 Alfresco Software, Ltd.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/ng2-components/ng2-alfresco-login/config/assets/tslint.json b/ng2-components/ng2-alfresco-login/config/assets/tslint.json
new file mode 100644
index 00000000000..611a015c7ec
--- /dev/null
+++ b/ng2-components/ng2-alfresco-login/config/assets/tslint.json
@@ -0,0 +1,118 @@
+{
+ "rules": {
+ "align": [
+ true,
+ "parameters",
+ "statements"
+ ],
+ "ban": false,
+ "class-name": true,
+ "comment-format": [
+ true,
+ "check-space"
+ ],
+ "curly": true,
+ "eofline": true,
+ "forin": true,
+ "indent": [
+ true,
+ "spaces"
+ ],
+ "interface-name": false,
+ "jsdoc-format": true,
+ "label-position": true,
+ "max-line-length": [
+ true,
+ 180
+ ],
+ "member-ordering": [
+ true,
+ "static-before-instance",
+ "variables-before-functions"
+ ],
+ "no-any": false,
+ "no-arg": true,
+ "no-bitwise": false,
+ "no-conditional-assignment": true,
+ "no-consecutive-blank-lines": true,
+ "no-console": [
+ true,
+ "debug",
+ "info",
+ "time",
+ "timeEnd",
+ "trace"
+ ],
+ "no-construct": true,
+ "no-constructor-vars": false,
+ "no-debugger": true,
+ "no-duplicate-variable": true,
+ "no-empty": false,
+ "no-eval": true,
+ "no-inferrable-types": false,
+ "no-internal-module": true,
+ "no-require-imports": false,
+ "no-shadowed-variable": true,
+ "no-switch-case-fall-through": true,
+ "no-trailing-whitespace": true,
+ "no-unused-expression": true,
+ "no-unused-variable": true,
+ "no-use-before-declare": true,
+ "no-var-keyword": true,
+ "no-var-requires": true,
+ "object-literal-sort-keys": false,
+ "one-line": [
+ true,
+ "check-open-brace",
+ "check-catch",
+ "check-else",
+ "check-whitespace"
+ ],
+ "quotemark": [
+ true,
+ "single",
+ "avoid-escape"
+ ],
+ "radix": true,
+ "semicolon": true,
+ "switch-default": true,
+ "trailing-comma": [
+ true,
+ {
+ "multiline": "never",
+ "singleline": "never"
+ }
+ ],
+ "triple-equals": [
+ true,
+ "allow-null-check"
+ ],
+ "typedef": false,
+ "typedef-whitespace": [
+ true,
+ {
+ "call-signature": "nospace",
+ "index-signature": "nospace",
+ "parameter": "nospace",
+ "property-declaration": "nospace",
+ "variable-declaration": "nospace"
+ }
+ ],
+ "use-strict": false,
+ "variable-name": [
+ true,
+ "check-format",
+ "allow-leading-underscore",
+ "ban-keywords"
+ ],
+ "whitespace": [
+ true,
+ "check-branch",
+ "check-operator",
+ "check-separator",
+ "check-type",
+ "check-module",
+ "check-decl"
+ ]
+ }
+}
diff --git a/ng2-components/ng2-alfresco-login/config/custom-loaders/file-loader-multi.js b/ng2-components/ng2-alfresco-login/config/custom-loaders/file-loader-multi.js
new file mode 100644
index 00000000000..dfbf93e76e0
--- /dev/null
+++ b/ng2-components/ng2-alfresco-login/config/custom-loaders/file-loader-multi.js
@@ -0,0 +1,70 @@
+var path = require('path');
+var loaderUtils = require('loader-utils');
+
+module.exports = function(content) {
+ this.cacheable && this.cacheable();
+ if(!this.emitFile) throw new Error('emitFile is required from module system');
+
+ var query = loaderUtils.getOptions(this) || {};
+ var configKey = query.config || 'multiFileLoader';
+ var options = this.options[configKey] || {};
+ var config = {
+ publicPath: false,
+ useRelativePath: false,
+ name: '[hash].[ext]'
+ };
+
+ // options takes precedence over config
+ Object.keys(options).forEach(function(attr) {
+ config[attr] = options[attr];
+ });
+
+ // query takes precedence over config and options
+ Object.keys(query).forEach(function(attr) {
+ config[attr] = query[attr];
+ });
+
+ var context = config.context || this.options.context;
+ var url = loaderUtils.interpolateName(this, config.name, {
+ context: context,
+ content: content,
+ regExp: config.regExp
+ });
+ var path = loaderUtils.interpolateName(this, '[path]', {
+ context: context,
+ content: content,
+ regExp: config.regExp
+ });
+
+ var outputPath = '';
+
+ if (config.outputPath) {
+ outputPath = (
+ typeof config.outputPath === 'function'
+ ? config.outputPath(url, path)
+ : config.outputPath + url
+ );
+ } else {
+ outputPath = url;
+ }
+
+ var publicPath = JSON.stringify(url);
+
+ if (config.publicPath) {
+ publicPath = JSON.stringify(
+ typeof config.publicPath === 'function'
+ ? config.publicPath(url, path)
+ : config.publicPath + url
+ );
+ }
+
+ publicPath = '__webpack_public_path__ + ' + publicPath;
+
+ if (query.emitFile === undefined || query.emitFile) {
+ this.emitFile(outputPath, content);
+ }
+
+ return 'module.exports = ' + publicPath + ';';
+};
+
+module.exports.raw = true;
diff --git a/ng2-components/ng2-alfresco-login/config/custom-loaders/license-check.js b/ng2-components/ng2-alfresco-login/config/custom-loaders/license-check.js
new file mode 100644
index 00000000000..6a15ac03e2a
--- /dev/null
+++ b/ng2-components/ng2-alfresco-login/config/custom-loaders/license-check.js
@@ -0,0 +1,67 @@
+var path = require('path');
+var loaderUtils = require('loader-utils');
+var fs = require('fs');
+
+var licenseFileUtf8Store = undefined;
+
+function readLicenseHeaderFile(licenseFilePath) {
+ if (licenseFileUtf8Store) {
+ return licenseFileUtf8Store;
+ }
+
+ if (fs.existsSync(licenseFilePath)) {
+ licenseFileUtf8Store = fs.readFileSync(licenseFilePath, 'utf8').split(/\r?\n/);
+ return licenseFileUtf8Store;
+ }
+
+ throw new Error('The license header file path is wrong ' + licenseFilePath);
+}
+
+function isFileEmpty(fileContents) {
+ return fileContents.toString('utf8').trim() === '';
+}
+
+function readCurrentFile(fileContent) {
+ return fileContent.toString('utf8').split(/\r?\n/);
+}
+
+function isLicenseHeaderPresent(currentFileContent, licenseFilePath) {
+ if (!isFileEmpty(currentFileContent)) {
+ var currentFileUtf8 = readCurrentFile(currentFileContent),
+ licenseFileUtf8 = readLicenseHeaderFile(licenseFilePath);
+ skipStrict = 0;
+
+ if(currentFileUtf8[0] === '"use strict";' ) {
+ skipStrict = 1;
+ }
+
+ for (var i = skipStrict; i < licenseFileUtf8.length; i++) {
+ if (currentFileUtf8[i + skipStrict] !== licenseFileUtf8[i]) {
+ return false;
+ }
+ }
+ }
+ return true;
+}
+
+function report(hasHeader, emitter, filename) {
+ if (hasHeader) return;
+ emitter('Missing license header file : ' + filename);
+}
+
+function licenseCheck(webpackInstance, input, options) {
+ var isLicensePresent = isLicenseHeaderPresent(input, options.licenseFile);
+
+ var emitter = options.emitErrors ? webpackInstance.emitError : webpackInstance.emitWarning;
+
+ report(isLicensePresent, emitter, webpackInstance.resourcePath);
+}
+
+module.exports = function(input, map) {
+ this.cacheable && this.cacheable();
+ var callback = this.async();
+
+ var options = loaderUtils.getOptions(this);
+ licenseCheck(this, input, options);
+ callback(null, input, map);
+};
diff --git a/ng2-components/ng2-alfresco-login/config/helpers.js b/ng2-components/ng2-alfresco-login/config/helpers.js
new file mode 100644
index 00000000000..a11fa771d6c
--- /dev/null
+++ b/ng2-components/ng2-alfresco-login/config/helpers.js
@@ -0,0 +1,10 @@
+var path = require('path');
+
+var _root = path.resolve(__dirname, '..');
+
+function root(args) {
+ args = Array.prototype.slice.call(arguments, 0);
+ return path.join.apply(path, [_root].concat(args));
+}
+
+exports.root = root;
diff --git a/ng2-components/ng2-alfresco-login/config/webpack.common.js b/ng2-components/ng2-alfresco-login/config/webpack.common.js
new file mode 100644
index 00000000000..52a680e87e4
--- /dev/null
+++ b/ng2-components/ng2-alfresco-login/config/webpack.common.js
@@ -0,0 +1,124 @@
+const webpack = require('webpack');
+const helpers = require('./helpers');
+const fs = require('fs');
+const path = require('path');
+
+module.exports = {
+
+ resolveLoader: {
+ alias: {
+ "file-multi-loader": path.resolve(__dirname, "./custom-loaders/file-loader-multi"),
+ "license-check": path.resolve(__dirname, "./custom-loaders/license-check")
+ }
+ },
+
+ // require those dependencies but don't bundle them
+ externals: [
+ /^\@angular\//,
+ /^rxjs\//,
+ 'moment',
+ 'raphael',
+ 'ng2-charts',
+ 'alfresco-js-api',
+ 'ng2-alfresco-core',
+ 'ng2-alfresco-datatable',
+ 'ng2-activiti-analytics',
+ 'ng2-activiti-diagrams',
+ 'ng2-activiti-form',
+ "ng2-activiti-tasklist",
+ 'ng2-alfresco-documentlist'
+ ],
+
+ module: {
+ rules: [
+ {
+ enforce: 'pre',
+ test: /\.js$/,
+ loader: 'source-map-loader',
+ exclude: [/node_modules/, /bundles/, /dist/, /demo/]
+ },
+ {
+ enforce: 'pre',
+ test: /\.ts$/,
+ use: 'source-map-loader',
+ exclude: [/node_modules/, /bundles/, /dist/, /demo/]
+ },
+ {
+ enforce: 'pre',
+ test: /\.ts$/,
+ loader: 'tslint-loader',
+ options: {
+ emitErrors: true,
+ configFile: path.resolve(__dirname, './assets/tslint.json')
+ },
+ exclude: [/node_modules/, /bundles/, /dist/, /demo/]
+ },
+ {
+ test: /\.ts$/,
+ use: ['ts-loader', 'angular2-template-loader'],
+ exclude: [/node_modules/, /bundles/, /dist/, /demo/]
+ },
+ {
+ test: /\.html$/,
+ loader: 'html-loader',
+ exclude: [/node_modules/, /bundles/, /dist/, /demo/]
+ },
+ {
+ test: /\.css$/,
+ loader: ['to-string-loader', 'css-loader'],
+ exclude: [/node_modules/, /bundles/, /dist/, /demo/]
+ },{
+ enforce: 'pre',
+ test: /\.ts$/,
+ loader: 'license-check',
+ options: {
+ emitErrors: true,
+ licenseFile: path.resolve(__dirname, './assets/license_header.txt')
+ },
+ exclude: [/node_modules/, /bundles/, /dist/, /demo/, /rendering-queue.services.ts/ ],
+ },
+ {
+ test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)$/,
+ loader: 'file-multi-loader',
+ query: {
+ name: '[name].[hash].[ext]',
+ outputPath: (url, resourcePath)=> {
+ return resourcePath.replace('src', 'bundles') + url;
+ },
+ publicPath: (url, resourcePath)=> {
+ var component = resourcePath.substring(0, resourcePath.indexOf('src'));
+ var path = resourcePath.replace(component, '').replace('src/', '');
+ return path + url;
+ }
+ }
+ }
+ ]
+ },
+
+ resolve: {
+ extensions: ['.ts', '.js'],
+ symlinks: false,
+ modules: [
+ '../ng2-components', 'node_modules'
+ ]
+ },
+
+ plugins: [
+ new webpack.NoEmitOnErrorsPlugin(),
+
+ new webpack.BannerPlugin(fs.readFileSync(path.resolve(__dirname, './assets/license_header_add.txt'), 'utf8')),
+
+ new webpack.ContextReplacementPlugin(
+ /angular(\\|\/)core(\\|\/)@angular/,
+ helpers.root('./src'),
+ {}
+ )
+ ],
+
+ devtool: 'cheap-module-source-map',
+
+ node: {
+ fs: 'empty',
+ module: false
+ }
+};
diff --git a/ng2-components/ng2-alfresco-login/config/webpack.test.js b/ng2-components/ng2-alfresco-login/config/webpack.test.js
new file mode 100644
index 00000000000..486fed8c159
--- /dev/null
+++ b/ng2-components/ng2-alfresco-login/config/webpack.test.js
@@ -0,0 +1,85 @@
+const webpack = require('webpack');
+const helpers = require('./helpers');
+
+const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
+
+module.exports = {
+
+ devtool: 'inline-source-map',
+
+ resolve: {
+ extensions: ['.ts', '.js'],
+ symlinks: false,
+ modules: [helpers.root('../ng2-components'), helpers.root('node_modules')]
+ },
+
+ module: {
+ rules: [
+ {
+ enforce: 'pre',
+ test: /\.js$/,
+ loader: 'source-map-loader',
+ exclude: [/node_modules/, /bundles/, /dist/, /demo/]
+ },
+ {
+ test: /\.ts$/,
+ loaders: ['ts-loader?' + JSON.stringify({ transpileOnly: true}), 'angular2-template-loader'],
+ exclude: [/node_modules/, /bundles/, /dist/, /demo/]
+ },
+ {
+ test: /\.html$/,
+ loader: 'html-loader',
+ exclude: [/node_modules/, /bundles/, /dist/, /demo/]
+ },
+ {
+ test: /\.css$/,
+ loader: ['to-string-loader', 'css-loader'],
+ exclude: [/node_modules/, /bundles/, /dist/, /demo/]
+ },
+ {
+ test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico|pdf)$/,
+ loader: 'file-loader',
+ query: {
+ name: '[path][name].[ext]',
+ outputPath: (url)=> {
+ return url.replace('src', 'dist');
+ }
+ }
+ },
+ {
+ enforce: 'post',
+ test: /\.ts$/,
+ loader: 'istanbul-instrumenter-loader',
+ exclude: [
+ /node_modules/,
+ /test/
+ ]
+ }
+ ]
+ },
+
+ plugins: [
+ new webpack.NoEmitOnErrorsPlugin(),
+
+ new webpack.ContextReplacementPlugin(
+ /angular(\\|\/)core(\\|\/)@angular/,
+ helpers.root('./src'),
+ {}
+ ),
+ new webpack.DefinePlugin({
+ 'process.env': {
+ 'ENV': JSON.stringify(ENV)
+ }
+ }),
+ new webpack.LoaderOptionsPlugin({
+ htmlLoader: {
+ minimize: false // workaround for ng2
+ }
+ })
+ ],
+
+ node: {
+ fs: 'empty',
+ module: false
+ }
+};
diff --git a/ng2-components/ng2-alfresco-login/demo/package.json b/ng2-components/ng2-alfresco-login/demo/package.json
index 832428db1a9..e8d5c42c141 100644
--- a/ng2-components/ng2-alfresco-login/demo/package.json
+++ b/ng2-components/ng2-alfresco-login/demo/package.json
@@ -5,14 +5,14 @@
"author": "Alfresco Software, Ltd.",
"main": "index.js",
"scripts": {
- "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings dist",
+ "clean": "npm run clean-build && rimraf dist node_modules typings dist",
"clean-build" : "rimraf 'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts'",
"postinstall": "npm run build",
"start": "npm run build && concurrently \"npm run tsc:w\" \"npm run server\" ",
"server": "wsrv -o -s -l",
"build": "npm run tslint && npm run clean-build && npm run tsc",
"build:w": "npm run tslint && rimraf dist && npm run tsc:w",
- "travis": "npm link ng2-alfresco-core",
+ "travis": "npm link ng2-alfresco-core ng2-alfresco-login",
"tsc": "tsc",
"tsc:w": "tsc -w",
"tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts -e '{,**/}**.d.ts'"
@@ -47,31 +47,33 @@
"alfresco"
],
"dependencies": {
- "@angular/common": "2.2.2",
- "@angular/compiler": "2.2.2",
- "@angular/compiler-cli": "2.2.2",
- "@angular/core": "2.2.2",
- "@angular/forms": "2.2.2",
- "@angular/http": "2.2.2",
- "@angular/platform-browser": "2.2.2",
- "@angular/platform-browser-dynamic": "2.2.2",
+ "@angular/animations": "~4.0.0",
+ "@angular/common": "~4.0.0",
+ "@angular/compiler": "~4.0.0",
+ "@angular/core": "~4.0.0",
+ "@angular/forms": "~4.0.0",
+ "@angular/http": "~4.0.0",
+ "@angular/platform-browser": "~4.0.0",
+ "@angular/platform-browser-dynamic": "~4.0.0",
+ "@angular/router": "~4.0.0",
+
"@angular/material": "2.0.0-beta.1",
- "@angular/router": "3.2.2",
- "@angular/upgrade": "2.2.2",
+ "alfresco-js-api": "~1.5.0",
"core-js": "2.4.1",
+ "hammerjs": "2.0.8",
+ "ng2-alfresco-core": "1.5.0",
+ "ng2-translate": "5.0.0",
"reflect-metadata": "0.1.10",
- "rxjs": "5.0.0-beta.12",
+ "rxjs": "5.1.0",
"systemjs": "0.19.27",
- "zone.js": "0.6.26",
+ "zone.js": "0.7.6",
+
"intl": "1.2.4",
"dialog-polyfill": "0.4.7",
"element.scrollintoviewifneeded-polyfill": "1.0.1",
"material-design-icons": "2.2.3",
"material-design-lite": "1.2.1",
- "ng2-translate": "2.5.0",
- "alfresco-js-api": "~1.4.0",
- "ng2-alfresco-core": "1.4.0",
- "ng2-alfresco-login": "1.4.0"
+ "ng2-alfresco-login": "1.5.0"
},
"devDependencies": {
"@types/jasmine": "^2.2.33",
diff --git a/ng2-components/ng2-alfresco-login/demo/systemjs.config.js b/ng2-components/ng2-alfresco-login/demo/systemjs.config.js
index c1d9ec9a819..49c8cd8c901 100644
--- a/ng2-components/ng2-alfresco-login/demo/systemjs.config.js
+++ b/ng2-components/ng2-alfresco-login/demo/systemjs.config.js
@@ -22,6 +22,9 @@
'@angular/router': 'npm:@angular/router/bundles/router.umd.js',
'@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
'@angular/material': 'npm:@angular/material/bundles/material.umd.js',
+ '@angular/animations': 'npm:@angular/animations/bundles/animations.umd.min.js',
+ '@angular/animations/browser':'npm:@angular/animations/bundles/animations-browser.umd.js',
+ '@angular/platform-browser/animations': 'npm:@angular/platform-browser/bundles/platform-browser-animations.umd.js',
// other libraries
'rxjs': 'npm:rxjs',
@@ -41,8 +44,8 @@
},
'ng2-translate': { defaultExtension: 'js' },
'alfresco-js-api': { main: './alfresco-js-api.js', defaultExtension: 'js'},
- 'ng2-alfresco-core': { main: './index.js', defaultExtension: 'js'},
- 'ng2-alfresco-login': { main: './index.js', defaultExtension: 'js'}
+ 'ng2-alfresco-core': {main: './bundles/ng2-alfresco-core.js', defaultExtension: 'js'},
+ 'ng2-alfresco-login': {main: './bundles/ng2-alfresco-login.js', defaultExtension: 'js'}
}
});
})(this);
diff --git a/ng2-components/ng2-alfresco-login/demo/tslint.json b/ng2-components/ng2-alfresco-login/demo/tslint.json
index 8c9703b9de6..36e753c92cf 100644
--- a/ng2-components/ng2-alfresco-login/demo/tslint.json
+++ b/ng2-components/ng2-alfresco-login/demo/tslint.json
@@ -36,7 +36,7 @@
],
"no-any": false,
"no-arg": true,
- "no-bitwise": true,
+ "no-bitwise": false,
"no-conditional-assignment": true,
"no-consecutive-blank-lines": true,
"no-console": [
@@ -52,11 +52,11 @@
"no-debugger": true,
"no-duplicate-key": true,
"no-duplicate-variable": true,
- "no-empty": true,
+ "no-empty": false,
"no-eval": true,
"no-inferrable-types": false,
"no-internal-module": true,
- "no-require-imports": true,
+ "no-require-imports": false,
"no-shadowed-variable": true,
"no-switch-case-fall-through": true,
"no-trailing-whitespace": true,
diff --git a/ng2-components/ng2-alfresco-login/gulpfile.ts b/ng2-components/ng2-alfresco-login/gulpfile.ts
deleted file mode 100755
index ebf8207f0d2..00000000000
--- a/ng2-components/ng2-alfresco-login/gulpfile.ts
+++ /dev/null
@@ -1,307 +0,0 @@
-import * as gulp from 'gulp';
-import * as util from 'gulp-util';
-import * as runSequence from 'run-sequence';
-import * as gulpLoadPlugins from 'gulp-load-plugins';
-import * as merge from 'merge-stream';
-import * as rimraf from 'rimraf';
-import { join } from 'path';
-import * as Builder from 'systemjs-builder';
-var autoprefixer = require('autoprefixer');
-import * as cssnano from 'cssnano';
-import * as filter from 'gulp-filter';
-import * as sourcemaps from 'gulp-sourcemaps';
-
-var APP_SRC = `.`;
-var CSS_PROD_BUNDLE = 'main.css';
-var JS_PROD_SHIMS_BUNDLE = 'shims.js';
-var NG_FACTORY_FILE = 'main-prod';
-
-const BUILD_TYPES = {
- DEVELOPMENT: 'dev',
- PRODUCTION: 'prod'
-};
-
-function normalizeDependencies(deps) {
- deps
- .filter((d) => !/\*/.test(d.src)) // Skip globs
- .forEach((d) => d.src = require.resolve(d.src));
- return deps;
-}
-
-function filterDependency(type: string, d): boolean {
- const t = d.buildType || d.env;
- d.buildType = t;
- if (!t) {
- d.buildType = Object.keys(BUILD_TYPES).map(k => BUILD_TYPES[k]);
- }
- if (!(d.buildType instanceof Array)) {
- (d).env = [d.buildType]; - } - return d.buildType.indexOf(type) >= 0; -} - -function getInjectableDependency() { - var APP_ASSETS = [ - {src: `src/css/main.css`, inject: true, vendor: false}, - ]; - - var NPM_DEPENDENCIES = [ - {src: 'zone.js/dist/zone.js', inject: 'libs'}, - {src: 'core-js/client/shim.min.js', inject: 'shims'}, - {src: 'systemjs/dist/system.src.js', inject: 'shims', buildType:'dev'} - ]; - - return normalizeDependencies(NPM_DEPENDENCIES.filter(filterDependency.bind(null, 'dev'))) - .concat(APP_ASSETS.filter(filterDependency.bind(null, 'dev'))); -} - -const plugins = gulpLoadPlugins(); - -let tsProjects: any = {}; - -function makeTsProject(options: Object = {}) { - let optionsHash = JSON.stringify(options); - if (!tsProjects[optionsHash]) { - let config = Object.assign({ - typescript: require('typescript') - }, options); - tsProjects[optionsHash] = - plugins.typescript.createProject('tsconfig.json', config); - } - return tsProjects[optionsHash]; -} - -gulp.task('build.html_css', () => { - const gulpConcatCssConfig = { - targetFile: CSS_PROD_BUNDLE, - options: { - rebaseUrls: false - } - }; - - const processors = [ - autoprefixer({ - browsers: [ - 'ie >= 10', - 'ie_mob >= 10', - 'ff >= 30', - 'chrome >= 34', - 'safari >= 7', - 'opera >= 23', - 'ios >= 7', - 'android >= 4.4', - 'bb >= 10' - ] - }) - ]; - - const reportPostCssError = (e: any) => util.log(util.colors.red(e.message)); - - processors.push( - cssnano({ - discardComments: {removeAll: true}, - discardUnused: false, // unsafe, see http://goo.gl/RtrzwF - zindex: false, // unsafe, see http://goo.gl/vZ4gbQ - reduceIdents: false // unsafe, see http://goo.gl/tNOPv0 - }) - ); - - /** - * Processes the CSS files within `src/client` excluding those in `src/client/assets` using `postcss` with the - * configured processors - * Execute the appropriate component-stylesheet processing method based on user stylesheet preference. - */ - function processComponentStylesheets() { - return gulp.src(join('src/**', '*.css')) - .pipe(plugins.cached('process-component-css')) - .pipe(plugins.postcss(processors)) - .on('error', reportPostCssError); - } - - - /** - * Get a stream of external css files for subsequent processing. - */ - function getExternalCssStream() { - return gulp.src(getExternalCss()) - .pipe(plugins.cached('process-external-css')); - } - - /** - * Get an array of filenames referring to all external css stylesheets. - */ - function getExternalCss() { - return getInjectableDependency().filter(dep => /\.css$/.test(dep.src)).map(dep => dep.src); - } - - /** - * Processes the external CSS files using `postcss` with the configured processors. - */ - function processExternalCss() { - return getExternalCssStream() - .pipe(plugins.postcss(processors)) - .pipe(plugins.concatCss(gulpConcatCssConfig.targetFile, gulpConcatCssConfig.options)) - .on('error', reportPostCssError); - } - - return merge(processComponentStylesheets(), processExternalCss()); - -}); - -gulp.task('build.bundles.app', (done) => { - var BUNDLER_OPTIONS = { - format: 'umd', - minify: false, - mangle: false, - sourceMaps: true - }; - var CONFIG_TYPESCRIPT = { - baseURL: '.', - transpiler: 'typescript', - typescriptOptions: { - module: 'cjs' - }, - map: { - typescript: 'node_modules/typescript/lib/typescript.js', - '@angular': 'node_modules/@angular', - rxjs: 'node_modules/rxjs', - 'ng2-translate': 'node_modules/ng2-translate', - 'alfresco-js-api': 'node_modules/alfresco-js-api/dist/alfresco-js-api', - 'ng2-alfresco-core': 'node_modules/ng2-alfresco-core/', - 'ng2-activiti-diagrams': 'node_modules/ng2-activiti-diagrams/', - 'ng2-activiti-analytics': 'node_modules/ng2-activiti-analytics/', - 'ng2-alfresco-datatable': 'node_modules/ng2-alfresco-datatable/', - 'ng2-alfresco-documentlist': 'node_modules/ng2-alfresco-documentlist/', - 'ng2-activiti-form': 'node_modules/ng2-activiti-form/', - 'ng2-alfresco-login': 'node_modules/ng2-alfresco-login/', - 'ng2-activiti-processlist': 'node_modules/ng2-activiti-processlist/', - 'ng2-alfresco-search': 'node_modules/ng2-alfresco-search/', - 'ng2-activiti-tasklist': 'node_modules/ng2-activiti-tasklist/', - 'ng2-alfresco-tag': 'node_modules/ng2-alfresco-tag/', - 'ng2-alfresco-upload': 'node_modules/ng2-alfresco-upload/', - 'ng2-alfresco-userinfo': 'node_modules/ng2-alfresco-userinfo/', - 'ng2-alfresco-viewer': 'node_modules/ng2-alfresco-viewer/', - 'ng2-alfresco-webscript': 'node_modules/ng2-alfresco-webscript/' - }, - paths: { - '*': '*.js' - }, - meta: { - 'node_modules/@angular/*': {build: false}, - 'node_modules/rxjs/*': {build: false}, - 'node_modules/ng2-translate/*': {build: false}, - 'node_modules/ng2-alfresco-core/*': {build: false}, - 'node_modules/ng2-activiti-diagrams/*': {build: false}, - 'node_modules/ng2-activiti-analytics/*': {build: false}, - 'node_modules/ng2-alfresco-datatable/*': {build: false}, - 'node_modules/ng2-alfresco-documentlist/*': {build: false}, - 'node_modules/ng2-activiti-form/*': {build: false}, - 'node_modules/ng2-alfresco-login/*': {build: false}, - 'node_modules/ng2-activiti-processlist/*': {build: false}, - 'node_modules/ng2-alfresco-search/*': {build: false}, - 'node_modules/ng2-activiti-tasklist/*': {build: false}, - 'node_modules/ng2-alfresco-tag/*': {build: false}, - 'node_modules/ng2-alfresco-upload/*': {build: false}, - 'node_modules/ng2-alfresco-userinfo/*': {build: false}, - 'node_modules/ng2-alfresco-viewer/*': {build: false}, - 'node_modules/ng2-alfresco-webscript/*': {build: false} - } - }; - - var pkg = require('./package.json'); - var namePkg = pkg.name; - - var builder = new Builder(CONFIG_TYPESCRIPT); - builder - .buildStatic(APP_SRC + "/index", 'bundles/' + namePkg + '.js', BUNDLER_OPTIONS) - .then(function () { - return done(); - }) - .catch(function (err) { - return done(err); - }); -}); - -gulp.task('build.assets.prod', () => { - return gulp.src([ - join('src/**', '*.ts'), - 'index.ts', - join('src/**', '*.css'), - join('src/**', '*.html'), - '!'+join('*/**', '*.d.ts'), - '!'+join('*/**', '*.spec.ts'), - '!gulpfile.ts']) - -}); - -gulp.task('build.bundles', () => { - merge(bundleShims()); - - /** - * Returns the shim files to be injected. - */ - function getShims() { - let libs = getInjectableDependency() - .filter(d => /\.js$/.test(d.src)); - - return libs.filter(l => l.inject === 'shims') - .concat(libs.filter(l => l.inject === 'libs')) - .concat(libs.filter(l => l.inject === true)) - .map(l => l.src); - } - - /** - * Bundles the shim files. - */ - function bundleShims() { - return gulp.src(getShims()) - .pipe(plugins.concat(JS_PROD_SHIMS_BUNDLE)) - // Strip the first (global) 'use strict' added by reflect-metadata, but don't strip any others to avoid unintended scope leaks. - .pipe(plugins.replace(/('|")use strict\1;var Reflect;/, 'var Reflect;')) - .pipe(gulp.dest('bundles')); - } - -}); - -gulp.task('build.js.prod', () => { - const INLINE_OPTIONS = { - base: APP_SRC, - target: 'es5', - useRelativePaths: true, - removeLineBreaks: true - }; - - let tsProject = makeTsProject(); - let src = [ - join('src/**/*.ts'), - join('!src/**/*.d.ts'), - join('!src/**/*.spec.ts'), - `!src/**/${NG_FACTORY_FILE}.ts` - ]; - - let result = gulp.src(src) - .pipe(plugins.plumber()) - .pipe(plugins.inlineNg2Template(INLINE_OPTIONS)) - .pipe(sourcemaps.init()) - .pipe(tsProject()) - .once('error', function (e: any) { - this.once('finish', () => process.exit(1)); - }); - - return result.js - .pipe(plugins.template()) - .pipe(sourcemaps.write()) - .pipe(gulp.dest('src')) - .on('error', (e: any) => { - console.log(e); - }); -}); - -gulp.task('build.prod', (done: any) => - runSequence( - 'build.assets.prod', - 'build.html_css', - 'build.js.prod', - 'build.bundles', - 'build.bundles.app', - done)); diff --git a/ng2-components/ng2-alfresco-login/karma-test-shim.js b/ng2-components/ng2-alfresco-login/karma-test-shim.js index 8696dd2b16e..64b94c4ab5e 100644 --- a/ng2-components/ng2-alfresco-login/karma-test-shim.js +++ b/ng2-components/ng2-alfresco-login/karma-test-shim.js @@ -1,115 +1,25 @@ -// Tun on full stack traces in errors to help debugging Error.stackTraceLimit = Infinity; -jasmine.DEFAULT_TIMEOUT_INTERVAL = 100000; +require('core-js/es6'); +require('core-js/es7/reflect'); -window.componentHandler = { - upgradeAllRegistered: function () { - }, - upgradeElement: function () { - } -}; +require('zone.js/dist/zone'); +require('zone.js/dist/long-stack-trace-zone'); +require('zone.js/dist/proxy'); +require('zone.js/dist/sync-test'); +require('zone.js/dist/jasmine-patch'); +require('zone.js/dist/async-test'); +require('zone.js/dist/fake-async-test'); -__karma__.loaded = function() {}; +jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000; -var builtPath = '/base/src/'; +var appContext = require.context('./src', true, /\.spec\.ts/); +appContext.keys().forEach(appContext); -function isJsFile(path) { - return path.slice(-3) == '.js'; -} -function isSpecFile(path) { - return /\.spec\.(.*\.)?js$/.test(path); -} +var testing = require('@angular/core/testing'); +var browser = require('@angular/platform-browser-dynamic/testing'); -function isBuiltFile(path) { - return isJsFile(path) && (path.substr(0, builtPath.length) == builtPath); -} +testing.TestBed.initTestEnvironment(browser.BrowserDynamicTestingModule, browser.platformBrowserDynamicTesting()); -var allSpecFiles = Object.keys(window.__karma__.files) - .filter(isSpecFile) - .filter(isBuiltFile); -var paths = { - // paths serve as alias - 'npm:': 'base/node_modules/' -}; - -var map = { - 'app': 'base/src', - // angular bundles - '@angular/core': 'npm:@angular/core/bundles/core.umd.js', - '@angular/common': 'npm:@angular/common/bundles/common.umd.js', - '@angular/compiler': 'npm:@angular/compiler/bundles/compiler.umd.js', - '@angular/platform-browser': 'npm:@angular/platform-browser/bundles/platform-browser.umd.js', - '@angular/platform-browser-dynamic': 'npm:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js', - '@angular/http': 'npm:@angular/http/bundles/http.umd.js', - '@angular/router': 'npm:@angular/router/bundles/router.umd.js', - '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js', - '@angular/material': 'npm:@angular/material/bundles/material.umd.js', - - // testing - '@angular/core/testing': 'npm:@angular/core/bundles/core-testing.umd.js', - '@angular/common/testing': 'npm:@angular/common/bundles/common-testing.umd.js', - '@angular/compiler/testing': 'npm:@angular/compiler/bundles/compiler-testing.umd.js', - '@angular/platform-browser/testing': 'npm:@angular/platform-browser/bundles/platform-browser-testing.umd.js', - '@angular/platform-browser-dynamic/testing': 'npm:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic-testing.umd.js', - '@angular/http/testing': 'npm:@angular/http/bundles/http-testing.umd.js', - '@angular/router/testing': 'npm:@angular/router/bundles/router-testing.umd.js', - '@angular/forms/testing': 'npm:@angular/forms/bundles/forms-testing.umd.js', - - // other libraries - 'rxjs': 'npm:rxjs', - 'ng2-translate': 'npm:ng2-translate', - 'hammerjs': 'npm:hammerjs', - - 'alfresco-js-api': 'npm:alfresco-js-api/dist', - 'ng2-alfresco-core': 'npm:ng2-alfresco-core' -}; - -var packages = { - 'app': { main: 'main.js', defaultExtension: 'js' }, - 'rxjs': { defaultExtension: 'js' }, - 'ng2-translate': { defaultExtension: 'js' }, - 'hammerjs': {main: './hammerjs.js', defaultExtension: 'js'}, - - 'alfresco-js-api': { main: './alfresco-js-api.js', defaultExtension: 'js'}, - 'ng2-alfresco-core': { main: './index.js', defaultExtension: 'js'} -}; - -var config = { - paths: paths, - map: map, - packages: packages -}; - -System.config(config); - -System.import('@angular/core/testing') - .then(initTestBed) - .then(initTesting); - -function initTestBed(){ - return Promise.all([ - System.import('@angular/core/testing'), - System.import('@angular/platform-browser-dynamic/testing') - ]) - .then(function (providers) { - var coreTesting = providers[0]; - var browserTesting = providers[1]; - - coreTesting.TestBed.initTestEnvironment( - browserTesting.BrowserDynamicTestingModule, - browserTesting.platformBrowserDynamicTesting()); - }) -} - -// Import all spec files and start karma -function initTesting () { - return Promise.all( - allSpecFiles.map(function (moduleName) { - return System.import(moduleName); - }) - ) - .then(__karma__.start, __karma__.error); -} diff --git a/ng2-components/ng2-alfresco-login/karma.conf.js b/ng2-components/ng2-alfresco-login/karma.conf.js index 0ddb8bc9854..8c0e83bd7e1 100644 --- a/ng2-components/ng2-alfresco-login/karma.conf.js +++ b/ng2-components/ng2-alfresco-login/karma.conf.js @@ -1,70 +1,36 @@ -'use strict'; +var webpackConfig = require('./webpack.test'); module.exports = function (config) { - var configuration = { + var _config = { basePath: '.', frameworks: ['jasmine-ajax', 'jasmine'], files: [ - // System.js for module loading - 'node_modules/systemjs/dist/system.src.js', - - // Polyfills - 'node_modules/core-js/client/shim.js', - 'node_modules/reflect-metadata/Reflect.js', - - // zone.js - 'node_modules/zone.js/dist/zone.js', - 'node_modules/zone.js/dist/long-stack-trace-zone.js', - 'node_modules/zone.js/dist/proxy.js', - 'node_modules/zone.js/dist/sync-test.js', - 'node_modules/zone.js/dist/jasmine-patch.js', - 'node_modules/zone.js/dist/async-test.js', - 'node_modules/zone.js/dist/fake-async-test.js', - 'node_modules/hammerjs/hammer.js', - - // RxJs - { pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false }, - { pattern: 'node_modules/rxjs/**/*.js.map', included: false, watched: false }, - - // Paths loaded via module imports: - // Angular itself - {pattern: 'node_modules/@angular/**/*.js', included: false, watched: false}, - {pattern: 'node_modules/@angular/**/*.js.map', included: false, watched: false}, - - 'node_modules/alfresco-js-api/dist/alfresco-js-api.js', - - {pattern: 'node_modules/ng2-translate/**/*.js', included: false, watched: false}, - - 'karma-test-shim.js', - - // paths loaded via module imports - {pattern: 'src/**/*.js', included: false, watched: true}, - {pattern: 'src/**/*.html', included: true, served: true, watched: true}, - {pattern: 'src/**/*.css', included: true, served: true, watched: true}, - - // ng2-components - { pattern: 'node_modules/ng2-alfresco-core/src/**/*.js', included: false, served: true, watched: false }, - { pattern: 'node_modules/ng2-alfresco-core/index.js', included: false, served: true, watched: false }, - - // paths to support debugging with source maps in dev tools - {pattern: 'src/**/*.ts', included: false, watched: false}, - {pattern: 'src/**/*.js.map', included: false, watched: false}, - - //Assets - {pattern: 'src/assets/images/background.svg', included: false, watched: false}, - {pattern: 'src/assets/images/alfresco-logo.svg', included: false, watched: false} + './node_modules/hammerjs/hammer.js', + + //diagrams + './node_modules/chart.js/dist/Chart.js', + './node_modules/alfresco-js-api/dist/alfresco-js-api.js', + './node_modules/raphael/raphael.js', + './node_modules/moment/min/moment.min.js', + './node_modules/md-date-time-picker/dist/js/mdDateTimePicker.js', + + {pattern: './node_modules/ng2-translate/**/*.js', included: false, watched: false}, + {pattern: './node_modules/ng2-charts/**/*.js', included: false, served: true, watched: false}, + {pattern: './node_modules/md-date-time-picker/**/*.js', included: false, served: true, watched: false}, + {pattern: './node_modules/moment/**/*.js', included: false, served: true, watched: false}, + + {pattern: 'karma-test-shim.js', watched: false}, + {pattern: './src/assets/**/*.*', included: false, served: true, watched: false}, + {pattern: './src/i18n/**/*.*', included: false, served: true, watched: false}, + {pattern: './src/**/*.ts', included: false, served: true, watched: false} ], - exclude: [ - 'node_modules/**/*spec.js' - ], + webpack: webpackConfig, - // proxied base paths - proxies: { - // required for component assets fetched by Angular's compiler - '/src/': '/base/src/' + webpackMiddleware: { + stats: 'errors-only' }, port: 9876, @@ -93,29 +59,35 @@ module.exports = function (config) { // Karma plugins loaded plugins: [ - 'karma-jasmine', - 'karma-coverage', - 'karma-jasmine-ajax', - 'karma-chrome-launcher', - 'karma-mocha-reporter', - 'karma-jasmine-html-reporter' + require('./node_modules/karma-jasmine'), + require('./node_modules/karma-coverage'), + require('./node_modules/karma-sourcemap-loader'), + require('./node_modules/karma-jasmine-ajax'), + require('./node_modules/karma-chrome-launcher'), + require('./node_modules/karma-mocha-reporter'), + require('./node_modules/karma-webpack'), + require('./node_modules/karma-jasmine-html-reporter') ], + webpackServer: { + noInfo: true + }, + // Coverage reporter generates the coverage reporters: ['mocha', 'coverage', 'kjhtml'], - // Source files that you wanna generate coverage for. - // Do not include tests or libraries (these files will be instrumented by Istanbul) preprocessors: { - 'src/**/!(*spec|index|*mock|*model|*event).js': 'coverage' + 'karma-test-shim.js': ['webpack', 'sourcemap'], + './src/**/!(*spec|index|*mock|*model|*event).js': 'coverage' }, coverageReporter: { includeAllSources: true, - dir: 'coverage/', + dir: 'coverage', subdir: 'report', reporters: [ {type: 'text'}, + {type: 'text-summary'}, {type: 'json', file: 'coverage-final.json'}, {type: 'html'}, {type: 'lcov'} @@ -124,8 +96,8 @@ module.exports = function (config) { }; if (process.env.TRAVIS) { - configuration.browsers = ['Chrome_travis_ci']; + config.browsers = ['Chrome_travis_ci']; } - config.set(configuration) + config.set(_config); }; diff --git a/ng2-components/ng2-alfresco-login/package.json b/ng2-components/ng2-alfresco-login/package.json index 81257fc588f..58cb974c0af 100644 --- a/ng2-components/ng2-alfresco-login/package.json +++ b/ng2-components/ng2-alfresco-login/package.json @@ -1,30 +1,18 @@ { "name": "ng2-alfresco-login", "description": "Alfresco Angular2 Login Component", - "version": "1.4.0", + "version": "1.5.0", "author": "Alfresco Software, Ltd.", "scripts": { - "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", - "clean-build": "rimraf index.js index.js.map index.d.ts 'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", - "build": "npm run clean-build && npm run tslint && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && npm run tsc:w && license-check && npm run build.umd", - "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", - "tsc": "tsc", - "tsc:w": "tsc -w", - "pretest": "npm run build", - "test": "karma start karma.conf.js --reporters mocha,coverage --single-run", - "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", - "posttest": "remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", + "clean": "rimraf dist node_modules typings bundles coverage .npmrc", + "rimraf": "rimraf", + "build": "webpack --config webpack.build.js --progress --profile --bail", + "test": "karma start karma.conf.js --reporters mocha,coverage --single-run --component", + "test-browser": "karma start karma.conf.js --reporters kjhtml --component", "coverage": "npm run test && wsrv -o -p 9875 ./coverage/report", - "publish:prod": "npm run test && npm publish", - "travis": "npm link ng2-alfresco-core", - "gulp": "gulp", - "build.umd": "gulp build.prod --color --env-config prod --build-type prod", - "reinstall": "npm cache clean && npm install" + "prepublish" : "npm run build" }, - "main": "./index.js", - "module": "./index.js", - "typings": "./index.d.ts", + "main": "bundles/ng2-alfresco-login.js", "repository": { "type": "git", "url": "https://github.com/Alfresco/alfresco-ng2-components.git" @@ -32,7 +20,6 @@ "bugs": { "url": "https://github.com/Alfresco/alfresco-ng2-components/issues" }, - "license": "Apache-2.0", "contributors": [ { "name": "Denys Vuika", @@ -58,75 +45,77 @@ "alfresco" ], "dependencies": { - "@angular/common": "2.2.2", - "@angular/compiler": "2.2.2", - "@angular/core": "2.2.2", - "@angular/forms": "2.2.2", - "@angular/http": "2.2.2", + "@angular/animations": "~4.0.0", + "@angular/common": "~4.0.0", + "@angular/compiler": "~4.0.0", + "@angular/core": "~4.0.0", + "@angular/forms": "~4.0.0", + "@angular/http": "~4.0.0", + "@angular/platform-browser": "~4.0.0", + "@angular/platform-browser-dynamic": "~4.0.0", + "@angular/router": "~4.0.0", + "@angular/material": "2.0.0-beta.1", - "@angular/platform-browser": "2.2.2", - "@angular/platform-browser-dynamic": "2.2.2", - "@angular/router": "3.2.2", - "alfresco-js-api": "~1.4.0", + "alfresco-js-api": "~1.5.0", "hammerjs": "2.0.8", - "ng2-alfresco-core": "1.4.0", - "ng2-translate": "2.5.0", + "ng2-alfresco-core": "1.5.0", + "ng2-translate": "5.0.0", "reflect-metadata": "0.1.10", - "rxjs": "5.0.0-beta.12", + "rxjs": "5.1.0", "systemjs": "0.19.27", - "zone.js": "0.6.26" + "zone.js": "0.7.6" }, "devDependencies": { "@types/hammerjs": "^2.0.34", "@types/jasmine": "2.5.35", "@types/node": "6.0.45", + "angular2-template-loader": "^0.6.2", "autoprefixer": "^6.5.4", - "concurrently": "^2.2.0", - "cpx": "1.3.1", + "copy-webpack-plugin": "^4.0.1", + "css-loader": "^0.23.1", + "css-to-string-loader": "^0.1.2", "cssnano": "^3.8.1", - "gulp": "^3.9.1", - "gulp-autoprefixer": "^3.1.1", - "gulp-cached": "^1.1.1", - "gulp-concat": "^2.6.1", - "gulp-concat-css": "^2.3.0", - "gulp-filter": "^4.0.0", - "gulp-inline-ng2-template": "^4.0.0", - "gulp-load-plugins": "^1.4.0", - "gulp-plumber": "^1.1.0", - "gulp-postcss": "^6.2.0", - "gulp-replace": "^0.5.4", - "gulp-sourcemaps": "^1.9.1", - "gulp-template": "^4.0.0", - "gulp-typescript": "^3.1.3", - "gulp-uglify": "^2.0.0", - "gulp-util": "^3.0.7", + "extract-text-webpack-plugin": "^2.0.0-rc.3", + "file-loader": "0.11.1", + "html-loader": "^0.4.4", + "html-webpack-plugin": "^2.28.0", + "istanbul-instrumenter-loader": "0.2.0", + "jasmine-ajax": "^3.2.0", "jasmine-core": "2.4.1", - "karma": "0.13.22", - "karma-chrome-launcher": "1.0.1", - "karma-coverage": "1.0.0", - "karma-jasmine": "1.0.2", - "karma-jasmine-ajax": "0.1.13", + "karma": "^0.13.22", + "karma-chrome-launcher": "~1.0.1", + "karma-coverage": "^1.1.1", + "karma-jasmine": "~1.0.2", + "karma-jasmine-ajax": "^0.1.13", "karma-jasmine-html-reporter": "0.2.0", - "karma-mocha-reporter": "2.0.3", - "license-check": "1.1.5", + "karma-mocha-reporter": "^2.2.2", + "karma-remap-istanbul": "^0.6.0", + "karma-sourcemap-loader": "^0.3.7", + "karma-systemjs": "^0.16.0", + "karma-webpack": "^2.0.2", + "loader-utils": "^1.1.0", "merge-stream": "^1.0.1", - "remap-istanbul": "0.6.3", - "rimraf": "2.5.2", + "null-loader": "^0.1.1", + "package-json-merge": "0.0.1", + "raw-loader": "^0.5.1", + "remap-istanbul": "^0.6.3", + "rimraf": "^2.5.4", "run-sequence": "^1.2.2", + "script-loader": "0.7.0", + "source-map-loader": "^0.1.6", + "style-loader": "^0.13.1", "systemjs-builder": "^0.15.34", - "traceur": "0.0.91", + "to-string-loader": "^1.1.4", + "traceur": "^0.0.91", + "ts-loader": "^2.0.0", "ts-node": "^1.7.0", - "tslint": "3.15.1", - "typescript": "^2.0.3", - "wsrv": "^0.1.5" + "tslint": "^4.4.2", + "tslint-loader": "^3.3.0", + "typescript": "^2.1.6", + "webpack": "^2.2.1", + "webpack-dev-server": "^2.3.0", + "webpack-merge": "2.6.1", + "wsrv": "^0.1.7" }, - "license-check-config": { - "src": [ - "./src/**/*.js" - ], - "path": "assets/license_header.txt", - "blocking": true, - "logInfo": false, - "logError": true - } + "license": "Apache-2.0" } diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.css b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.css index 643d1beb1f5..3ba3b8801a7 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.css +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.css @@ -230,3 +230,14 @@ .adf-full-width { width: 100%; } + +.adf-login__remember-me { + padding-top: 15px; +} + +.adf-login__field { + display: block; + margin-left: auto; + margin-right: auto; + padding-bottom: 24px; +} diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html index ac38b7139d1..a9fa74f8c5c 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html @@ -1,6 +1,6 @@ -+