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

Jump to bottom

Feat: Node finder enhance Rentable toggle #3077

Merged
merged 5 commits into from
Jul 7, 2024
Merged

Feat: Node finder enhance Rentable toggle #3077

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e0bfd96
Feat:
0oM4R Jul 3, 2024
8ad167a
refactor: use type UnifieNodeStatus
0oM4R Jul 3, 2024
c57e55a
Feat: disable node status on filtring rentable nodes
0oM4R Jul 4, 2024
69ec5e1
Feat: store the old selected node status, to reset it after toggle of…
0oM4R Jul 4, 2024
5834f32
Feat: add tooltip; explaining why the node status field is disabled
0oM4R Jul 4, 2024
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
63 changes: 42 additions & 21 deletions packages/playground/src/views/nodes.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,25 +48,35 @@
<v-switch color="primary" inset label="Mine" v-model="filters.mine" density="compact" hide-details />
</TfFilter>

<TfFilter class="mt-4" query-route="node-status" v-model="filters.status">
<v-select
:model-value="filters.status || undefined"
@update:model-value="filters.status = $event || ''"
:items="[
{ title: 'Up', value: UnifiedNodeStatus.Up },
{ title: 'Standby', value: UnifiedNodeStatus.Standby },
{ title: 'Up & Standby', value: UnifiedNodeStatus.UpStandby },
{ title: 'Down', value: UnifiedNodeStatus.Down },
]"
label="Select Nodes Status"
item-title="title"
item-value="value"
variant="outlined"
clearable
@click:clear="filters.status = ''"
density="compact"
/>
</TfFilter>
<VTooltip
location="bottom"
offset="-25"
:disabled="!filters.rentable"
text="The 'Rentable' filter will list only 'Standby & Up' nodes."
>
<template #activator="{ props }">
<TfFilter class="mt-4" v-bind="props" query-route="node-status" v-model="filters.status">
<v-select
:disabled="filters.rentable"
:model-value="filters.status || undefined"
@update:model-value="filters.status = $event || ''"
:items="[
{ title: 'Up', value: UnifiedNodeStatus.Up },
{ title: 'Standby', value: UnifiedNodeStatus.Standby },
{ title: 'Up & Standby', value: UnifiedNodeStatus.UpStandby },
{ title: 'Down', value: UnifiedNodeStatus.Down },
]"
label="Select Nodes Status"
item-title="title"
item-value="value"
variant="outlined"
clearable
@click:clear="filters.status = ''"
density="compact"
/>
</TfFilter>
</template>
</VTooltip>

<TfFilter
query-route="node-id"
Expand Down Expand Up @@ -462,7 +472,7 @@
<script lang="ts">
import { type GridNode, SortBy, SortOrder, UnifiedNodeStatus } from "@threefold/gridproxy_client";
import { sortBy } from "lodash";
import { computed, onMounted, ref } from "vue";
import { computed, onMounted, ref, watch } from "vue";
import { useRoute } from "vue-router";

import NodeDetails from "@/components/node_details.vue";
Expand Down Expand Up @@ -529,7 +539,18 @@ export default {
ipv6: false,
mine: false,
});

const oldNodeStatus = ref();
watch(
() => filters.value.rentable,
rentable => {
if (rentable) {
oldNodeStatus.value = filters.value.status;
filters.value.status = UnifiedNodeStatus.UpStandby;
} else {
filters.value.status = oldNodeStatus.value;
}
},
);
const loading = ref<boolean>(true);
const _nodes = ref<GridNode[]>([]);

Expand Down
Loading