Skip to content

Commit 86f0c0c

Browse files
RLIndiaRLIndia
authored
Merge pull request #1738 from AdityaSrikanth/topic-tech-refresh
Tech refresh (Node version upgrade to 16.8.0)
2 parents bcc2b62 + 1fcea15 commit 86f0c0c

28 files changed

Lines changed: 559 additions & 456 deletions

‎Dockerfile‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM node:6.17.1
1+
FROM node:16.8.0
22
RUN apt-get update -qq && apt-get install -y build-essential libpq-dev libkrb5-dev make g++ ruby libstdc++6 ruby-all-dev
33

4-
RUN npm install -g kerberos
4+
RUN npm install --unsafe-perm -g kerberos
55

66
##Client
7-
RUN npm install -g grunt-cli
7+
RUN npm install --unsafe-perm -g grunt-cli@1.2.0
88
##Its not needed as docker taking its role
99
##RUN npm install -g npm
1010
##RUN npm install forever --global
@@ -20,13 +20,15 @@ RUN mkdir /mongdb
2020
ADD ./client/cat3 /rlc/client/cat3
2121
ADD ./client/htmls /rlc/client/htmls
2222
WORKDIR /rlc/client/cat3
23-
RUN npm install --production
23+
# RUN npm install --production
24+
RUN npm install --legacy-peer-deps
2425
RUN npm run-script build-prod
2526

2627
## Server
2728
WORKDIR /rlc/server
2829
ADD ./server /rlc/server
2930
RUN node install.js
31+
RUN node app/bin/postInstallscript.js
3032

3133
EXPOSE 3001
3234

@@ -35,4 +37,3 @@ EXPOSE 3001
3537
WORKDIR /rlc/server/app
3638
CMD node app.js
3739

38-

‎client/cat3/.bowerrc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"directory" : "lib/"
3+
}

