From fe111236244e0a9ae3d3c5afa22da4641eee9800 Mon Sep 17 00:00:00 2001 From: Thibaut Sardan Date: Fri, 24 Sep 2021 16:18:14 +0200 Subject: [PATCH 1/3] upgrade api client and fix issue --- packages/files-ui/package.json | 2 +- .../src/Components/Elements/SharedUsers.tsx | 5 +- .../files-ui/src/Contexts/FilesContext.tsx | 85 +++++++++----- packages/gaming-ui/package.json | 2 +- packages/storage-ui/package.json | 2 +- yarn.lock | 109 +++++++++++++++++- 6 files changed, 161 insertions(+), 44 deletions(-) diff --git a/packages/files-ui/package.json b/packages/files-ui/package.json index 9930b764ed..1d9af5079a 100644 --- a/packages/files-ui/package.json +++ b/packages/files-ui/package.json @@ -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.18.5", + "@chainsafe/files-api-client": "^1.18.10", "@chainsafe/web3-context": "1.1.4", "@lingui/core": "^3.7.2", "@lingui/react": "^3.7.2", diff --git a/packages/files-ui/src/Components/Elements/SharedUsers.tsx b/packages/files-ui/src/Components/Elements/SharedUsers.tsx index ff39669ea7..30d44bfbda 100644 --- a/packages/files-ui/src/Components/Elements/SharedUsers.tsx +++ b/packages/files-ui/src/Components/Elements/SharedUsers.tsx @@ -1,8 +1,7 @@ import React, { useCallback, useMemo } from "react" import { makeStyles, createStyles, useThemeSwitcher } from "@chainsafe/common-theme" import UserBubble from "./UserBubble" -import { LookupUser } from "@chainsafe/files-api-client" -import { BucketKeyPermission } from "../../Contexts/FilesContext" +import { BucketKeyPermission, RichUserInfo } from "../../Contexts/FilesContext" import { getUserDisplayName } from "../../Utils/getUserDisplayName" const useStyles = makeStyles(() => { @@ -21,7 +20,7 @@ const SharedUsers = ({ bucket }: Props) => { const { desktop } = useThemeSwitcher() const { owners, readers, writers } = bucket - const getUserLabels = useCallback((users: LookupUser[]): string[] => { + const getUserLabels = useCallback((users: RichUserInfo[]): string[] => { return users.reduce((acc: string[], user): string[] => { const displayName = getUserDisplayName(user) diff --git a/packages/files-ui/src/Contexts/FilesContext.tsx b/packages/files-ui/src/Contexts/FilesContext.tsx index 9f3b113f7f..572ff311f5 100644 --- a/packages/files-ui/src/Contexts/FilesContext.tsx +++ b/packages/files-ui/src/Contexts/FilesContext.tsx @@ -2,10 +2,11 @@ import { FileContentResponse, DirectoryContentResponse, BucketType, - Bucket as FilesBucket, + Bucket, SearchEntry, BucketFileFullInfoResponse, BucketSummaryResponse, + BucketUser, LookupUser } from "@chainsafe/files-api-client" import React, { useCallback, useEffect } from "react" @@ -47,12 +48,14 @@ interface GetFileContentParams { export type BucketPermission = "writer" | "owner" | "reader" -export type BucketKeyPermission = Omit & { +export type RichUserInfo = BucketUser & LookupUser + +export interface BucketKeyPermission extends Bucket { encryptionKey: string permission?: BucketPermission - owners: LookupUser[] - writers: LookupUser[] - readers: LookupUser[] + owners: RichUserInfo[] + writers: RichUserInfo[] + readers: RichUserInfo[] } type FilesContext = { @@ -127,7 +130,7 @@ const FilesProvider = ({ children }: FilesContextProps) => { } }, [filesApiClient, setStorageSummary]) - const getPermissionForBucket = useCallback((bucket: FilesBucket) => { + const getPermissionForBucket = useCallback((bucket: Bucket) => { return bucket.owners.find(owner => owner.uuid === userId) ? "owner" as BucketPermission : bucket.writers.find(writer => writer.uuid === userId) @@ -137,7 +140,7 @@ const FilesProvider = ({ children }: FilesContextProps) => { : undefined }, [userId]) - const getKeyForSharedBucket = useCallback(async (bucket: FilesBucket) => { + const getKeyForSharedBucket = useCallback(async (bucket: Bucket) => { const bucketUsers = [...bucket.readers, ...bucket.writers, ...bucket.owners] const bucketUser = bucketUsers.find(bu => bu.uuid === userId) @@ -151,7 +154,7 @@ const FilesProvider = ({ children }: FilesContextProps) => { return decrypted || "" }, [decryptMessageWithThresholdKey, userId]) - const getKeyForBucket = useCallback(async (bucket: FilesBucket) => { + const getKeyForBucket = useCallback(async (bucket: Bucket) => { if (!personalEncryptionKey || !userId) return let encryptionKey = "" @@ -170,6 +173,25 @@ const FilesProvider = ({ children }: FilesContextProps) => { return encryptionKey }, [getKeyForSharedBucket, personalEncryptionKey, userId]) + const enrichUserInfo = useCallback((bucketUser: BucketUser[], lookupUser: LookupUser[]): RichUserInfo[] => { + console.log("bucketUser", bucketUser) + console.log("lookupUser", lookupUser) + + const richUsers: RichUserInfo[] = [] + + bucketUser.forEach((bu) => { + const correspondingLookupUser = lookupUser.find((lu) => lu.uuid === bu.uuid) + if (correspondingLookupUser) { + richUsers.push({ + ...bu, + ...correspondingLookupUser + }) + } + }) + + return richUsers + }, []) + const refreshBuckets = useCallback(async (showLoading?: boolean) => { if (!personalEncryptionKey || !userId) return @@ -183,9 +205,9 @@ const FilesProvider = ({ children }: FilesContextProps) => { ...b, encryptionKey: await getKeyForBucket(b) || "", permission: getPermissionForBucket(b), - owners: userData.owners || [], - writers: userData.writers || [], - readers: userData.readers || [] + owners: enrichUserInfo(b.owners, userData.owners), + writers: enrichUserInfo(b.writers, userData.writers), + readers: enrichUserInfo(b.readers, userData.readers) } }) ) @@ -193,7 +215,7 @@ const FilesProvider = ({ children }: FilesContextProps) => { setIsLoadingBuckets(false) getStorageSummary() return Promise.resolve() - }, [personalEncryptionKey, userId, filesApiClient, getStorageSummary, getKeyForBucket, getPermissionForBucket]) + }, [personalEncryptionKey, userId, filesApiClient, getStorageSummary, getKeyForBucket, getPermissionForBucket, enrichUserInfo]) useEffect(() => { refreshBuckets(true) @@ -696,29 +718,28 @@ const FilesProvider = ({ children }: FilesContextProps) => { .catch(console.error) }, [publicKey, encryptForPublicKey, filesApiClient, refreshBuckets, getKeyForBucket, getPermissionForBucket]) + const getUsersWithEncryptionKey = useCallback(async (from: UpdateSharedFolderUser[], bucketEncryptionKey: string) => { + return await Promise.all(from?.map(async ({ pubKey, encryption_key, uuid }) => { + return !encryption_key && !!pubKey + ? { + uuid, + encryption_key: await encryptForPublicKey(pubKey, bucketEncryptionKey) || "" + } + : { + uuid, + encryption_key: encryption_key || "" + } + })) + }, [encryptForPublicKey]) + const editSharedFolder = useCallback( async (bucket: BucketKeyPermission, writerUsers?: UpdateSharedFolderUser[], readerUsers?: UpdateSharedFolderUser[]) => { if (!publicKey) return - const readers = readerUsers ? await Promise.all(readerUsers?.map(async u => { - return u.pubKey ? { - uuid: u.uuid, - encryption_key: await encryptForPublicKey(u.pubKey, bucket.encryptionKey) - } : { - uuid: u.uuid, - encryption_key: u.encryption_key - } - })) : [] - - const writers = writerUsers ? await Promise.all(writerUsers?.map(async u => { - return u.pubKey ? { - uuid: u.uuid, - encryption_key: await encryptForPublicKey(u.pubKey, bucket.encryptionKey) - } : { - uuid: u.uuid, - encryption_key: u.encryption_key - } - })) : [] + if (!readerUsers || !writerUsers) return + + const readers = await getUsersWithEncryptionKey(readerUsers, bucket.encryptionKey) + const writers = await getUsersWithEncryptionKey(writerUsers, bucket.encryptionKey) return filesApiClient.updateBucket(bucket.id, { name: bucket.name, @@ -726,7 +747,7 @@ const FilesProvider = ({ children }: FilesContextProps) => { writers }).then(() => refreshBuckets(false)) .catch(console.error) - }, [filesApiClient, encryptForPublicKey, publicKey, refreshBuckets]) + }, [publicKey, getUsersWithEncryptionKey, filesApiClient, refreshBuckets]) const transferFileBetweenBuckets = useCallback(async ( sourceBucketId: string, diff --git a/packages/gaming-ui/package.json b/packages/gaming-ui/package.json index 16886a7c70..22d3bdd943 100644 --- a/packages/gaming-ui/package.json +++ b/packages/gaming-ui/package.json @@ -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.18.5", + "@chainsafe/files-api-client": "^1.18.10", "@chainsafe/web3-context": "1.1.4", "@lingui/core": "^3.7.2", "@lingui/react": "^3.7.2", diff --git a/packages/storage-ui/package.json b/packages/storage-ui/package.json index 4d4438355a..58da774b9e 100644 --- a/packages/storage-ui/package.json +++ b/packages/storage-ui/package.json @@ -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.18.5", + "@chainsafe/files-api-client": "^1.18.10", "@chainsafe/web3-context": "1.1.4", "@lingui/core": "^3.7.2", "@lingui/react": "^3.7.2", diff --git a/yarn.lock b/yarn.lock index b1d7df164d..5cad93d39a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1925,11 +1925,13 @@ resolved "https://registry.yarnpkg.com/@chainsafe/browser-storage-hooks/-/browser-storage-hooks-1.0.1.tgz#26d32cde1999914db755a631e2643823c54959f7" integrity sha512-Q4b5gQAZnsRXKeADspd5isqfwwhhXjDk70y++YadufA6EZ3tf340oW0OVszp74KaGEw+CAYFGQR4X7bzpZ3x9Q== -"@chainsafe/files-api-client@^1.18.5": - version "1.18.5" - resolved "https://registry.yarnpkg.com/@chainsafe/files-api-client/-/files-api-client-1.18.5.tgz#2f4ed5989fa12c0e5823388384f61281a73cf27c" - integrity sha512-q/x4+U9NRDLvqIpvloKRPUFMAMsIVlGnt56d3Vv7bw3TISrxyRqGxcTm3pX7XFcqaU3MWeX6Hs01+lrCf+b0GA== +"@chainsafe/files-api-client@^1.18.10": + version "1.18.10" + resolved "https://registry.yarnpkg.com/@chainsafe/files-api-client/-/files-api-client-1.18.10.tgz#a359f0d40916afec41ea7ffc8aa4ffc505c25c17" + integrity sha512-Rpuk7jDF0cFg53xIrfHsp20aA37QwYd/WDv28JjlhpBI9egbk6oTgVuB9LEiR9mYWb65CIXxfxGvc6WmE3DWTw== dependencies: + "@redocly/openapi-cli" "^1.0.0-beta.58" + "@redocly/openapi-core" "^1.0.0-beta.58" redoc-cli "^0.12.3" "@chainsafe/web3-context@1.1.4": @@ -4480,6 +4482,24 @@ require-from-string "^2.0.2" uri-js "^4.2.2" +"@redocly/openapi-cli@^1.0.0-beta.58": + version "1.0.0-beta.61" + resolved "https://registry.yarnpkg.com/@redocly/openapi-cli/-/openapi-cli-1.0.0-beta.61.tgz#03dfbf058b2bf85922a0e19adaa2856f111d1b14" + integrity sha512-x3s2wdFHTpuO/Wd8y6lrdRzDFVRGxFLdv+0iXR06b1vHWOx/SUzK+7Qslq3Pk6bpge4FFhaJai80pEv/9B05Fw== + dependencies: + "@redocly/openapi-core" "^1.0.0-beta.61" + "@types/node" "^14.11.8" + assert-node-version "^1.0.3" + chokidar "^3.5.1" + colorette "^1.2.0" + glob "^7.1.6" + glob-promise "^3.4.0" + handlebars "^4.7.6" + js-yaml "^3.14.1" + portfinder "^1.0.26" + simple-websocket "^9.0.0" + yargs "17.0.1" + "@redocly/openapi-core@^1.0.0-beta.50": version "1.0.0-beta.58" resolved "https://registry.yarnpkg.com/@redocly/openapi-core/-/openapi-core-1.0.0-beta.58.tgz#d7c9dfe580bd3f115f4e667ba49bc18be3c65ed2" @@ -4495,6 +4515,21 @@ node-fetch "^2.6.1" yaml-ast-parser "0.0.43" +"@redocly/openapi-core@^1.0.0-beta.58", "@redocly/openapi-core@^1.0.0-beta.61": + version "1.0.0-beta.61" + resolved "https://registry.yarnpkg.com/@redocly/openapi-core/-/openapi-core-1.0.0-beta.61.tgz#d5fa05a4f625c234d5d83d65986f6d3dba68336a" + integrity sha512-/OgtozUxy7SvHVBZ3Iygu6brDTOFTOlkzpDQyykpa0lK2cPBeYjkJP5foBlHKeHl+TvxfPuzh1CSGSShSc+IBg== + dependencies: + "@redocly/ajv" "^8.6.2" + "@types/node" "^14.11.8" + colorette "^1.2.0" + js-levenshtein "^1.1.6" + js-yaml "^3.14.1" + lodash.isequal "^4.5.0" + minimatch "^3.0.4" + node-fetch "^2.6.1" + yaml-ast-parser "0.0.43" + "@redocly/react-dropdown-aria@^2.0.11": version "2.0.12" resolved "https://registry.yarnpkg.com/@redocly/react-dropdown-aria/-/react-dropdown-aria-2.0.12.tgz#2e3af2b1b8e9123487109400d6117f0d4a8445a6" @@ -5849,6 +5884,14 @@ dependencies: "@types/node" "*" +"@types/glob@*": + version "7.1.4" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.4.tgz#ea59e21d2ee5c517914cb4bc8e4153b99e566672" + integrity sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA== + dependencies: + "@types/minimatch" "*" + "@types/node" "*" + "@types/glob@^7.1.1": version "7.1.3" resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183" @@ -7394,6 +7437,14 @@ asn1@~0.2.3: dependencies: safer-buffer "~2.1.0" +assert-node-version@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/assert-node-version/-/assert-node-version-1.0.3.tgz#caea5d1b6a58dbce59661208df1e1b9e4c580f91" + integrity sha1-yupdG2pY285ZZhII3x4bnkxYD5E= + dependencies: + expected-node-version "^1.0.0" + semver "^5.0.3" + assert-plus@1.0.0, assert-plus@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" @@ -12868,6 +12919,11 @@ expect@^24.9.0: jest-message-util "^24.9.0" jest-regex-util "^24.9.0" +expected-node-version@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/expected-node-version/-/expected-node-version-1.0.2.tgz#b8d225b9bf676a9e87e06dbd615b52fc9d1e386b" + integrity sha1-uNIlub9nap6H4G29YVtS/J0eOGs= + express@^4.17.0, express@^4.17.1: version "4.17.1" resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" @@ -13807,6 +13863,13 @@ glob-parent@~5.1.2: dependencies: is-glob "^4.0.1" +glob-promise@^3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/glob-promise/-/glob-promise-3.4.0.tgz#b6b8f084504216f702dc2ce8c9bc9ac8866fdb20" + integrity sha512-q08RJ6O+eJn+dVanerAndJwIcumgbDdYiUT7zFQl3Wm1xD6fBKtah7H8ZJChj4wP+8C+QfeVy8xautR7rdmKEw== + dependencies: + "@types/glob" "*" + glob-to-regexp@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" @@ -14013,7 +14076,7 @@ handle-thing@^2.0.0: resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg== -handlebars@^4.7.7: +handlebars@^4.7.6, handlebars@^4.7.7: version "4.7.7" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA== @@ -20207,6 +20270,11 @@ querystringify@^2.1.1: resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== +queue-microtask@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== + quick-lru@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8" @@ -21977,7 +22045,7 @@ semaphore@>=1.0.1, semaphore@^1.0.3: resolved "https://registry.yarnpkg.com/semaphore/-/semaphore-1.1.0.tgz#aaad8b86b20fe8e9b32b16dc2ee682a8cd26a8aa" integrity sha512-O4OZEaNtkMd/K0i6js9SL+gqy0ZCBMgUvlSqHKi4IBdjhe7wB8pwztUk1BbZ1fmrvpwFrPbHzqd2w5pTcJH6LA== -"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: +"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -22288,6 +22356,17 @@ simple-swizzle@^0.2.2: dependencies: is-arrayish "^0.3.1" +simple-websocket@^9.0.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/simple-websocket/-/simple-websocket-9.1.0.tgz#91cbb39eafefbe7e66979da6c639109352786a7f" + integrity sha512-8MJPnjRN6A8UCp1I+H/dSFyjwJhp6wta4hsVRhjf8w9qBHRzxYt14RaOcjvQnhD1N4yKOddEjflwMnQM4VtXjQ== + dependencies: + debug "^4.3.1" + queue-microtask "^1.2.2" + randombytes "^2.1.0" + readable-stream "^3.6.0" + ws "^7.4.2" + simplebar-react@^1.0.0-alpha.6: version "1.2.3" resolved "https://registry.yarnpkg.com/simplebar-react/-/simplebar-react-1.2.3.tgz#bd81fa9827628470e9470d06caef6ece15e1c882" @@ -25348,6 +25427,11 @@ ws@^6.1.2, ws@^6.2.1: dependencies: async-limiter "~1.0.0" +ws@^7.4.2: + version "7.5.5" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881" + integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w== + wsrun@^5.2.4: version "5.2.4" resolved "https://registry.yarnpkg.com/wsrun/-/wsrun-5.2.4.tgz#6eb6c3ccd3327721a8df073a5e3578fb0dea494e" @@ -25531,6 +25615,19 @@ yargs@13.2.4: y18n "^4.0.0" yargs-parser "^13.1.0" +yargs@17.0.1: + version "17.0.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.0.1.tgz#6a1ced4ed5ee0b388010ba9fd67af83b9362e0bb" + integrity sha512-xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" + yargs@^13.0.0, yargs@^13.2.4, yargs@^13.3.0, yargs@^13.3.2: version "13.3.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" From ae0bdf238621e0edf90098f2e969761955cb9965 Mon Sep 17 00:00:00 2001 From: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com> Date: Fri, 24 Sep 2021 16:26:18 +0200 Subject: [PATCH 2/3] Update packages/files-ui/src/Contexts/FilesContext.tsx --- packages/files-ui/src/Contexts/FilesContext.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/files-ui/src/Contexts/FilesContext.tsx b/packages/files-ui/src/Contexts/FilesContext.tsx index 572ff311f5..732899178a 100644 --- a/packages/files-ui/src/Contexts/FilesContext.tsx +++ b/packages/files-ui/src/Contexts/FilesContext.tsx @@ -174,8 +174,6 @@ const FilesProvider = ({ children }: FilesContextProps) => { }, [getKeyForSharedBucket, personalEncryptionKey, userId]) const enrichUserInfo = useCallback((bucketUser: BucketUser[], lookupUser: LookupUser[]): RichUserInfo[] => { - console.log("bucketUser", bucketUser) - console.log("lookupUser", lookupUser) const richUsers: RichUserInfo[] = [] From 64dd989af0c3688966d5d662ee34e1f2b3ebd1a8 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 24 Sep 2021 14:30:17 +0000 Subject: [PATCH 3/3] lingui extract --- packages/files-ui/src/locales/de/messages.po | 3 +-- packages/files-ui/src/locales/fr/messages.po | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/files-ui/src/locales/de/messages.po b/packages/files-ui/src/locales/de/messages.po index 88bd202b21..2576321ad3 100644 --- a/packages/files-ui/src/locales/de/messages.po +++ b/packages/files-ui/src/locales/de/messages.po @@ -5,8 +5,7 @@ msgstr "" "POT-Creation-Date: 2021-04-20 00:28+0200\n" "PO-Revision-Date: 2021-09-22 21:38+0000\n" "Last-Translator: J. Lavoie \n" -"Language-Team: German \n" +"Language-Team: German \n" "Language: de\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/packages/files-ui/src/locales/fr/messages.po b/packages/files-ui/src/locales/fr/messages.po index 649ee62fac..55ba27e06b 100644 --- a/packages/files-ui/src/locales/fr/messages.po +++ b/packages/files-ui/src/locales/fr/messages.po @@ -5,8 +5,7 @@ msgstr "" "POT-Creation-Date: 2021-04-23 11:05+0200\n" "PO-Revision-Date: 2021-09-22 21:38+0000\n" "Last-Translator: J. Lavoie \n" -"Language-Team: French \n" +"Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n"