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

Removed the ability to select one more than ssh-key in deployment #2893

Merged
merged 8 commits into from
Jun 6, 2024
Merged

Removed the ability to select one more than ssh-key in deployment #2893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2cfd714
Refined the SSH-key view:
Mahmoud-Emad May 12, 2024
495fb38
fix: Maximum call stack size exceeded at SSHKeysManagement.migrate
Mahmoud-Emad May 13, 2024
5e03637
v2.4.1
Mahmoud-Emad May 13, 2024
ff74dc4
Update the version of dashboard and stats.
Mahmoud-Emad May 13, 2024
da3fe2a
fix: Fix an issue when pushing the changes.
Mahmoud-Emad Jun 6, 2024
b1390a2
chore: Merge development
Mahmoud-Emad Jun 6, 2024
374a891
Merge branch 'development' into development_v2.4.0_update_sshkey
Mahmoud-Emad Jun 6, 2024
57174c5
fix: Change the message of the ssh keys management dialog.
Mahmoud-Emad Jun 6, 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
30 changes: 20 additions & 10 deletions packages/playground/src/components/ssh_keys/ManageSshDeployemnt.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,12 @@

<v-card-text>
<v-alert type="info" class="mb-5">
The keys selected here will be forwarded to your deployment. To change keys, simply toggle on the keys you
wish to select/deselect.
<!--
TODO: Return the message back when return the multiple keys feature.
The keys selected here will be forwarded to your deployment. To change keys, simply toggle on the keys you
wish to select/deselect.
-->
To change the key that you want to use over the deployment, simply click on it.
</v-alert>

<v-tooltip
Expand Down Expand Up @@ -128,6 +132,9 @@ export default defineComponent({

onMounted(() => {
selectedKeys.value = sshKeysManagement.list().filter(_key => _key.isActive === true);
// TODO: Remove the below `selectedKeys.value = [selectedKeys.value[0]];` to make the user select more than one key
// after fixing this issue: https://github.com/threefoldtech/tf-images/issues/231
selectedKeys.value = [selectedKeys.value[0]];
handleKeys();
emit("selectedKeys", selectedKeysString.value);
});
Expand All @@ -137,14 +144,17 @@ export default defineComponent({
};

function selectKey(key: SSHKeyData) {
if (isKeySelected(key)) {
const index = selectedKeys.value.findIndex(selectedKey => selectedKey.id === key.id);
if (index !== -1) {
selectedKeys.value.splice(index, 1);
}
} else {
selectedKeys.value.push(key);
}
// TODO: Update the below `selectedKeys.value = [key];` to make the user select more than one key
// after fixing this issue: https://github.com/threefoldtech/tf-images/issues/231
selectedKeys.value = [key];
// if (isKeySelected(key)) {
// const index = selectedKeys.value.findIndex(selectedKey => selectedKey.id === key.id);
// if (index !== -1) {
// selectedKeys.value.splice(index, 1);
// }
// } else {
// selectedKeys.value.push(key);
// }

handleKeys();
emit("selectedKeys", selectedKeysString.value);
Expand Down
13 changes: 8 additions & 5 deletions packages/playground/src/components/ssh_keys/SshTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,14 @@ export default defineComponent({
title: "Key Fingerprint",
key: "fingerPrint",
},
{
title: "Active",
key: "activation",
sortable: false,
},

// TODO: Update the below `Column` to make the user activate/deactivate more than one key.
// after fixing this issue: https://github.com/threefoldtech/tf-images/issues/231
// {
// title: "Active",
// key: "activation",
// sortable: false,
// },
];

const deleteSelected = () => {
Expand Down
2 changes: 2 additions & 0 deletions packages/playground/src/views/sshkey_view.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
</div>
</v-card>

<v-alert type="info"> Multiple keys support is coming up soon </v-alert>

<v-card class="mb-3 pa-3" color="transparent">
<v-col class="d-flex justify-end">
<v-btn
Expand Down
Loading