‎client/cat3/Gruntfile.js‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module.exports = function(grunt) {
2424
files: [{
2525
expand: true,
2626
cwd: 'lib/',
27-
src: ['**/*.js', '!**/*.min.js'],
27+
src: ['**/*.js', '!**/*.min.js', '!**/intro.js', '!**/outro.js'],
2828
dest: 'lib/',
2929
ext: '.min.js'
3030
}]
@@ -82,7 +82,7 @@ module.exports = function(grunt) {
8282
{'catalyst/partials/global.css':'src/partials/global.scss'},
8383
{'catalyst/partials/globals/treeComponent/treeDirective.css':'src/partials/globals/treeComponent/treeDirective.scss'},
8484
{'catalyst/partials/sections/dashboard/workzone/workzone.css':'src/partials/sections/dashboard/workzone/workzone.scss'},
85-
{'catalyst/partials/sections/dashboard/workzone/instance/instance.css':'src/partials/sections/dashboard/workzone/instance/instance.scss'},
85+
{'catalyst/partials/sections/dashboard/workzone/instance/instance.css':'src/partials/sections/dashboard/workzone/instance/instance.scss'},
8686
{'catalyst/partials/sections/dashboard/workzone/blueprint/blueprint.css':'src/partials/sections/dashboard/workzone/blueprint/blueprint.scss'},
8787
{'catalyst/partials/sections/dashboard/workzone/cloudFormation/cloudFormation.css':'src/partials/sections/dashboard/workzone/cloudFormation/cloudFormation.scss'},
8888
{'catalyst/partials/sections/dashboard/workzone/container/container.css':'src/partials/sections/dashboard/workzone/container/container.scss'},
@@ -97,7 +97,7 @@ module.exports = function(grunt) {
9797
},
9898
watch: {
9999
clientJS: {
100-
files: [
100+
files: [
101101
'src/**/*.js'
102102
],
103103
tasks: ['newer:jshint:client']
@@ -110,55 +110,55 @@ module.exports = function(grunt) {
110110
copy: {
111111
main: {
112112
files: [
113-
{
114-
expand: true,
115-
cwd: 'src/',
116-
src: ['partials/**/*.html'],
117-
dest: 'dist/src/',
118-
filter: 'isFile'
119-
},
120-
{
121-
expand: true,
122-
cwd: 'catalyst/',
123-
src: ['partials/**/*.css'],
124-
dest: 'dist/catalyst/',
125-
filter: 'isFile'
126-
},
127-
{
128-
expand: true,
129-
src: ['lib/**/*.js', 'lib/**/*.css'],
130-
dest: 'dist/',
131-
filter: 'isFile'
132-
},
133-
{
134-
expand: true,
135-
src: ['customlib/*.js'],
136-
dest: 'dist/',
137-
filter: 'isFile'
138-
},
139-
{
140-
expand: true,
141-
src: ['styles/**/*.*'],
142-
dest: 'dist/',
143-
filter: 'isFile'
144-
},
145-
{
146-
expand: true,
147-
src: ['data/*.json', 'images/**/*.*'],
148-
dest: 'dist/',
149-
filter: 'isFile'
150-
},
151-
{
152-
expand: true,
153-
src: ['catalyst/**/*.js'],
154-
dest: 'dist/',
155-
filter: 'isFile'
156-
},
157-
{
158-
src: ['uiConfig.js'],
159-
dest: 'dist/',
160-
filter: 'isFile'
161-
}]
113+
{
114+
expand: true,
115+
cwd: 'src/',
116+
src: ['partials/**/*.html'],
117+
dest: 'dist/src/',
118+
filter: 'isFile'
119+
},
120+
{
121+
expand: true,
122+
cwd: 'catalyst/',
123+
src: ['partials/**/*.css'],
124+
dest: 'dist/catalyst/',
125+
filter: 'isFile'
126+
},
127+
{
128+
expand: true,
129+
src: ['lib/**/*.js', 'lib/**/*.css'],
130+
dest: 'dist/',
131+
filter: 'isFile'
132+
},
133+
{
134+
expand: true,
135+
src: ['customlib/*.js'],
136+
dest: 'dist/',
137+
filter: 'isFile'
138+
},
139+
{
140+
expand: true,
141+
src: ['styles/**/*.*'],
142+
dest: 'dist/',
143+
filter: 'isFile'
144+
},
145+
{
146+
expand: true,
147+
src: ['data/*.json', 'images/**/*.*'],
148+
dest: 'dist/',
149+
filter: 'isFile'
150+
},
151+
{
152+
expand: true,
153+
src: ['catalyst/**/*.js'],
154+
dest: 'dist/',
155+
filter: 'isFile'
156+
},
157+
{
158+
src: ['uiConfig.js'],
159+
dest: 'dist/',
160+
filter: 'isFile'
161+
}]
162162
}
163163
},
164164
jshint: {

‎client/cat3/main.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
<link rel="stylesheet" type="text/css" href="catalyst/partials/globals/header/header.css" />
1717
<link rel='stylesheet' type='text/css' href='catalyst/partials/sections/login/login.css'>
1818
<link rel="stylesheet" href="src/partials/globals/toaster/angular-toastr.css" />
19-
<link rel="stylesheet" href="lib/nvd3/nv.d3.css" />
20-
<link rel="stylesheet" href="lib/angularMultipleSelect/multiple-select.min.css" />
19+
<link rel="stylesheet" href="lib/nvd3/build/nv.d3.css" />
20+
<link rel="stylesheet" href="lib/angularMultipleSelect/build/multiple-select.min.css" />
2121
<link rel="stylesheet" href="customlib/dateTime/css/bootstrap-material-datetimepicker.css" />
2222
<!-- Library scripts -->
23-
<script src="lib/jquery/jquery.min.js"></script>
23+
<script src="lib/jquery/dist/jquery.min.js"></script>
2424
<script src="lib/angular/angular.min.js"></script>
25-
<script src="lib/angular-ui-router/angular-ui-router.min.js"></script>
25+
<script src="lib/angular-ui-router/release/angular-ui-router.min.js"></script>
2626
<script src="lib/angular-ui-grid/ui-grid.min.js"></script>
2727
<script src="http://ui-grid.info/docs/grunt-scripts/pdfmake.js"></script>
2828
<script src="http://ui-grid.info/docs/grunt-scripts/vfs_fonts.js"></script>
@@ -32,21 +32,21 @@
3232
<script src="customlib/dateTime/js/bootstrap-material-datetimepicker.js"></script>
3333
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.13.4/ui-bootstrap.min.js"></script>
3434
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.13.4/ui-bootstrap-tpls.min.js"></script>
35-
<script src="lib/angular-strap/angular-strap.min.js"></script>
35+
<script src="lib/angular-strap/dist/angular-strap.min.js"></script>
3636
<script src="customlib/maxcdn-bootstrap.min.js"></script>
3737
<script src="lib/angular-sanitize/angular-sanitize.min.js"></script>
3838
<script src="customlib/angular-messages.js"></script>
3939
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/1.7.3/socket.io.min.js"></script>
4040
<script src="customlib/moment.min.js"></script>
41-
<script src="lib/lodash/lodash/lodash.min.js"></script>
41+
<script src="lib/lodash/dist/lodash.min.js"></script>
4242
<script src="lib/ng-file-upload/ng-file-upload.min.js"></script>
4343
<script src="src/partials/globals/toaster/angular-toastr.tpls.js"></script>
4444
<!-- Application configuration -->
4545
<script src="uiConfig.js"></script>
4646
<script src="lib/d3/d3.js"></script>
47-
<script src="lib/nvd3/nv.d3.js"></script>
48-
<script src="lib/angular-nvd3/angular-nvd3.js"></script>
49-
<script src="lib/angularMultipleSelect/multiple-select.min.js"></script>
47+
<script src="lib/nvd3/build/nv.d3.js"></script>
48+
<script src="lib/angular-nvd3/dist/angular-nvd3.js"></script>
49+
<script src="lib/angularMultipleSelect/build/multiple-select.min.js"></script>
5050
</head>
5151
<body ng-class="{ 'loading-body': onBodyLoading === true }">
5252
<loading size="large" name="onBodyLoading" class="onbody-loading"></loading>

‎client/cat3/npm-shrinkwrap.json‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎client/cat3/package.json‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,25 @@
1818
"url": "https://github.com/RLOpenCatalyst/core.git"
1919
},
2020
"dependencies": {
21-
"grunt": "^0.4.x",
22-
"grunt-bower-task": "~0.4.0",
23-
"grunt-concurrent": "^2.x.x",
21+
"grunt": "1.4.1",
22+
"grunt-bower-task": "0.5.0",
23+
"grunt-concurrent": "3.0.0",
2424
"grunt-contrib-clean": "^0.6.x",
2525
"grunt-contrib-concat": "~0.5.1",
2626
"grunt-contrib-copy": "^0.8.x",
27-
"grunt-contrib-jshint": "^0.11.x",
27+
"grunt-contrib-jshint": "3.0.0",
2828
"grunt-contrib-sass": "^0.9.2",
29-
"grunt-contrib-uglify": "^0.9.x",
29+
"grunt-contrib-uglify": "5.0.1",
3030
"grunt-copy-bower": "~0.1.0",
3131
"grunt-processhtml": "~0.3.8"
3232
},
3333
"devDependencies": {
34-
"bower": "~1.8.8",
35-
"connect": "^3.4.1",
34+
"bower": "1.8.12",
35+
"connect": "3.7.0",
3636
"express": "^4.13.3",
37-
"grunt": "^0.4.5",
38-
"grunt-contrib-watch": "^0.6.x",
37+
"grunt": "1.4.1",
38+
"grunt-contrib-jshint": "3.0.0",
39+
"grunt-contrib-watch": "1.1.0",
3940
"grunt-newer": "^1.x.x",
4041
"grunt-nodemon": "^0.4.x"
4142
}

‎client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceSSH.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ <h4 class="modal-title" id="myModalLabel">
99
</div>
1010

1111
<div class="modal-body">
12-
<script src="lib/jquery/jquery.min.js"></script>
12+
<script src="lib/jquery/dist/jquery.min.js"></script>
1313
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/1.7.3/socket.io.min.js"></script>
1414
<script type="text/javascript" src="customlib/terminal/terminal.js"></script>
1515
<fieldset>

‎server/app/app.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ limitations under the License.
1616

1717
// Load application npm package
1818
// require('@risingstack/trace');
19-
require('newrelic')
19+
// require('newrelic')
2020
const express = require("express");
2121
const app = express();
2222
const path = require("path");
@@ -252,6 +252,6 @@ catalystSync.botengineHealth();
252252
server.listen(app.get('port'), function () {
253253
logger.debug('Express server listening on port ' + app.get('port'));
254254
require('_pr/services/noticeService.js').init(io,server.address());
255-
require('_pr/services/noticeService.js').test();
255+
// require('_pr/services/noticeService.js').test();
256256
});
257257

‎server/app/db-script/botAuditTrailSummarize.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ function addResolvetagforSnowBots(){
161161
logger.info('inside addResolvetagforSnowBots')
162162
botModel.update({"input.name":"sysid"},{"isResolved":true},{upsert:true,multi:true},function(err,result){
163163
if(err){
164-
logger.err('err at addResolvetagforSnowBots'+JSON.stringify(err))
164+
logger.error('err at addResolvetagforSnowBots'+JSON.stringify(err))
165165
}else{
166166
logger.info('asdResolvetagforSnowBots result'+JSON.stringify(result))
167167

0 commit comments

Comments
 (0)