Skip to content

Commit 6e08977

Browse files
committed
fixing build
1 parent 9fe69c5 commit 6e08977

File tree

5 files changed

+19
-15
lines changed

5 files changed

+19
-15
lines changed

THIRD_PARTY_LICENSES.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
475475
Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze,
476476
test, perform and/or display publicly, prepare derivative works, distribute, and
477477
otherwise use Python alone or in any derivative version, provided, however, that
478-
PSF's License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
478+
PSF's License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
479479
2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights Reserved"
480480
are retained in Python alone or in any derivative version prepared by Licensee.
481481

@@ -2060,7 +2060,7 @@ The following packages are licensed under The Universal Permissive License (UPL)
20602060
@oracle/oraclejet@13.1.7
20612061
Copyright (c) 2023 Oracle and/or its affiliates.
20622062

2063-
@oracle/wrc-jet-pack@2.4.1
2063+
@oracle/wrc-jet-pack@2.4.2
20642064
Copyright (c) 2022 Oracle and/or its affiliates.
20652065

20662066

@@ -2690,7 +2690,7 @@ Copyright © Domenic Denicola
26902690
ee-first@1.1.1
26912691
Copyright (c) 2014 Jonathan Ong me@jongleberry.com
26922692

2693-
electron@22.1.0
2693+
electron@22.2.0
26942694
Copyright (c) Electron contributors
26952695
Copyright (c) 2013-2020 GitHub Inc.
26962696

@@ -4482,7 +4482,7 @@ PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
44824482
Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze,
44834483
test, perform and/or display publicly, prepare derivative works, distribute, and
44844484
otherwise use Python alone or in any derivative version, provided, however, that
4485-
PSF's License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
4485+
PSF's License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
44864486
2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights Reserved"
44874487
are retained in Python alone or in any derivative version prepared by Licensee.
44884488

webui/package-lock.json

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

webui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"test": "mocha --timeout 10000 --reporter spec src/test/*-test.js",
66
"coverage": "nyc --reporter=lcov --reporter=text-summary npm run test",
77
"start": "ojet serve web --server-only",
8-
"build:release": "ojet build web --release",
8+
"build:release": "ojet build web",
99
"eslint": "npx eslint src/js/*.js src/js/models/*.js src/js/utils/*.js src/js/viewModels/*.js src/js/viewModels/quickstart/*.js src/test/*.js",
1010
"jet-audit": "ojaf"
1111
},

webui/src/js/utils/validation-helper.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,8 @@ function(i18n, Validator, ojvalidationError, RegExpValidator, LengthValidator, N
449449
const errorMessages = [];
450450
if (Array.isArray(fieldData.errors)) {
451451
if (fieldData.errors.length > 0) {
452-
errorMessages.push(...fieldData.errors);
452+
// Jet uses esprima which doesn't like the spread operator...
453+
fieldData.errors.forEach(error => errorMessages.push(error));
453454
}
454455
} else {
455456
errorMessages.push(fieldData.errors);

webui/src/js/viewModels/kubectl-page.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,8 @@ function(accUtils, ko, project, i18n, ArrayDataProvider, BufferingDataProvider,
119119
}
120120

121121
if (kubeConfig) {
122-
const newManagedClusterData = { ...managedClusterData, kubeConfig };
122+
const newManagedClusterData = Object.assign({}, managedClusterData);
123+
newManagedClusterData.kubeConfig = kubeConfig;
123124
this.project.kubectl.vzManagedClusters.observable.replace(managedClusterData, newManagedClusterData);
124125
}
125126
});
@@ -152,7 +153,8 @@ function(accUtils, ko, project, i18n, ArrayDataProvider, BufferingDataProvider,
152153
const options = { kubeConfig: managedClusterData.kubeConfig };
153154
getCurrentClusterContext(kubectlExe, options).then(results => {
154155
if (results.isSuccess) {
155-
const newManagedClusterData = { ...managedClusterData, kubeContext: results.context};
156+
const newManagedClusterData = Object.assign({}, managedClusterData);
157+
newManagedClusterData.kubeContext = results.context;
156158
this.project.kubectl.vzManagedClusters.observable.replace(managedClusterData, newManagedClusterData);
157159
} else {
158160
const errTitle = i18n.t('kubectl-get-current-context-error-title');
@@ -204,7 +206,8 @@ function(accUtils, ko, project, i18n, ArrayDataProvider, BufferingDataProvider,
204206
const kubeContext = managedClusterData.kubeContext;
205207
getContext(kubectlExe, options, kubeContext).then(result => {
206208
if (result?.kubectlContextName) {
207-
const newManagedClusterData = { ...managedClusterData, kubeContext: result.kubectlContextName };
209+
const newManagedClusterData = Object.assign({}, managedClusterData);
210+
newManagedClusterData.kubeContext = result.kubectlContextName;
208211
this.project.kubectl.vzManagedClusters.observable.replace(managedClusterData, newManagedClusterData);
209212
}
210213
});

0 commit comments

Comments
 (0)