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

Adding buckets user logic #1394

Merged
merged 8 commits into from
Aug 3, 2021
Merged

Adding buckets user logic #1394

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
9d7e373
Init
RyRy79261 Aug 3, 2021
a4f1fe1
Sharing user names
RyRy79261 Aug 3, 2021
f1d9d4c
Merge branch 'dev' into feat/bucket-users-meta-1266
RyRy79261 Aug 3, 2021
46542fa
Update packages/files-ui/src/Contexts/FilesContext.tsx
RyRy79261 Aug 3, 2021
ee65f76
Update packages/files-ui/src/Components/Modules/FileBrowsers/views/Fi…
RyRy79261 Aug 3, 2021
3f03a1f
Updated for feedback
RyRy79261 Aug 3, 2021
8e81db1
Merge branch 'dev' into feat/bucket-users-meta-1266
RyRy79261 Aug 3, 2021
dd41a3c
Apply suggestions from code review
Tbaut Aug 3, 2021
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
2 changes: 1 addition & 1 deletion packages/files-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"@babel/core": "^7.12.10",
"@babel/runtime": "^7.0.0",
"@chainsafe/browser-storage-hooks": "^1.0.1",
"@chainsafe/files-api-client": "1.17.7",
"@chainsafe/files-api-client": "1.17.9",
"@chainsafe/web3-context": "1.1.4",
"@lingui/core": "^3.7.2",
"@lingui/react": "^3.7.2",
Expand Down
5 changes: 3 additions & 2 deletions packages/files-ui/src/Components/Modules/FileBrowsers/CreateOrEditSharedFolderModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { useEffect } from "react"
import { SharedFolderModalMode } from "./types"
import { useCreateOrEditSharedFolder } from "./hooks/useCreateOrEditSharedFolder"
import { useLookupSharedFolderUser } from "./hooks/useLookupUser"
import { centerEllipsis } from "../../../Utils/Helpers"

