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.

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

Add keyboard navigation to Share Model #206

Merged
merged 1 commit into from
May 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions frontend/src/assets/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,12 @@ a button:focus-visible {
box-shadow: none;
}

div:focus-visible {
outline: 0 none;
box-shadow: inset 0px 0px 0 0.2rem #a6d5fa;
border-radius: inherit;
}

.wrap-block {
display: inline-block;
overflow-wrap: break-word;
Expand Down
72 changes: 43 additions & 29 deletions frontend/src/components/common/ShareButton.vue
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
<script setup lang="ts">
import { storeToRefs } from 'pinia';
import { computed, ref} from 'vue';
import { computed, ref } from 'vue';

import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
import { Invite, Share } from '@/components/common';
import {
Button,
Dialog,
TabView,
TabPanel,
} from '@/lib/primevue';
import { Button, Dialog, TabView, TabPanel } from '@/lib/primevue';

import { Permissions } from '@/utils/constants';
import { useAuthStore, useObjectStore, usePermissionStore, useBucketStore } from '@/store';
Expand All @@ -24,12 +19,12 @@ type Props = {
};

// TODO: define a stricter type using a union of COMSObject | Bucket
type Resource = any;
type Resource = any;

const props = withDefaults(defineProps<Props>(), {
bucketId: '',
objectId: '',
labelText: '',
labelText: ''
});

// Store
Expand All @@ -41,14 +36,17 @@ const permissionStore = usePermissionStore();
// State
const resourceType = props.objectId ? ref('object') : ref('bucket');
const resource: Ref<Resource | undefined> = computed(() => {
return props.objectId
? objectStore.getObject(props.objectId)
: bucketStore.getBucket(props.bucketId);
return props.objectId ? objectStore.getObject(props.objectId) : bucketStore.getBucket(props.bucketId);
});
/* eslint-disable */
const hasManagePermission: Ref<boolean> = computed(() => {
return resourceType.value === 'object'
// eslint-disable-next-line max-len
? permissionStore.isObjectActionAllowed(props.objectId, getUserId.value, Permissions.MANAGE, resource.value?.bucketId)
? permissionStore.isObjectActionAllowed(
props.objectId,
getUserId.value,
Permissions.MANAGE,
resource.value?.bucketId
)
: permissionStore.isBucketActionAllowed(props.bucketId, getUserId.value, Permissions.MANAGE);
});

Expand All @@ -58,34 +56,50 @@ const displayShareDialog = ref(false);

<template>
<Dialog
id="share_dialog"
v-model:visible="displayShareDialog"
header="Share"
:modal="true"
:style="{ minWidth: '700px' }"
class="bcbox-info-dialog"
aria-labelledby="share_dialog_label"
aria-describedby="share_dialog_desc"
focus-trap
>
<template #header>
<font-awesome-icon
icon="fa-solid fa-share-alt"
fixed-width
/>
<span class="p-dialog-title">Share</span>
<span
id="share_dialog_label"
class="p-dialog-title"
>
Share
</span>
</template>

<h3 class="bcbox-info-dialog-subhead">
<div
tabindex="0"
role="document"
>
<h3 class="bcbox-info-dialog-subhead">
{{ resourceType === 'object' ? resource?.name : resource?.bucketName }}
</h3>
<ul class="mb-4">
<li>If a user already has permissions, you can link them with a share link</li>
<li>
Invite someone using an invite link - the links are single-use; you must generate a new link for each user you
intend to send this to
</li>
<li>
To share publicly or with a direct link,
you must set the file to public - this only works for individual files
</li>
</ul>
</h3>
<ul
id="share_dialog_desc"
class="mb-4"
>
<li>If a user already has permissions, you can link them with a share link</li>
<li>
Invite someone using an invite link - the links are single-use; you must generate a new link for each user you
intend to send this to
</li>
<li>
To share publicly or with a direct link, you must set the file to public - this only works for individual
files
</li>
</ul>
</div>
<TabView>
<TabPanel
v-if="resource?.public"
Expand Down
Loading