Skip to content

Fix focus ring on some buttons + confirmation dialogs not appearing for channel sharing operations #5483

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

Merged
MisRob merged 3 commits into from
Oct 21, 2025
Merged

Fix focus ring on some buttons + confirmation dialogs not appearing for channel sharing operations #5483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c0b5c5
Fix focus ring on some buttons
MisRob Oct 20, 2025
3db707f
Fix confirmation dialogs not appearing
MisRob Oct 20, 2025
36bcb93
Use KButton for Send invitation
MisRob Oct 20, 2025
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
7 changes: 5 additions & 2 deletions contentcuration/contentcuration/frontend/shared/styles/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,12 @@ body {
text-align: center;
}

.button:focus-visible,
.v-btn:focus-visible {
outline: 2px solid var(--v-secondary-base) !important;
// ensures that until KDS migration is complete,
// Vuetify-based buttons have a visible focus style
// consistent with KDS buttons and links
outline: 3px solid #33acf5 !important;
outline-offset: 4px !important;
}

> .v-dialog__content,
Expand Down
6 changes: 3 additions & 3 deletions contentcuration/contentcuration/frontend/shared/views/channel/ChannelSharing.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@
</template>
</DropdownWrapper>
</VLayout>
<VBtn
color="primary"
<KButton
type="submit"
:disabled="sharing"
primary
>
{{ $tr('inviteButton') }}
</VBtn>
</KButton>
</VForm>

<ChannelSharingTable
Expand Down
201 changes: 78 additions & 123 deletions contentcuration/contentcuration/frontend/shared/views/channel/ChannelSharingTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,136 +34,61 @@
</em>
</td>
<td class="text-xs-right">
<BaseMenu v-if="item.id !== user.id && (item.pending || viewOnly)">
<template #activator="{ on }">
<VBtn
flat
v-on="on"
>
{{ $tr('optionsDropdown') }}
<Icon
class="ml-1"
icon="dropdown"
/>
</VBtn>
<KButton
v-if="item.id !== user.id && (item.pending || viewOnly)"
:text="$tr('optionsDropdown')"
appearance="flat-button"
hasDropdown
>
<template #menu>
<KDropdownMenu
:constrainToScrollParent="false"
:options="getMenuOptions(item)"
@select="onMenuSelect"
/>
</template>
<VList>
<template v-if="item.pending">
<VListTile
data-test="resend"
@click="resendInvitation(item.email)"
>
<VListTileTitle>{{ $tr('resendInvitation') }}</VListTileTitle>
</VListTile>
<VListTile
data-test="delete"
@click="
selected = item;
showDeleteInvitation = true;
"
>
<VListTileTitle>{{ $tr('deleteInvitation') }}</VListTileTitle>
</VListTile>
</template>
<template v-else>
<VListTile
data-test="makeeditor"
@click="
selected = item;
showMakeEditor = true;
"
>
<VListTileTitle>{{ $tr('makeEditor') }}</VListTileTitle>
</VListTile>
<VListTile
data-test="removeviewer"
@click="
selected = item;
showRemoveViewer = true;
"
>
<VListTileTitle>{{ $tr('removeViewer') }}</VListTileTitle>
</VListTile>
</template>
</VList>
</BaseMenu>
</KButton>
</td>
</tr>
</template>
</VDataTable>

<!-- Remove viewer confirmation -->
<MessageDialog
v-model="showRemoveViewer"
:header="$tr('removeViewerHeader')"
:text="
$tr('removeViewerText', { first_name: selected.first_name, last_name: selected.last_name })
"
<KModal
v-if="showRemoveViewer"
:title="$tr('removeViewerHeader')"
:cancelText="$tr('cancelButton')"
:submitText="$tr('removeViewerConfirm')"
@cancel="showRemoveViewer = false"
@submit="handleRemoveViewer(selected)"
>
<template #buttons="{ close }">
<VBtn
flat
@click="close"
>
{{ $tr('cancelButton') }}
</VBtn>
<VBtn
color="primary"
data-test="confirm-remove"
@click="handleRemoveViewer(selected)"
>
{{ $tr('removeViewerConfirm') }}
</VBtn>
</template>
</MessageDialog>
{{
$tr('removeViewerText', { first_name: selected.first_name, last_name: selected.last_name })
}}
</KModal>

<!-- Delete invitation confirmation -->
<MessageDialog
v-model="showDeleteInvitation"
:header="$tr('deleteInvitationHeader')"
:text="$tr('deleteInvitationText', { email: selected.email })"
<KModal
v-if="showDeleteInvitation"
:title="$tr('deleteInvitationHeader')"
:cancelText="$tr('cancelButton')"
:submitText="$tr('deleteInvitationConfirm')"
@cancel="showDeleteInvitation = false"
@submit="handleDelete(selected.id)"
>
<template #buttons="{ close }">
<VBtn
flat
@click="close"
>
{{ $tr('cancelButton') }}
</VBtn>
<VBtn
color="primary"
data-test="confirm-delete"
@click="handleDelete(selected.id)"
>
{{ $tr('deleteInvitationConfirm') }}
</VBtn>
</template>
</MessageDialog>
{{ $tr('deleteInvitationText', { email: selected.email }) }}
</KModal>

<!-- Make editor confirmation -->
<MessageDialog
v-model="showMakeEditor"
:header="$tr('makeEditorHeader')"
:text="
$tr('makeEditorText', { first_name: selected.first_name, last_name: selected.last_name })
"
<KModal
v-if="showMakeEditor"
:title="$tr('makeEditorHeader')"
:cancelText="$tr('cancelButton')"
:submitText="$tr('makeEditorConfirm')"
@cancel="showMakeEditor = false"
@submit="grantEditAccess(selected.id)"
>
<template #buttons="{ close }">
<VBtn
flat
@click="close"
>
{{ $tr('cancelButton') }}
</VBtn>
<VBtn
color="primary"
data-test="confirm-makeeditor"
@click="grantEditAccess(selected.id)"
>
{{ $tr('makeEditorConfirm') }}
</VBtn>
</template>
</MessageDialog>
{{
$tr('makeEditorText', { first_name: selected.first_name, last_name: selected.last_name })
}}
</KModal>
</div>

</template>
Expand All @@ -173,13 +98,9 @@

import { mapActions, mapGetters, mapState } from 'vuex';
import { SharingPermissions } from 'shared/constants';
import MessageDialog from 'shared/views/MessageDialog';

export default {
name: 'ChannelSharingTable',
components: {
MessageDialog,
},
props: {
channelId: {
type: String,
Expand Down Expand Up @@ -246,6 +167,40 @@
'makeEditor',
'removeViewer',
]),
getMenuOptions(item) {
if (item.pending) {
return [
{ id: 'resend-invitation', label: this.$tr('resendInvitation'), item },
{ id: 'delete-invitation', label: this.$tr('deleteInvitation'), item },
];
} else {
return [
{ id: 'make-editor', label: this.$tr('makeEditor'), item },
{ id: 'remove-viewer', label: this.$tr('removeViewer'), item },
];
}
},
onMenuSelect(selection) {
switch (selection.id) {
case 'resend-invitation':
this.resendInvitation(selection.item.email);
break;
case 'delete-invitation':
this.selected = selection.item;
this.showDeleteInvitation = true;
break;
case 'make-editor':
this.selected = selection.item;
this.showMakeEditor = true;
break;
case 'remove-viewer':
this.selected = selection.item;
this.showRemoveViewer = true;
break;
default:
break;
}
},
getUserText(user) {
const nameParams = {
first_name: user.first_name,
Expand Down
Loading