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.

Sign up for GitHub

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

Follow up on object store selection PR. #15654

Merged
merged 29 commits into from
Mar 3, 2023
+5,278 −489
Merged

Follow up on object store selection PR. #15654

Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
e2530b4
private objectstores & dataset.sharable
jmchilton Feb 7, 2023
50ffad2
Rename test_selection to be more specific.
jmchilton Jun 11, 2022
8e0a01e
get_quota in SQL
jmchilton Sep 12, 2020
f7a4992
Implement quota tracking options per ObjectStore.
jmchilton Feb 7, 2023
d1a2eab
Fix unique constraint add/remove in quota source labels...
jmchilton Feb 21, 2023
c7f200c
Rebuild client typescript schema.
jmchilton Feb 9, 2023
dfd4fd1
unit test fix
jmchilton Feb 14, 2023
6d91292
Lint fixes...
jmchilton Feb 14, 2023
4432497
Drop nice_total_disk_usage from usage APIs.
jmchilton Feb 14, 2023
4785834
Improved error message in api_asserts.
jmchilton Feb 16, 2023
017c612
Small hacks... are these needed?
jmchilton Jun 17, 2022
46b6d85
implement preferred object store id
jmchilton Feb 9, 2023
32d12d6
Fix for subworkflows...
jmchilton Feb 14, 2023
1c6f9d0
nested workflow tests for this intermediate/output objectstore selection
jmchilton Feb 14, 2023
0e1bc0d
fix object store workflow selection with collections...
jmchilton Feb 14, 2023
d04d79a
More work on object store selection of collections.
jmchilton Feb 14, 2023
45179db
Fix dynamic collection outputs to respect job's specified object store
jmchilton Feb 16, 2023
17baf67
Fix object store selection for workflows with dynamic output collecti…
jmchilton Feb 16, 2023
03cfc77
test case for object store selection with doubly nested workflow output
jmchilton Feb 16, 2023
c80daac
Rebuild client schema for object store APIs
jmchilton Feb 16, 2023
2cdcf15
Cleanup object store selection client.
jmchilton Feb 21, 2023
76c0f98
Pydantic the new object store API.
jmchilton Feb 27, 2023
5462b7a
Convert SelectObjectStore to fetcher pattern.
jmchilton Feb 27, 2023
dabdb95
Migrate new user quota usage APIs to FastAPI.
jmchilton Feb 27, 2023
d1b7594
pydantic the new user quota usage APIs
jmchilton Feb 27, 2023
d92d606
Rework object store selection jest tests for fetcher pattern.
jmchilton Mar 1, 2023
fcd616d
Migrate SelectObjectStore to composition API.
jmchilton Mar 2, 2023
c40672a
Only show objectstore selection in the GUI if actual selection makes …
jmchilton Mar 2, 2023
9964d4d
More consistent icon for object store selection.
jmchilton Mar 2, 2023
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
34 changes: 21 additions & 13 deletions client/src/components/History/CurrentHistory/HistoryCounter.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,25 @@
<span>{{ historySize | niceFileSize }}</span>
</b-button>
<b-button-group>
<b-button
:id="`history-storage-${history.id}`"
variant="link"
size="sm"
class="rounded-0 text-decoration-none"
@click="showPreferredObjectStoreModal = true">
<icon icon="hdd" />
</b-button>
<PreferredStorePopover
:history-id="history.id"
:history-preferred-object-store-id="historyPreferredObjectStoreId"
:user="user">
</PreferredStorePopover>
<ConfigProvider v-slot="{ config }">
Copy link
Member

@mvdbeek mvdbeek Mar 3, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you use the useConfig(true) composable here please ? The ConfigProvider triggers a new fetch every time.

<b-button
v-if="config && config.object_store_allows_id_selection"
:id="`history-storage-${history.id}`"
variant="link"
size="sm"
class="rounded-0 text-decoration-none"
@click="showPreferredObjectStoreModal = true">
<icon icon="hdd" />
</b-button>
</ConfigProvider>
<ConfigProvider v-slot="{ config }">
<PreferredStorePopover
v-if="config && config.object_store_allows_id_selection"
:history-id="history.id"
:history-preferred-object-store-id="historyPreferredObjectStoreId"
:user="user">
</PreferredStorePopover>
</ConfigProvider>
<b-button-group>
<b-button
v-b-tooltip.hover
Expand Down Expand Up @@ -90,11 +96,13 @@ import prettyBytes from "pretty-bytes";
import { formatDistanceToNowStrict } from "date-fns";
import { usesDetailedHistoryMixin } from "./usesDetailedHistoryMixin.js";
import CurrentUser from "components/providers/CurrentUser";
import ConfigProvider from "components/providers/ConfigProvider";
import PreferredStorePopover from "./PreferredStorePopover";
import SelectPreferredStore from "./SelectPreferredStore";
export default {
components: {
ConfigProvider,
CurrentUser,
PreferredStorePopover,
SelectPreferredStore,
Expand Down