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 #260

Closed
wants to merge 14 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
uses: zowe-actions/shared-actions/prepare-workflow@main

- name: '[Prep 4] 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;

export function atlasAction(endpoint, content) {
return fetch(`https://${whichServer()}/ibmzosmf/api/v1/zosmf${endpoint}`, 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}`, content);
}

export function atlasGet(endpoint) {
Expand Down
14 changes: 7 additions & 7 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="MVS Explorer" \
maintainer="jack-tiefeng.jia@ibm.com" \
vendor="Zowe" \
version="0.0.0" \
release="0" \
summary="IBM z/OS Unix Datasets UI service" \
description="This Zowe UI component can display MVS datasets on z/OS"
maintainer="jack-tiefeng.jia@ibm.com" \
vendor="Zowe" \
version="0.0.0" \
release="0" \
summary="IBM z/OS Unix Datasets UI service" \
description="This Zowe UI component can display MVS datasets on z/OS"

##################################
# switch context
Expand All @@ -39,7 +39,7 @@ COPY --chown=zowe:zowe component .
# pretty same as .pax/prepare-workspace.sh. any way we can merge?
RUN mkdir -p ~/.npm-global \
&& npm config set prefix '~/.npm-global' \
&& npm install -g npm \
&& npm install -g npm@7.24.2 \
&& ~/.npm-global/bin/npm install --no-audit --ignore-scripts --no-optional --legacy-peer-deps \
&& ~/.npm-global/bin/npm run prod \
&& mkdir -p final/web \
Expand Down
2 changes: 1 addition & 1 deletion manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: explorer-mvs
# Component identifier. This identifier matches artifact path in Zowe Artifactory https://zowe.jfrog.io/.
id: org.zowe.explorer-mvs
version: 2.0.7
version: 2.0.9
# Component version is defined in gradle.properties for Gradle project
# Human readable component name
title: MVS Explorer
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,14 +1,14 @@
{
"name": "explorer-mvs",
"version": "2.0.8",
"version": "2.0.10",
"directories": {
"test": "tests"
},
"dependencies": {
"@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",
"orion-editor-component": "0.0.14",
"prop-types": "15.7.2",
"query-string": "6.8.2",
Expand Down
2 changes: 1 addition & 1 deletion tests/UnitTests/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