Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix endpoint for v3 zosmf route #193

Closed
wants to merge 11 commits into from
2 changes: 1 addition & 1 deletion .github/workflows/build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
uses: zowe-actions/shared-actions/prepare-workflow@main

- name: '[Prep 5] Setup Node'
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: 16

Expand Down
8 changes: 7 additions & 1 deletion WebContent/js/utilities/urlUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,14 @@ export function whichServer() {
return server;
}

// zosmf/
const ZOSMF_PREFIX_LENGTH = 6;

function atlasAction(endpoint, content, fetchParams) {
return fetch(`https://${whichServer()}/ibmzosmf/api/v1/zosmf/${endpoint}`, { ...fetchParams, ...content });
// In v3, /ibmzosmf/api/v1 endpoint removes /zosmf part of a /zosmf URL, so string must be trimmed.
const trimmedEndpoint = endpoint.substring(ZOSMF_PREFIX_LENGTH);

return fetch(`https://${whichServer()}/ibmzosmf/api/v1/zosmf/${trimmedEndpoint}`, { ...fetchParams, ...content });
}

export function atlasGet(endpoint, content) {
Expand Down
12 changes: 6 additions & 6 deletions container/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ FROM zowe-docker-release.jfrog.io/ompzowe/base-node:${ZOWE_BASE_IMAGE} AS builde
##################################
# labels
LABEL name="USS Explorer" \
maintainer="[email protected]" \
vendor="Zowe" \
version="0.0.0" \
release="0" \
summary="IBM z/OS Unix Files UI service" \
description="This Zowe UI component can display unix files on z/OS"
maintainer="[email protected]" \
vendor="Zowe" \
version="0.0.0" \
release="0" \
summary="IBM z/OS Unix Files UI service" \
description="This Zowe UI component can display unix files on z/OS"

##################################
# switch context
Expand Down
2 changes: 1 addition & 1 deletion manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ id: org.zowe.explorer-uss
# Component version is defined in gradle.properties for Gradle project
# Human readable component name
title: USS Explorer
version: 2.0.7
version: 2.0.9
# Human readable component description
description: IBM z/OS Unix Files UI service
license: EPL-2.0
Expand Down
18 changes: 9 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "explorer-uss",
"version": "2.0.8",
"version": "2.0.10",
"types": "module",
"directories": {
"test": "tests"
Expand All @@ -9,7 +9,7 @@
"@material-ui/core": "4.11.0",
"@material-ui/icons": "4.9.1",
"babel-polyfill": "6.16.0",
"immutable": "3.8.1",
"immutable": "3.8.2",
"interweave": "8.0.1",
"lowlight": "2.4.0",
"orion-editor-component": "0.0.14",
Expand Down
2 changes: 1 addition & 1 deletion tests/testResources/hostConstants.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
export const LOCAL_HOSTNAME = 'tester.test.com';
export const LOCAL_HOST_SERVER = `${LOCAL_HOSTNAME}:7443`;
export const LOCAL_HOST_SERVER_WITH_PROTOCOL = `https://${LOCAL_HOST_SERVER}`;
export const LOCAL_HOST_ENDPOINT = `${LOCAL_HOST_SERVER_WITH_PROTOCOL}/ibmzosmf/api/v1/zosmf/`;
export const LOCAL_HOST_ENDPOINT = `${LOCAL_HOST_SERVER_WITH_PROTOCOL}/ibmzosmf/api/v1/`;
Loading