Skip to content

Commit

Permalink
Updated patternfly version from v3.29.13 to v3.51.1
Browse files Browse the repository at this point in the history
Bugzilla: 1627651
tendrl-bug-id: Tendrl#1054
  • Loading branch information
gnehapk committed Sep 12, 2018
1 parent 31c0c2f commit a7f19f4
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 60 deletions.
115 changes: 58 additions & 57 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ var buildMode = process.argv[2] || "release";
var browsers = pluginOpts.targetBrowsers;

// System wide paths
var paths = (function () {
var paths = (function() {

var src = "./src/";

Expand All @@ -69,7 +69,7 @@ var paths = (function () {
})();

// File selection filters
var filters = (function () {
var filters = (function() {
return {
all: "**/*.*",
js: "**/*.{js,jst}",
Expand All @@ -88,55 +88,56 @@ del.sync([paths.dest]);

//Copy js file of the dependent libraries
gulp.task("jsLibraries", function() {
return gulp.src([
"node_modules/d3/d3.min.js",
"node_modules/c3/c3.min.js",
"node_modules/jquery/dist/jquery.min.js",
"node_modules/bootstrap/dist/js/bootstrap.min.js", // For dropdown : temporary
"node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.js",
"node_modules/angular/angular.js",
"node_modules/angular-ui-bootstrap/dist/ui-bootstrap.min.js",
"node_modules/angular-ui-bootstrap/dist/ui-bootstrap-tpls.js",
"node_modules/angular-sanitize/angular-sanitize.min.js",
"node_modules/angular-animate/angular-animate.min.js",
"node_modules/angular-aria/angular-aria.min.js",
"node_modules/@uirouter/angularjs/release/angular-ui-router.min.js",
"node_modules/patternfly/dist/js/patternfly.js",
"node_modules/angular-patternfly/node_modules/lodash/lodash.min.js",
"node_modules/angular-patternfly/dist/angular-patternfly.js",
"node_modules/c3-angular/c3-angular.min.js",
"node_modules/bootstrap-switch/dist/js/bootstrap-switch.min.js",
"node_modules/angular-bootstrap-switch/dist/angular-bootstrap-switch.min.js",
"node_modules/angular-patternfly/node_modules/angular-drag-and-drop-lists/angular-drag-and-drop-lists.js",
"node_modules/datatables/media/js/jquery.dataTables.js",
"node_modules/angular-patternfly/node_modules/angularjs-datatables/dist/angular-datatables.js"
])
.pipe(uglify())
.pipe(concat("libraries.js"))
.pipe(gulp.dest(paths.dest + paths.jsLibraries));
return gulp.src([
"node_modules/d3/d3.min.js",
"node_modules/c3/c3.min.js",
"node_modules/jquery/dist/jquery.min.js",
"node_modules/bootstrap/dist/js/bootstrap.min.js", // For dropdown : temporary
"node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.js",
"node_modules/bootstrap-select/dist/js/bootstrap-select.js",
"node_modules/angular/angular.js",
"node_modules/angular-ui-bootstrap/dist/ui-bootstrap.min.js",
"node_modules/angular-ui-bootstrap/dist/ui-bootstrap-tpls.js",
"node_modules/angular-sanitize/angular-sanitize.min.js",
"node_modules/angular-animate/angular-animate.min.js",
"node_modules/angular-aria/angular-aria.min.js",
"node_modules/@uirouter/angularjs/release/angular-ui-router.min.js",
"node_modules/patternfly/dist/js/patternfly.js",
"node_modules/angular-patternfly/node_modules/lodash/lodash.min.js",
"node_modules/angular-patternfly/dist/angular-patternfly.js",
"node_modules/c3-angular/c3-angular.min.js",
"node_modules/bootstrap-switch/dist/js/bootstrap-switch.min.js",
"node_modules/angular-bootstrap-switch/dist/angular-bootstrap-switch.min.js",
"node_modules/angular-patternfly/node_modules/angular-drag-and-drop-lists/angular-drag-and-drop-lists.js",
"node_modules/datatables/media/js/jquery.dataTables.js",
"node_modules/angular-patternfly/node_modules/angularjs-datatables/dist/angular-datatables.js"
])
.pipe(uglify())
.pipe(concat("libraries.js"))
.pipe(gulp.dest(paths.dest + paths.jsLibraries));
});

//Copy css file of the dependent libraries
gulp.task("cssLibraries", function() {
return gulp.src([
"node_modules/patternfly/dist/css/patternfly.css",
"node_modules/patternfly/dist/css/patternfly-additions.css",
"node_modules/angular-patternfly/styles/angular-patternfly.css",
"node_modules/bootstrap-switch/dist/css/bootstrap3/bootstrap-switch.min.css"
])
.pipe(postCss([autoprefixer({ browsers: browsers })]))
.pipe(buildMode === "dev" ? noop() : minifyCSS())
.pipe(concat("libraries.css"))
.pipe(gulp.dest(paths.dest + paths.cssLibraries));
return gulp.src([
"node_modules/patternfly/dist/css/patternfly.css",
"node_modules/patternfly/dist/css/patternfly-additions.css",
"node_modules/angular-patternfly/styles/angular-patternfly.css",
"node_modules/bootstrap-switch/dist/css/bootstrap3/bootstrap-switch.min.css"
])
.pipe(postCss([autoprefixer({ browsers: browsers })]))
.pipe(buildMode === "dev" ? noop() : minifyCSS())
.pipe(concat("libraries.css"))
.pipe(gulp.dest(paths.dest + paths.cssLibraries));
});

//Copy all the application files to dist except js and css
gulp.task("copy", function () {
gulp.task("copy", function() {
var filesToCopy;

filesToCopy = [filters.all, "!../package.json", "!" + filters.jscss];

paths.htmlFiles.forEach(function (htmlFile) {
paths.htmlFiles.forEach(function(htmlFile) {
//filesToCopy.push("!" + htmlFile);
});

Expand All @@ -145,15 +146,15 @@ gulp.task("copy", function () {
});

//Task to do eslint
gulp.task("eslint", function () {
gulp.task("eslint", function() {
return gulp.src([filters.js], { cwd: paths.src })
.pipe(eslint())
.pipe(eslint.format("stylish"))
.pipe(buildMode === "dev" ? noop() : eslint.failAfterError());
});

//Copy the files needed to load before the bootstraping of application
gulp.task("preload", ["eslint"], function () {
gulp.task("preload", ["eslint"], function() {

return gulp.src(paths.preloads, { base: paths.src, cwd: paths.src })
.pipe(concat("preload.jst", { newLine: ";" }))
Expand All @@ -163,7 +164,7 @@ gulp.task("preload", ["eslint"], function () {
});

//Compile the scss files
gulp.task("sass", function () {
gulp.task("sass", function() {
return gulp.src([paths.cssMain], { base: paths.src, cwd: paths.src })
.pipe(sass())
.pipe(cssimport({
Expand All @@ -175,13 +176,13 @@ gulp.task("sass", function () {
});

//Copy the resources(fonts etc) to dist folder
gulp.task("resource", function (done) {
gulp.task("resource", function(done) {

var streams = merge(),
resources = Object.keys(paths.resources);

if (resources.length > 0) {
resources.forEach(function (resource) {
resources.forEach(function(resource) {
var stream = gulp.src(resource, { cwd: paths.src })
.pipe(gulp.dest(paths.dest + paths.resources[resource]));

Expand All @@ -196,7 +197,7 @@ gulp.task("resource", function (done) {
});

//bundle application js files in plugin-bundle.js and copy it to dist
gulp.task("jsbundle", ["eslint"], function () {
gulp.task("jsbundle", ["eslint"], function() {

return gulp.src(paths.jsFiles, { cwd: paths.src })
.pipe(concat("plugin-bundle.js"))
Expand All @@ -212,25 +213,25 @@ gulp.task("watcher", ["browser-sync", "common"], function(done) {

filesToCopy = [filters.images, filters.html];

paths.htmlFiles.forEach(function (htmlPath) {
paths.htmlFiles.forEach(function(htmlPath) {
//filesToCopy.push("!" + htmlPath);
});

gulp.watch(filesToCopy, { cwd: paths.src }, function (event) {
gulp.watch(filesToCopy, { cwd: paths.src }, function(event) {
log("Modified:", colors.yellow(event.path));
runSequence("copy");
});

gulp.watch(paths.htmlFiles, { cwd: paths.src }, function (event) {
gulp.watch(paths.htmlFiles, { cwd: paths.src }, function(event) {
log("Modified:", colors.yellow(event.path));
});

gulp.watch(filters.js, { cwd: paths.src }, function (event) {
gulp.watch(filters.js, { cwd: paths.src }, function(event) {
log("Modified:", colors.yellow(event.path));
runSequence("preload", "jsbundle");
});

gulp.watch([filters.css, filters.scss], { cwd: paths.src }, function (event) {
gulp.watch([filters.css, filters.scss], { cwd: paths.src }, function(event) {
log("Modified:", colors.yellow(event.path));
runSequence("sass");
});
Expand All @@ -246,14 +247,14 @@ gulp.task("browser-sync", ["common"], function() {
middleware: [historyApiFallback()]

},
//proxy: "localhost:8080",
//proxy: "localhost:8080",
files: ["dist/**/*.*"],
reloadDebounce: 500
});
});

//Run the unit tests
gulp.task("ut", function (done) {
gulp.task("ut", function(done) {
var config = {
configFile: __dirname + "/karma.conf.js",
singleRun: true
Expand All @@ -265,14 +266,14 @@ gulp.task("ut", function (done) {
gulp.task("common", ["eslint", "jsLibraries", "cssLibraries", "resource", "copy", "preload", "sass", "jsbundle"]);

// dev mode task
gulp.task("dev", ["common", "watcher"], function (done) {
gulp.task("dev", ["common", "watcher"], function(done) {
log(colors.bold(colors.yellow("Watchers Established. You can now start coding")));
});

// production mode task
gulp.task("release", ["common"], function (done) {
runSequence("ut", done);
gulp.task("release", ["common"], function(done) {
runSequence("ut", done);
});

//default task is common
gulp.task("default", ["common"]);
gulp.task("default", ["common"]);
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"angular-ui-bootstrap": "~2.2.0",
"bootstrap": "^3.3.7",
"bootstrap-datepicker": "~1.6.4",
"bootstrap-select": "^1.12.4",
"bootstrap-tooltip": "~3.1.1",
"c3": "~0.4.11",
"c3-angular": "git://github.com/jettro/c3-angular-directive#1.3.1",
Expand All @@ -27,7 +28,7 @@
"idb-wrapper": "~1.7.1",
"jquery": "~3.1.1",
"numeral": "~1.5.3",
"patternfly": "~3.29.13"
"patternfly": "~3.51.1"
},
"devDependencies": {
"angular-mocks": "~1.5.8",
Expand Down
8 changes: 7 additions & 1 deletion src/commons/scss/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
font-weight: bold;
}

.dropdown-menu > li > a.disabled {
.dropdown-menu>li>a.disabled {
cursor: not-allowed;
pointer-events: none;
color: $color-light-grey;
Expand Down Expand Up @@ -203,3 +203,9 @@
color: $color-gray !important;
}
}

@media screen and (min-width: 768px) {
.toolbar-pf-actions .toolbar-pf-filter {
width: 25%;
}
}
2 changes: 1 addition & 1 deletion src/modules/tasks/task-detail/task-detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</div>
<div class="form-group required">
<label class="col-sm-3 col-md-1 detail-label">Status:</label>
<label class="col-sm-4 col-md-1 status-value"><i ng-class="{'pficon pficon-ok status-icon': (taskDetailCntrl.taskDetail.status === 'finished')}"></i>{{taskDetailCntrl.taskDetail.status === 'finished' ? "Completed": taskDetailCntrl.taskDetail.status}}</label>
<label class="col-sm-4 col-md-2 status-value"><i ng-class="{'pficon pficon-ok status-icon': (taskDetailCntrl.taskDetail.status === 'finished')}"></i>{{taskDetailCntrl.taskDetail.status === 'finished' ? "Completed": taskDetailCntrl.taskDetail.status}}</label>
<label class="col-sm-4 col-md-2" ng-show="(taskDetailCntrl.taskDetail.flow === 'ImportCluster') && (taskDetailCntrl.taskDetail.status === 'finished') &&(!$root.selectedClusterOption)"><a href="" ng-click="taskDetailCntrl.goToClusterDetail()">View cluster details</a></label>
</div>
</form>
Expand Down

0 comments on commit a7f19f4

Please sign in to comment.