const useStyles = makeStyles(
({ breakpoints, constants, typography, zIndex, palette }: CSFTheme) => {
Expand Down Expand Up @@ -136,14 +137,14 @@ const CreateOrEditSharedFolderModal = ({ mode, isModalOpen, onClose, bucketToEdi
if (!bucketToEdit) return

const newWriters = bucketToEdit.writers.map((writer) => ({
label: writer.uuid || "",
label: writer.username || centerEllipsis(writer.public_address.toLowerCase(), 6) || writer.uuid,
value: writer.uuid || "",
data: writer
})
) || []

const newReaders = bucketToEdit.readers.map((reader) => ({
label: reader.uuid || "",
label: reader.username || centerEllipsis(reader.public_address.toLowerCase(), 6) || reader.uuid,
value: reader.uuid || "",
data: reader
})
Expand Down
17 changes: 13 additions & 4 deletions ...ges/files-ui/src/Components/Modules/FileBrowsers/views/FileSystemItem/SharedFolderRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
UserShareSvg
} from "@chainsafe/common-components"
import { CSFTheme } from "../../../../../Themes/types"
import { BucketUser } from "@chainsafe/files-api-client"
import { LookupUser } from "@chainsafe/files-api-client"
import { desktopSharedGridSettings, mobileSharedGridSettings } from "../../SharedFoldersOverview"
import SharedUsers from "../../../../Elements/SharedUser"
import { t, Trans } from "@lingui/macro"
Expand All @@ -25,6 +25,7 @@ import clsx from "clsx"
import { BucketKeyPermission } from "../../../../../Contexts/FilesContext"
import UserBubble from "../../../../Elements/UserBubble"
import { renameSchema } from "../../../../../Utils/validationSchema"
import { centerEllipsis } from "../../../../../Utils/Helpers"

const useStyles = makeStyles(({ breakpoints, constants, palette }: CSFTheme) => {

Expand Down Expand Up @@ -200,13 +201,21 @@ const SharedFolderRow = ({ bucket, handleRename, openSharedFolder, handleDeleteS
click(e)
}

const getUserIds = (users: BucketUser[]): string[] => {
const getUserLabels = (users: LookupUser[]): string[] => {
return users.reduce((acc: string[], user): string[] => {
if (user.username !== "") {
return user.username ? [...acc, user.username] : acc
}

if (user.public_address !== "") {
return user.public_address ? [...acc, centerEllipsis(user.public_address.toLowerCase(), 6)] : acc
}

return user.uuid ? [...acc, user.uuid] : acc
}, [] as string[])
}

const userIds = [...getUserIds(bucket.owners), ...getUserIds(bucket.readers), ...getUserIds(bucket.writers)]
const userLabels = [...getUserLabels(bucket.owners), ...getUserLabels(bucket.readers), ...getUserLabels(bucket.writers)]

const formik = useFormik({
initialValues:{
Expand Down Expand Up @@ -284,7 +293,7 @@ const SharedFolderRow = ({ bucket, handleRename, openSharedFolder, handleDeleteS
align="left"
className={classes.sharedUser}
>
<SharedUsers sharedUsers={userIds}/>
<SharedUsers sharedUsers={userLabels}/>
</TableCell>
{desktop &&
<TableCell align="left">
Expand Down
14 changes: 11 additions & 3 deletions packages/files-ui/src/Contexts/FilesContext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import {
Bucket as FilesBucket,
SearchEntry,
BucketFileFullInfoResponse,
BucketSummaryResponse
BucketSummaryResponse,
LookupUser
} from "@chainsafe/files-api-client"
import React, { useCallback, useEffect, useReducer } from "react"
import { useState } from "react"
Expand Down Expand Up @@ -67,9 +68,12 @@ interface GetFileContentParams {

export type BucketPermission = "writer" | "owner" | "reader"

export type BucketKeyPermission = FilesBucket & {
export type BucketKeyPermission = Omit<FilesBucket, "owners" | "writers" | "readers"> & {
encryptionKey: string
permission?: BucketPermission
owners: LookupUser[]
writers: LookupUser[]
readers: LookupUser[]
}

type FilesContext = {
Expand Down Expand Up @@ -187,10 +191,14 @@ const FilesProvider = ({ children }: FilesContextProps) => {

const bucketsWithKeys: BucketKeyPermission[] = await Promise.all(
result.map(async (b) => {
const userData = await filesApiClient.getBucketUsers(b.id)
return {
...b,
encryptionKey: await getKeyForBucket(b) || "",
permission: getPermissionForBucket(b)
permission: getPermissionForBucket(b),
owners: userData.owners || [],
Copy link
Collaborator

Choose a reason for hiding this comment

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

btw the type tells this can't be null, but I see it is. I added it to an issue I opened for a similar problem https://github.com/ChainSafe/files-api/issues/1383#issuecomment-891879713

writers: userData.writers || [],
readers: userData.readers || []
}
})
)
Expand Down
2 changes: 1 addition & 1 deletion packages/storage-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"@babel/core": "^7.12.10",
"@babel/runtime": "^7.0.0",
"@chainsafe/browser-storage-hooks": "^1.0.1",
"@chainsafe/files-api-client": "1.17.8",
"@chainsafe/files-api-client": "1.17.9",
"@chainsafe/web3-context": "1.1.4",
"@lingui/core": "^3.7.2",
"@lingui/react": "^3.7.2",
Expand Down
13 changes: 4 additions & 9 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1662,15 +1662,10 @@
resolved "https://registry.yarnpkg.com/@chainsafe/files-api-client/-/files-api-client-1.17.5.tgz#35dd9c4baf0833ee9b654495979ed1a66fb02f8d"
integrity sha512-5L7bAJr3siPgadDkGwhfo31MCkda01v/rTkLxUta13g6QG+pu0oKDoug+dtm8f9EPoH/rI89L2JHFM7XFrYveQ==

"@chainsafe/files-api-client@1.17.7":
version "1.17.7"
resolved "https://registry.yarnpkg.com/@chainsafe/files-api-client/-/files-api-client-1.17.7.tgz#aa8618eab659f9fc5baeef1134bdfcddba6dfc28"
integrity sha512-xqqSNlFqhx1UkgxSKzwB9KKvWztI0+WlRgLw4vikwEjQojSbX4ygrq5QfkDovi+lGAPGpeNTKaHlDMZZPyjx2A==

"@chainsafe/files-api-client@1.17.8":
version "1.17.8"
resolved "https://registry.yarnpkg.com/@chainsafe/files-api-client/-/files-api-client-1.17.8.tgz#0c52924cce276fc0e54b75c677e1d68e21d9cb5d"
integrity sha512-EJLGuDAPBsWfOe5CJ7SRpR2iywUEY0/iVO4tYvnWoT0j5ik100RNPQzVClD4B7yO8qPBneMtMBVldD0gNkqBWQ==
"@chainsafe/files-api-client@1.17.9":
version "1.17.9"
resolved "https://registry.yarnpkg.com/@chainsafe/files-api-client/-/files-api-client-1.17.9.tgz#8c608db1a07dc8bbdb10a1cd21fad00d091deed3"
integrity sha512-5XUs/KlNfAIVbqKCxtVEbUyWneTn0/kp70blbyCqVwaX1X3e7D2aXX0gy7zR5kMM7yjGsZE7vwA/0oVCaemfig==

"@chainsafe/web3-context@1.1.4":
version "1.1.4"
Expand Down