Skip to content

Commit

Permalink
Add check for gs:// for archival workflow querying (#1394)
Browse files Browse the repository at this point in the history
* Add check for gs:// for archival

* Bump to v8 for pnpm in gh actions

* Bump pnpm v8 in integration test gha

* Set engines in package.json

* Update e2e pnpm-lock
  • Loading branch information
Alex-Tideman authored May 30, 2023
1 parent 8827e4a commit 47e5652
Show file tree
Hide file tree
Showing 7 changed files with 65 additions and 47 deletions.
2 changes: 1 addition & 1 deletion .github/actions/checkout-and-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ runs:
uses: pnpm/[email protected]
with:
run_install: false
version: 7
version: 8
- name: Install Node.js
uses: actions/setup-node@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Setup
uses: pnpm/[email protected]
with:
version: 7
version: 8
- name: Install dependencies
run: pnpm install
- name: Build assets
Expand Down
83 changes: 44 additions & 39 deletions e2e/pnpm-lock.yaml

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

4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{
"name": "@temporalio/ui",
"version": "2.15.4",
"engines": {
"pnpm": ">=8.6.0",
"node": ">=18.15.0"
},
"type": "module",
"description": "Temporal.io UI",
"keywords": [
Expand Down
6 changes: 5 additions & 1 deletion pnpm-lock.yaml

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

6 changes: 3 additions & 3 deletions src/routes/(app)/namespaces/[namespace]/archival/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import CodeBlock from '$lib/holocene/code-block.svelte';
import PageTitle from '$lib/components/page-title.svelte';
export let data: PageData & { isS3Bucket: boolean };
export let data: PageData & { archivalQueryingNotSupported: boolean };
$: ({
namespace: {
Expand All @@ -20,7 +20,7 @@
workflows,
archivalEnabled,
visibilityArchivalEnabled,
isS3Bucket,
archivalQueryingNotSupported,
} = data);
</script>

Expand All @@ -29,7 +29,7 @@
<h1 class="text-2xl" data-testid="archived-enabled-title">
Archived Workflows
</h1>
{#if !isS3Bucket}<WorkflowFilters />{/if}
{#if !archivalQueryingNotSupported}<WorkflowFilters />{/if}
{#if workflows?.length}
<Pagination
items={workflows}
Expand Down
9 changes: 7 additions & 2 deletions src/routes/(app)/namespaces/[namespace]/archival/+page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,12 @@ export const load: PageLoad = async function ({ params, url }) {
const isS3Bucket = namespace.config?.historyArchivalUri
?.toLowerCase()
?.startsWith('s3://');
const parameters: ArchiveFilterParameters = isS3Bucket
const isGSBucket = namespace.config?.historyArchivalUri
?.toLowerCase()
?.startsWith('gs://');
const archivalQueryingNotSupported = isS3Bucket || isGSBucket;

const parameters: ArchiveFilterParameters = archivalQueryingNotSupported
? {}
: {
workflowId,
Expand Down Expand Up @@ -54,6 +59,6 @@ export const load: PageLoad = async function ({ params, url }) {
namespace,
archivalEnabled,
visibilityArchivalEnabled,
isS3Bucket,
archivalQueryingNotSupported,
};
};

0 comments on commit 47e5652

Please sign in to comment.