Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/tapis-project/tapis-ui into …
Browse files Browse the repository at this point in the history
…task/TUI-371-Models-filtering
  • Loading branch information
carrythemountain committed Nov 7, 2024
2 parents 4ea521e + d4c5bbf commit 642c25b
Show file tree
Hide file tree
Showing 22 changed files with 201 additions and 87 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VITE_SERVERLESS_DEPLOYMENT = "false"
VITE_TAPIS_BASE_URL = "https://tacc.tapis.io"
VITE_TAPIS_BASE_URL = "https://dev.develop.tapis.io"
# Ensure there is no ending slash!
### Run npm run init-project after changing VITE_TAPIS_BASE_URL.
29 changes: 14 additions & 15 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@uiw/codemirror-theme-vscode": "^4.22.2",
"@uiw/react-codemirror": "^4.19.7",
"@uiw/react-textarea-code-editor": "^2.0.6",
"@tapis/tapis-typescript": "^0.0.53",
"@tapis/tapis-typescript": "^0.0.54",
"@tapis/tapisui-api": "file:./packages/tapisui-api",
"@tapis/tapisui-common": "file:./packages/tapisui-common",
"@tapis/tapisui-extensions-core": "file:./packages/tapisui-extensions-core",
Expand Down
2 changes: 1 addition & 1 deletion packages/example-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"author": "<YOUR_NAME>",
"license": "MIT",
"dependencies": {
"@tapis/tapis-typescript": "^0.0.53",
"@tapis/tapis-typescript": "^0.0.54",
"@tapis/tapisui-extensions-core": "file:../tapisui-extensions-core",
"@tapis/tapisui-common": "file:../tapisui-common",
"@tapis/tapisui-hooks": "file:../tapisui-hooks",
Expand Down
25 changes: 12 additions & 13 deletions packages/icicle-tapisui-extension/package-lock.json

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

2 changes: 1 addition & 1 deletion packages/icicle-tapisui-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
},
"homepage": "https://github.com/ICICLE-ai/tapisui-extension-icicle#readme",
"dependencies": {
"@tapis/tapis-typescript": "^0.0.53",
"@tapis/tapis-typescript": "^0.0.54",
"@tapis/tapisui-extensions-core": "file:../tapisui-extensions-core",
"@tapis/tapisui-common": "file:../tapisui-common",
"@tapis/tapisui-hooks": "file:../tapisui-hooks",
Expand Down
17 changes: 8 additions & 9 deletions packages/tapisui-api/package-lock.json

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

2 changes: 1 addition & 1 deletion packages/tapisui-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
]
},
"dependencies": {
"@tapis/tapis-typescript": "^0.0.53",
"@tapis/tapis-typescript": "^0.0.54",
"axios": "^1.7.5",
"cross-fetch": "^3.1.4",
"streamsaver": "^2.0.5",
Expand Down
1 change: 1 addition & 0 deletions packages/tapisui-api/src/workflows/pipelineruns/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
export { default as list } from './list';
export { default as details } from './details';
export { default as terminate } from './terminate';
21 changes: 21 additions & 0 deletions packages/tapisui-api/src/workflows/pipelineruns/terminate.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { Workflows } from '@tapis/tapis-typescript';
import { apiGenerator, errorDecoder } from '../../utils';

const terminate = (
params: Workflows.TerminatePipelineRequest,
basePath: string,
jwt: string
) => {
const api: Workflows.PipelineRunsApi =
apiGenerator<Workflows.PipelineRunsApi>(
Workflows,
Workflows.PipelineRunsApi,
basePath,
jwt
);
return errorDecoder<Workflows.RespPipelineRun>(() =>
api.terminatePipeline(params)
);
};

export default terminate;
19 changes: 9 additions & 10 deletions packages/tapisui-common/package-lock.json

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

2 changes: 1 addition & 1 deletion packages/tapisui-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"@mui/lab": "^5.0.0-alpha.173",
"@mui/material": "^5.16.0",
"@rollup/plugin-commonjs": "^26.0.1",
"@tapis/tapis-typescript": "^0.0.53",
"@tapis/tapis-typescript": "^0.0.54",
"@tapis/tapisui-hooks": "file:../tapisui-hooks",
"@vitejs/plugin-react": "^4.3.1",
"bootstrap": "^4.6.2",
Expand Down
Loading

0 comments on commit 642c25b

Please sign in to comment.