Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 2cec95a

Browse files
fixing createAuxImage operation to not include empty variables or archive files
1 parent dba1782 commit 2cec95a

File tree

6 files changed

+40
-18
lines changed

6 files changed

+40
-18
lines changed

‎electron/app/js/wktLogging.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright (c) 2021, 2022, Oracle and/or its affiliates.
3+
* Copyright (c) 2021, 2024, Oracle and/or its affiliates.
44
* Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
55
*/
66
const path = require('path');
@@ -188,7 +188,7 @@ function getRotatingFileTransport(fileLogConfig) {
188188
_logFileName = newFilename;
189189
// this _logger call is safe only because it happens after the logger has been initialized.
190190
//
191-
_logger.notice(`Log file rotated from ${oldFilename} to ${newFilename}`);
191+
_logger.info(`Log file rotated from ${oldFilename} to ${newFilename}`);
192192
});
193193

194194
return fileTransport;

‎electron/app/locales/en/webui.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -953,16 +953,16 @@
953953
"ingress-design-ingress-annotations": "Optional Annotations",
954954
"ingress-design-ingress-route-name-help": "The name to be used for creating this ingress route.",
955955
"ingress-design-ingress-route-virtualhost-help": "The virtual host name is used as the host routing rule for this ingress route.",
956-
"ingress-design-ingress-route-targetservice-help": "The target service is the where this ingress route will send the request to the backend Kubernetes service address.",
957-
"ingress-design-ingress-route-targetport-help": "The target port is the where this ingress route will send the request to the backend Kubernetes service port.",
956+
"ingress-design-ingress-route-targetservice-help": "The target service where this ingress route will send the request to the backend Kubernetes service address.",
957+
"ingress-design-ingress-route-targetport-help": "The target port where this ingress route will send the request to the backend Kubernetes service port.",
958958
"ingress-design-ingress-route-path-help": "The URL path routing rule for this ingress route.",
959959
"ingress-design-ingress-route-annotations-table-title": "Ingress Route Annotations",
960960
"ingress-design-ingress-route-annotation-key-help": "The name of the annotation used for this ingress route.",
961961
"ingress-design-ingress-route-annotation-value-help": "The value for the annotation used for this ingress route.",
962962
"ingress-design-ingress-route-annotation-add-row-tooltip": "Add Annotation",
963963
"ingress-design-ingress-route-annotation-delete-row-tooltip": "Delete Annotation",
964964
"ingress-design-ingress-route-traefik-mw-label": "Traefik Middleware",
965-
"ingress-design-ingress-route-traefik-mw-help": "Customize Traefik Middlewares Object",
965+
"ingress-design-ingress-route-traefik-mw-help": "Customize Traefik Middleware Object",
966966

967967
"ingress-design-ingress-routes-get-services-in-namespace-title" : "Retrieving existing domain service details",
968968
"ingress-design-ingress-routes-get-services-in-namespace-error-message": "Failed to get existing domain services from Kubernetes namespace {{namespace}}: {{error}}.",

‎webui/package-lock.json‎

Lines changed: 7 additions & 7 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
@@ -12,7 +12,7 @@
1212
"dependencies": {
1313
"@oracle/oraclejet": "^14.1.8",
1414
"@oracle/oraclejet-core-pack": "^14.1.8",
15-
"@oracle/wrc-jet-pack": "~2.4.6",
15+
"@oracle/wrc-jet-pack": "~2.4.7",
1616
"ace-builds": "^1.27.0",
1717
"i18next": "^23.5.1",
1818
"jquery": "^3.7.1",

‎webui/src/js/utils/project-io.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/**
22
* @license
3-
* Copyright (c) 2021, 2022, Oracle and/or its affiliates.
3+
* Copyright (c) 2021, 2024, Oracle and/or its affiliates.
44
* Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
55
*/
66
'use strict';
77

88
/**
9-
* An helper object for project IO.
9+
* A helper object for project IO.
1010
* Returns a singleton.
1111
*/
1212

‎webui/src/js/utils/wit-aux-creator.js‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright (c) 2021, 2023, Oracle and/or its affiliates.
3+
* Copyright (c) 2021, 2024, Oracle and/or its affiliates.
44
* Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
55
*/
66
'use strict';
@@ -279,9 +279,31 @@ function (WitActionsBase, project, wktConsole, wdtModelPreparer, i18n, projectIo
279279
}
280280

281281
addWdtConfig(projectDirectory, createConfig) {
282+
const variableFiles = this.project.wdtModel.propertiesFiles.value;
283+
const nonEmptyVariableFiles = [];
284+
if (Array.isArray(variableFiles) && variableFiles.length > 0) {
285+
// This code currently supports a single variable file.
286+
const variableFileContent = this.project.wdtModel.getPropertyFileContents();
287+
for (const [file, contents] of Object.entries(variableFileContent)) {
288+
if (Object.getOwnPropertyNames(contents).length > 0) {
289+
nonEmptyVariableFiles.push(file);
290+
}
291+
}
292+
}
293+
294+
const archiveFiles = this.project.wdtModel.archiveFiles.value;
295+
const nonEmptyArchiveFiles = [];
296+
if (Array.isArray(archiveFiles) && archiveFiles.length > 0) {
297+
// This code currently supports a single archive file.
298+
const archiveRoots = this.project.wdtModel.archiveRoots();
299+
if (Array.isArray(archiveRoots) && archiveRoots.length > 0) {
300+
nonEmptyArchiveFiles.push(archiveFiles[0]);
301+
}
302+
}
303+
282304
createConfig.modelFiles = this.getAbsoluteModelFiles(projectDirectory, this.project.wdtModel.modelFiles.value);
283-
createConfig.variableFiles = this.getAbsoluteModelFiles(projectDirectory, this.project.wdtModel.propertiesFiles.value);
284-
createConfig.archiveFiles = this.getAbsoluteModelFiles(projectDirectory, this.project.wdtModel.archiveFiles.value);
305+
createConfig.variableFiles = this.getAbsoluteModelFiles(projectDirectory, nonEmptyVariableFiles);
306+
createConfig.archiveFiles = this.getAbsoluteModelFiles(projectDirectory, nonEmptyArchiveFiles);
285307
// Because we are overriding the defaults for these next two options,
286308
// we should always include them if they have a value.
287309
//

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /