Skip to content

Commit

Permalink
♻️(frontend) adapt frontend with new access types
Browse files Browse the repository at this point in the history
We don't get the accesses anymore from the backeend,
instead we get the number of accesses.
We remove the list of owners in the doc header because
we don't have easily this informations anymore and
we will have to do a bigger refacto.
  • Loading branch information
AntoLC committed Nov 28, 2024
1 parent 1af7b79 commit eec8b4d
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 51 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,6 @@ test.describe('Doc Header', () => {
await expect(
card.getByText('Created at 09/01/2021, 11:00 AM'),
).toBeVisible();
await expect(
card.getByText('Owners: Super Owner / [email protected]'),
).toBeVisible();
await expect(card.getByText('Your role: Owner')).toBeVisible();
await expect(page.getByRole('button', { name: 'Share' })).toBeVisible();
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@ import { css } from 'styled-components';

import { Box, Card, StyledLink, Text } from '@/components';
import { useCunninghamTheme } from '@/cunningham';
import {
Doc,
Role,
currentDocRole,
useTrans,
} from '@/features/docs/doc-management';
import { Doc, currentDocRole, useTrans } from '@/features/docs/doc-management';
import { Versions } from '@/features/docs/doc-versioning';
import { useDate } from '@/hook';
import { useResponsiveStore } from '@/stores';
Expand Down Expand Up @@ -100,21 +95,6 @@ export const DocHeader = ({ doc, versionId }: DocHeaderProps) => {
<Text $size="s" $display="inline">
{t('Created at')} <strong>{formatDate(doc.created_at)}</strong>
</Text>
<Text $size="s" $display="inline" $elipsis $maxWidth="60vw">
{t('Owners:')}{' '}
<strong>
{doc.accesses
.filter(
(access) => access.role === Role.OWNER && access.user.email,
)
.map((access, index, accesses) => (
<Fragment key={`access-${index}`}>
{access.user.full_name || access.user.email}{' '}
{index < accesses.length - 1 ? ' / ' : ''}
</Fragment>
))}
</strong>
</Text>
</Box>
<Text $size="s" $display="inline">
{t('Your role:')}{' '}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,11 @@ export interface Doc {
id: string;
title: string;
content: Base64;
creator: string;
is_favorite: boolean;
link_reach: LinkReach;
link_role: LinkRole;
accesses: Access[];
nb_accesses: number;
created_at: string;
updated_at: string;
abilities: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ export const DocsGrid = () => {
renderCell: ({ row }) => {
return (
<StyledLink href={`/docs/${row.id}`}>
<Text $weight="bold">{row.accesses.length}</Text>
<Text $weight="bold">{row.nb_accesses}</Text>
</StyledLink>
);
},
Expand Down
29 changes: 4 additions & 25 deletions src/frontend/apps/impress/src/features/service-worker/ApiPlugin.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
import { WorkboxPlugin } from 'workbox-core';

import { Doc, DocsResponse } from '@/features/docs/doc-management';
import {
LinkReach,
LinkRole,
Role,
} from '@/features/docs/doc-management/types';
import { LinkReach, LinkRole } from '@/features/docs/doc-management/types';

import { DBRequest, DocsDB } from './DocsDB';
import { RequestSerializer } from './RequestSerializer';
Expand Down Expand Up @@ -192,6 +188,9 @@ export class ApiPlugin implements WorkboxPlugin {
id: uuid,
content: '',
created_at: new Date().toISOString(),
creator: 'dummy-id',
is_favorite: false,
nb_accesses: 1,
updated_at: new Date().toISOString(),
abilities: {
accesses_manage: true,
Expand All @@ -206,26 +205,6 @@ export class ApiPlugin implements WorkboxPlugin {
versions_list: true,
versions_retrieve: true,
},
accesses: [
{
id: 'dummy-id',
role: Role.OWNER,
team: '',
user: {
id: 'dummy-id',
email: 'dummy-email',
full_name: 'dummy-full-name',
short_name: 'dummy-short-name',
},
abilities: {
destroy: false,
partial_update: false,
retrieve: true,
set_role_to: [],
update: false,
},
},
],
link_reach: LinkReach.RESTRICTED,
link_role: LinkRole.READER,
};
Expand Down

0 comments on commit eec8b4d

Please sign in to comment.