This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 6596fb1 [NIFI-7705] update fronted deps make variable and parameters
tables position relative
6596fb1 is described below
commit 6596fb1f8724d6163db3c4f899a57049a8355274
Author: Scott Aslan <[email protected]>
AuthorDate: Wed Aug 5 11:15:05 2020 -0400
[NIFI-7705] update fronted deps
make variable and parameters tables position relative
Signed-off-by: Rob Fellows <[email protected]>
This closes #4449
---
.../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 4 +-
.../src/main/frontend/package-lock.json | 130 ++++++++++-----------
.../nifi-web-ui/src/main/frontend/package.json | 4 +-
.../nifi-web-ui/src/main/webapp/css/dialog.css | 1 +
.../webapp/css/new-parameter-context-dialog.css | 1 +
5 files changed, 71 insertions(+), 69 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
index 2d9d7d6..d5c41b9 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
@@ -23,7 +23,7 @@
<artifactId>nifi-web-ui</artifactId>
<packaging>war</packaging>
<properties>
- <node.version>v8.10.0</node.version>
+ <node.version>v12.7.0</node.version>
<maven.javadoc.skip>true</maven.javadoc.skip>
<source.skip>true</source.skip>
<staging.dir>${project.build.directory}/tmp</staging.dir>
@@ -389,7 +389,7 @@
<goal>npm</goal>
</goals>
<configuration>
- <arguments>--cache-min Infinity install</arguments>
+ <arguments>--silent ci</arguments>
<workingDirectory>${frontend.working.dir}</workingDirectory>
</configuration>
</execution>
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package-lock.json
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package-lock.json
index bb1f954..a59b046 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package-lock.json
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package-lock.json
@@ -82,9 +82,9 @@
"resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz";,
"integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=",
"requires": {
- "ansi-styles": "1.0.0",
- "has-color": "0.1.7",
- "strip-ansi": "0.1.1"
+ "ansi-styles": "~1.0.0",
+ "has-color": "~0.1.0",
+ "strip-ansi": "~0.1.0"
}
},
"commander": {
@@ -144,11 +144,11 @@
"resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.0.4.tgz";,
"integrity": "sha1-AMLyOAGfJPbAoZSibUGhUw/+e8Q=",
"requires": {
- "d3-dispatch": "1.0.3",
- "d3-drag": "1.2.1",
- "d3-interpolate": "1.1.6",
- "d3-selection": "1.3.0",
- "d3-transition": "1.1.1"
+ "d3-dispatch": "1",
+ "d3-drag": "1",
+ "d3-interpolate": "1",
+ "d3-selection": "1",
+ "d3-transition": "1"
}
},
"d3-chord": {
@@ -156,8 +156,8 @@
"resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-1.0.4.tgz";,
"integrity": "sha1-fexPC6iG9xP+ERxF92NBT290yiw=",
"requires": {
- "d3-array": "1.2.1",
- "d3-path": "1.0.5"
+ "d3-array": "1",
+ "d3-path": "1"
}
},
"d3-collection": {
@@ -180,8 +180,8 @@
"resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-1.2.1.tgz";,
"integrity":
"sha512-Cg8/K2rTtzxzrb0fmnYOUeZHvwa4PHzwXOLZZPwtEs2SKLLKLXeYwZKBB+DlOxUvFmarOnmt//cU4+3US2lyyQ==",
"requires": {
- "d3-dispatch": "1.0.3",
- "d3-selection": "1.3.0"
+ "d3-dispatch": "1",
+ "d3-selection": "1"
}
},
"d3-dsv": {
@@ -189,9 +189,9 @@
"resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-1.0.8.tgz";,
"integrity":
"sha512-IVCJpQ+YGe3qu6odkPQI0KPqfxkhbP/oM1XhhE/DFiYmcXKfCRub4KXyiuehV1d4drjWVXHUWx4gHqhdZb6n/A==",
"requires": {
- "commander": "2.20.3",
- "iconv-lite": "0.4.24",
- "rw": "1.3.3"
+ "commander": "2",
+ "iconv-lite": "0.4",
+ "rw": "1"
}
},
"d3-ease": {
@@ -204,10 +204,10 @@
"resolved": "https://registry.npmjs.org/d3-force/-/d3-force-1.1.0.tgz";,
"integrity":
"sha512-2HVQz3/VCQs0QeRNZTYb7GxoUCeb6bOzMp/cGcLa87awY9ZsPvXOGeZm0iaGBjXic6I1ysKwMn+g+5jSAdzwcg==",
"requires": {
- "d3-collection": "1.0.4",
- "d3-dispatch": "1.0.3",
- "d3-quadtree": "1.0.3",
- "d3-timer": "1.0.7"
+ "d3-collection": "1",
+ "d3-dispatch": "1",
+ "d3-quadtree": "1",
+ "d3-timer": "1"
}
},
"d3-format": {
@@ -220,7 +220,7 @@
"resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.9.1.tgz";,
"integrity":
"sha512-l9wL/cEQkyZQYXw3xbmLsH3eQ5ij+icNfo4r0GrLa5rOCZR/e/3am45IQ0FvQ5uMsv+77zBRunLc9ufTWSQYFA==",
"requires": {
- "d3-array": "1.2.1"
+ "d3-array": "1"
}
},
"d3-hierarchy": {
@@ -233,7 +233,7 @@
"resolved":
"https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.1.6.tgz";,
"integrity":
"sha512-mOnv5a+pZzkNIHtw/V6I+w9Lqm9L5bG3OTXPM5A+QO0yyVMQ4W1uZhR+VOJmazaOZXri2ppbiZ5BUNWT0pFM9A==",
"requires": {
- "d3-color": "1.0.3"
+ "d3-color": "1"
}
},
"d3-path": {
@@ -266,10 +266,10 @@
"resolved":
"https://registry.npmjs.org/d3-request/-/d3-request-1.0.6.tgz";,
"integrity":
"sha512-FJj8ySY6GYuAJHZMaCQ83xEYE4KbkPkmxZ3Hu6zA1xxG2GD+z6P+Lyp+zjdsHf0xEbp2xcluDI50rCS855EQ6w==",
"requires": {
- "d3-collection": "1.0.4",
- "d3-dispatch": "1.0.3",
- "d3-dsv": "1.0.8",
- "xmlhttprequest": "1.8.0"
+ "d3-collection": "1",
+ "d3-dispatch": "1",
+ "d3-dsv": "1",
+ "xmlhttprequest": "1"
}
},
"d3-scale": {
@@ -277,13 +277,13 @@
"resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-1.0.7.tgz";,
"integrity":
"sha512-KvU92czp2/qse5tUfGms6Kjig0AhHOwkzXG0+PqIJB3ke0WUv088AHMZI0OssO9NCkXt4RP8yju9rpH8aGB7Lw==",
"requires": {
- "d3-array": "1.2.1",
- "d3-collection": "1.0.4",
- "d3-color": "1.0.3",
- "d3-format": "1.2.2",
- "d3-interpolate": "1.1.6",
- "d3-time": "1.0.8",
- "d3-time-format": "2.1.1"
+ "d3-array": "^1.2.0",
+ "d3-collection": "1",
+ "d3-color": "1",
+ "d3-format": "1",
+ "d3-interpolate": "1",
+ "d3-time": "1",
+ "d3-time-format": "2"
}
},
"d3-selection": {
@@ -296,8 +296,8 @@
"resolved":
"https://registry.npmjs.org/d3-selection-multi/-/d3-selection-multi-1.0.1.tgz";,
"integrity": "sha1-zWwlQT0EosuXRw54byzYd/PjT1g=",
"requires": {
- "d3-selection": "1.3.0",
- "d3-transition": "1.1.1"
+ "d3-selection": "1",
+ "d3-transition": "1"
}
},
"d3-shape": {
@@ -305,7 +305,7 @@
"resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.2.0.tgz";,
"integrity": "sha1-RdAVOPBkuv0F6j1tLLdI/YxB93c=",
"requires": {
- "d3-path": "1.0.5"
+ "d3-path": "1"
}
},
"d3-time": {
@@ -318,7 +318,7 @@
"resolved":
"https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.1.1.tgz";,
"integrity":
"sha512-8kAkymq2WMfzW7e+s/IUNAtN/y3gZXGRrdGfo6R8NKPAA85UBTxZg5E61bR6nLwjPjj4d3zywSQe1CkYLPFyrw==",
"requires": {
- "d3-time": "1.0.8"
+ "d3-time": "1"
}
},
"d3-timer": {
@@ -331,12 +331,12 @@
"resolved":
"https://registry.npmjs.org/d3-transition/-/d3-transition-1.1.1.tgz";,
"integrity":
"sha512-xeg8oggyQ+y5eb4J13iDgKIjUcEfIOZs2BqV/eEmXm2twx80wTzJ4tB4vaZ5BKfz7XsI/DFmQL5me6O27/5ykQ==",
"requires": {
- "d3-color": "1.0.3",
- "d3-dispatch": "1.0.3",
- "d3-ease": "1.0.3",
- "d3-interpolate": "1.1.6",
- "d3-selection": "1.3.0",
- "d3-timer": "1.0.7"
+ "d3-color": "1",
+ "d3-dispatch": "1",
+ "d3-ease": "1",
+ "d3-interpolate": "1",
+ "d3-selection": "^1.1.0",
+ "d3-timer": "1"
}
},
"d3-voronoi": {
@@ -349,11 +349,11 @@
"resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-1.7.1.tgz";,
"integrity":
"sha512-sZHQ55DGq5BZBFGnRshUT8tm2sfhPHFnOlmPbbwTkAoPeVdRTkB4Xsf9GCY0TSHrTD8PeJPZGmP/TpGicwJDJQ==",
"requires": {
- "d3-dispatch": "1.0.3",
- "d3-drag": "1.2.1",
- "d3-interpolate": "1.1.6",
- "d3-selection": "1.3.0",
- "d3-transition": "1.1.1"
+ "d3-dispatch": "1",
+ "d3-drag": "1",
+ "d3-interpolate": "1",
+ "d3-selection": "1",
+ "d3-transition": "1"
}
},
"ev-emitter": {
@@ -376,7 +376,7 @@
"resolved":
"https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz";,
"integrity":
"sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
"requires": {
- "safer-buffer": "2.1.2"
+ "safer-buffer": ">= 2.1.2 < 3"
}
},
"imagesloaded": {
@@ -384,7 +384,7 @@
"resolved":
"https://registry.npmjs.org/imagesloaded/-/imagesloaded-4.1.4.tgz";,
"integrity":
"sha512-ltiBVcYpc/TYTF5nolkMNsnREHW+ICvfQ3Yla2Sgr71YFwQ86bDwV9hgpFhFtrGPuwEx5+LqOHIrdXBdoWwwsA==",
"requires": {
- "ev-emitter": "1.1.1"
+ "ev-emitter": "^1.0.0"
}
},
"jquery": {
@@ -397,7 +397,7 @@
"resolved":
"https://registry.npmjs.org/jquery-form/-/jquery-form-3.50.0.tgz";,
"integrity": "sha1-18lptR4JThLaaZHrYf9a8l9ZeY8=",
"requires": {
- "jquery": "3.5.1"
+ "jquery": ">=1.5"
}
},
"jquery-minicolors": {
@@ -405,7 +405,7 @@
"resolved":
"https://registry.npmjs.org/jquery-minicolors/-/jquery-minicolors-2.1.10.tgz";,
"integrity": "sha1-sp7qVB2aMrTiaSMWj7LBYnGGc3k=",
"requires": {
- "jquery": "3.5.1"
+ "jquery": ">= 1.7.x"
}
},
"jquery-ui": {
@@ -423,14 +423,14 @@
"resolved": "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.2.tgz";,
"integrity": "sha1-VzcEUIX1XrRVxosf9OvAG9UOiDA=",
"requires": {
- "JSV": "4.0.2",
- "nomnom": "1.8.1"
+ "JSV": ">= 4.0.x",
+ "nomnom": ">= 1.5.x"
}
},
"lodash-core": {
- "version": "4.17.11",
- "resolved":
"https://registry.npmjs.org/lodash-core/-/lodash-core-4.17.11.tgz";,
- "integrity":
"sha512-8ilprNE67U1REh0wQHL0z37qXdsxuFXjvxehg79Mh/MQgNJ+C1muXtysSKpt9sCxXZUSiwifEC82Vtzf2GSSKQ=="
+ "version": "4.17.19",
+ "resolved":
"https://registry.npmjs.org/lodash-core/-/lodash-core-4.17.19.tgz";,
+ "integrity":
"sha512-FpSbOooU9HcASpL7oJ/ZQGxR7oGzeqlVe1M/iAhnUMTk7eMJBkszS5tUPZCnRtNGPWe8ChswdByFTzW58iGQEQ=="
},
"moment": {
"version": "2.24.0",
@@ -442,8 +442,8 @@
"resolved": "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz";,
"integrity": "sha1-IVH3Ikcrp55Qp2/BJbuMjy5Nwqc=",
"requires": {
- "chalk": "0.4.0",
- "underscore": "1.6.0"
+ "chalk": "~0.4.0",
+ "underscore": "~1.6.0"
}
},
"qtip2": {
@@ -451,8 +451,8 @@
"resolved": "https://registry.npmjs.org/qtip2/-/qtip2-3.0.3.tgz";,
"integrity": "sha1-ffCIrkQSwkpAZN5p6CTLPPdiENw=",
"requires": {
- "imagesloaded": "4.1.4",
- "jquery": "3.5.1"
+ "imagesloaded": ">=3.0.0",
+ "jquery": ">=1.6.0"
}
},
"reset.css": {
@@ -471,12 +471,12 @@
"integrity":
"sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
},
"slickgrid": {
- "version": "2.3.23",
- "resolved":
"https://registry.npmjs.org/slickgrid/-/slickgrid-2.3.23.tgz";,
- "integrity":
"sha512-QQ4eC+plbLpT5e7RWXQbMmORXBc08dYCjJp0khDtoOxyAKXLXEivWklUoQsYYZkTydRwOKnHNR6t4I38BsYwqQ==",
+ "version": "2.4.27",
+ "resolved":
"https://registry.npmjs.org/slickgrid/-/slickgrid-2.4.27.tgz";,
+ "integrity":
"sha512-YnQXR0oww1ZpUtbsD/IdX+ydsxo8/fSEH5uMewQj2OooCoF/rsN8lrOqHFqqE8/Ob1NqXiVWMrWcO2Oqyyo/Ag==",
"requires": {
- "jquery": "3.5.1",
- "jquery-ui": "1.12.1"
+ "jquery": ">=1.8.0",
+ "jquery-ui": ">=1.8.0"
}
},
"strip-ansi": {
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package.json
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package.json
index deef34e..4928aab 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package.json
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package.json
@@ -34,12 +34,12 @@
"jquery": "3.5.1",
"reset.css": "2.0.2",
"jquery-form": "3.50.0",
- "lodash-core": "4.17.11",
+ "lodash-core": "4.17.19",
"moment": "2.24.0",
"url-search-params": "0.6.1",
"jsonlint": "1.6.2",
"qtip2": "3.0.3",
- "slickgrid": "2.3.23"
+ "slickgrid": "2.4.27"
},
"repository": {
"type": "git",
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/dialog.css
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/dialog.css
index cae4932..f21fa07 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/dialog.css
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/dialog.css
@@ -304,6 +304,7 @@ div.local-changes-message {
}
#variable-registry-table {
+ position: relative;
height: 400px;
}
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-parameter-context-dialog.css
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-parameter-context-dialog.css
index adbcb45..d24281d 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-parameter-context-dialog.css
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-parameter-context-dialog.css
@@ -51,6 +51,7 @@
}
#parameter-table {
+ position: relative;
height: 370px;
}
