Skip to content
This repository has been archived by the owner on Jan 23, 2025. It is now read-only.

fix: fix file drop placement depending on mainmenu #536

Merged
merged 7 commits into from
Jan 31, 2023
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
2 changes: 1 addition & 1 deletion cypress/e2e/invitations/createInvitation.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
SHARE_ITEM_SHARE_BUTTON_ID,
buildShareButtonId,
} from '../../../src/config/selectors';
import { PERMISSION_LEVELS } from '../../../src/enums';
import { PERMISSION_LEVELS } from '../../fixtures/enum';
import { SAMPLE_ITEMS } from '../../fixtures/items';
import { MEMBERS } from '../../fixtures/members';

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/invitations/editInvitation.cy.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { PERMISSION_LEVELS } from '../../../src/enums';
import { buildItemPath } from '../../../src/config/paths';
import {
buildInvitationTableRowSelector,
buildPermissionOptionId,
buildShareButtonId,
ITEM_MEMBERSHIP_PERMISSION_SELECT_CLASS,
} from '../../../src/config/selectors';
import { PERMISSION_LEVELS } from '../../fixtures/enum';
import { ITEMS_WITH_INVITATIONS } from '../../fixtures/invitations';
import { TABLE_MEMBERSHIP_RENDER_TIME } from '../../support/constants';

Expand Down
3 changes: 2 additions & 1 deletion cypress/e2e/item/create/createShortcut.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ import {
buildItemMenu,
buildItemMenuButtonId,
} from '../../../../src/config/selectors';
import { ITEM_LAYOUT_MODES, ITEM_TYPES } from '../../../../src/enums';
import { ITEM_LAYOUT_MODES } from '../../../../src/enums';
import { buildShortcutExtra } from '../../../../src/utils/itemExtra';
import { ITEM_TYPES } from '../../../fixtures/enum';
import { IMAGE_ITEM_DEFAULT } from '../../../fixtures/files';
import { SAMPLE_ITEMS } from '../../../fixtures/items';
import { TABLE_ITEM_RENDER_TIME } from '../../../support/constants';
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/item/view/viewFile.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
} from '../../../fixtures/files';
import { expectFileViewScreenLayout } from '../../../support/viewUtils';

describe('Files', () => {
describe('View Files', () => {
describe('default server', () => {
beforeEach(() => {
cy.setUpApi({
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/item/view/viewFolder.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ describe('View Folder', () => {
i18n.changeLanguage(CURRENT_USER.extra.lang);
});

it('visit Home', () => {
it.only('visit Home', () => {
cy.visit(HOME_PATH);
cy.switchMode(ITEM_LAYOUT_MODES.GRID);

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/memberships/createItemMembership.cy.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { PERMISSION_LEVELS } from '../../../src/enums';
import { buildItemPath } from '../../../src/config/paths';
import {
buildShareButtonId,
CREATE_MEMBERSHIP_FORM_ID,
SHARE_ITEM_EMAIL_INPUT_ID,
SHARE_ITEM_SHARE_BUTTON_ID,
} from '../../../src/config/selectors';
import { PERMISSION_LEVELS } from '../../fixtures/enum';
import { SAMPLE_ITEMS } from '../../fixtures/items';
import { MEMBERS } from '../../fixtures/members';

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/memberships/editItemMembership.cy.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { PERMISSION_LEVELS } from '../../../src/enums';
import { buildItemPath } from '../../../src/config/paths';
import {
buildItemMembershipRowSelector,
buildPermissionOptionId,
buildShareButtonId,
ITEM_MEMBERSHIP_PERMISSION_SELECT_CLASS,
} from '../../../src/config/selectors';
import { PERMISSION_LEVELS } from '../../fixtures/enum';
import { ITEMS_WITH_MEMBERSHIPS } from '../../fixtures/memberships';
import { TABLE_MEMBERSHIP_RENDER_TIME } from '../../support/constants';

Expand Down
2 changes: 1 addition & 1 deletion cypress/fixtures/apps.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { APP_NAME } from './apps/apps';
import { ITEM_TYPES } from '../../src/enums';
import { ITEM_TYPES } from './enum';
import { DEFAULT_FOLDER_ITEM } from './items';
import { CURRENT_USER } from './members';

Expand Down
2 changes: 1 addition & 1 deletion cypress/fixtures/documents.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ITEM_TYPES } from '../../src/enums';
import { ITEM_TYPES } from './enum';
import { buildDocumentExtra } from '../../src/utils/itemExtra';
import { CURRENT_USER } from './members';
import { DEFAULT_FOLDER_ITEM } from './items';
Expand Down
19 changes: 12 additions & 7 deletions src/enums/itemTypes.js → cypress/fixtures/enum.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
/**
* @deprecated use graasp sdk
* this object only exists for tests
*/
const ITEM_TYPES = {
export const PERMISSION_LEVELS = {
READ: 'read',
WRITE: 'write',
ADMIN: 'admin',
};

/**
* @deprecated use graasp sdk
* this object only exists for tests
*/
export const ITEM_TYPES = {
FOLDER: 'folder',
FILE: 'file',
S3_FILE: 's3File',
Expand All @@ -14,9 +25,3 @@ const ITEM_TYPES = {
// but is used for the creation modal
ZIP: 'zip',
};

Object.freeze(ITEM_TYPES);
/**
* @deprecated use graasp sdk
*/
export default ITEM_TYPES;
3 changes: 2 additions & 1 deletion cypress/fixtures/files.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { ITEM_TYPES, MIME_TYPES } from '../../src/enums';
import { MIME_TYPES } from '../../src/enums';
import { ITEM_TYPES } from './enum';
import { buildFileExtra, buildS3FileExtra } from '../../src/utils/itemExtra';
import { MOCK_IMAGE_URL, MOCK_PDF_URL, MOCK_VIDEO_URL } from './fileLinks';
import { CURRENT_USER } from './members';
Expand Down
2 changes: 1 addition & 1 deletion cypress/fixtures/invitations.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { v4 } from 'uuid';

import { PERMISSION_LEVELS } from '../../src/enums';
import { PERMISSION_LEVELS } from './enum';
import { DEFAULT_FOLDER_ITEM } from './items';
import { MEMBERS } from './members';

Expand Down
2 changes: 1 addition & 1 deletion cypress/fixtures/items.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { SETTINGS } from '../../src/config/constants';
import { ITEM_TYPES, PERMISSION_LEVELS } from '../../src/enums';
import { ITEM_TYPES, PERMISSION_LEVELS } from './enum';
import { buildItemLoginSchemaExtra } from '../../src/utils/itemExtra';
import {
DEFAULT_TAGS,
Expand Down
2 changes: 1 addition & 1 deletion cypress/fixtures/links.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ITEM_TYPES } from '../../src/enums';
import { ITEM_TYPES } from './enum';
import { buildEmbeddedLinkExtra } from '../../src/utils/itemExtra';
import { CURRENT_USER } from './members';

Expand Down
2 changes: 1 addition & 1 deletion cypress/fixtures/memberships.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { PERMISSION_LEVELS } from '../../src/enums';
import { PERMISSION_LEVELS } from './enum';
import { DEFAULT_FOLDER_ITEM } from './items';
import { MEMBERS } from './members';

Expand Down
2 changes: 1 addition & 1 deletion cypress/fixtures/navigationItems.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ITEM_TYPES } from '../../src/enums';
import { ITEM_TYPES } from './enum';
import { buildDocumentExtra } from '../../src/utils/itemExtra';
import { DEFAULT_FOLDER_ITEM } from './items';
import { CURRENT_USER } from './members';
Expand Down
2 changes: 1 addition & 1 deletion cypress/fixtures/recycleBin.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { PERMISSION_LEVELS } from '../../src/enums';
import { PERMISSION_LEVELS } from './enum';
import { DEFAULT_FOLDER_ITEM } from './items';
import { CURRENT_USER } from './members';

Expand Down
2 changes: 1 addition & 1 deletion cypress/fixtures/sharedItems.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { PERMISSION_LEVELS } from '../../src/enums';
import { PERMISSION_LEVELS } from './enum';
import { DEFAULT_FOLDER_ITEM } from './items';
import { MEMBERS } from './members';

Expand Down
2 changes: 1 addition & 1 deletion cypress/fixtures/thumbnails.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { PERMISSION_LEVELS } from '../../src/enums';
import { FIXTURES_THUMBNAILS_FOLDER } from '../support/constants';
import { PERMISSION_LEVELS } from './enum';
import { DEFAULT_FOLDER_ITEM } from './items';
import { MEMBERS } from './members';

Expand Down
2 changes: 1 addition & 1 deletion cypress/support/createUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
DASHBOARD_UPLOADER_ID,
ZIP_DASHBOARD_UPLOADER_ID,
} from '../../src/config/selectors';
import { ITEM_TYPES } from '../../src/enums';
import { ITEM_TYPES } from '../fixtures/enum';

// eslint-disable-next-line import/prefer-default-export
export const createItem = (payload, options) => {
Expand Down
3 changes: 2 additions & 1 deletion cypress/support/editUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import {
buildEditButtonId,
buildSaveButtonId,
} from '../../src/config/selectors';
import { ITEM_LAYOUT_MODES, ITEM_TYPES } from '../../src/enums';
import { ITEM_LAYOUT_MODES } from '../../src/enums';
import { ITEM_TYPES } from '../fixtures/enum';
import { CAPTION_EDIT_PAUSE, TABLE_ITEM_RENDER_TIME } from './constants';

// eslint-disable-next-line import/prefer-default-export
Expand Down
2 changes: 1 addition & 1 deletion cypress/support/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
SIGN_IN_PATH,
THUMBNAIL_EXTENSION,
} from '../../src/config/constants';
import { PERMISSION_LEVELS } from '../../src/enums';
import { PERMISSION_LEVELS } from '../fixtures/enum';
import {
getItemById,
getParentsIdsFromPath,
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"@emotion/styled": "11.10.5",
"@graasp/chatbox": "1.0.1",
"@graasp/query-client": "0.1.2",
"@graasp/sdk": "0.2.0",
"@graasp/sdk": "0.3.0",
"@graasp/translations": "1.3.0",
"@graasp/ui": "0.7.1",
"@graasp/ui": "0.8.0",
"@mui/icons-material": "5.11.0",
"@mui/lab": "5.0.0-alpha.117",
"@mui/material": "5.11.6",
Expand Down Expand Up @@ -150,8 +150,8 @@
"react-error-overlay": "6.0.9",
"@mui/icons-material": "5.10.14",
"@mui/material": "5.10.14",
"@graasp/sdk": "0.2.0",
"react-query": "3.39.2"
"react-query": "3.39.2",
"@graasp/sdk": "0.3.0"
},
"packageManager": "[email protected]"
}
4 changes: 2 additions & 2 deletions src/components/common/Chatbox.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import { useContext } from 'react';

import GraaspChatbox from '@graasp/chatbox';
import { MUTATION_KEYS } from '@graasp/query-client';
import { PermissionLevel } from '@graasp/sdk';
import { Loader } from '@graasp/ui';

import { hooks, useMutation } from '../../config/queryClient';
import { CHATBOX_ID, CHATBOX_INPUT_BOX_ID } from '../../config/selectors';
import { PERMISSION_LEVELS } from '../../enums';
import { CurrentUserContext } from '../context/CurrentUserContext';

const { useItemChat, useMembers, useAvatar, useItemMemberships } = hooks;
Expand Down Expand Up @@ -46,7 +46,7 @@ const Chatbox = ({ item }) => {
// only show export chat when user has admin right on the item
const isAdmin =
itemPermissions?.find((perms) => perms.memberId === currentMember.id)
?.permission === PERMISSION_LEVELS.ADMIN;
?.permission === PermissionLevel.Admin;

return (
<GraaspChatbox
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import PropTypes from 'prop-types';
import { validate } from 'uuid';

import { createContext, useMemo, useState } from 'react';
Expand All @@ -10,13 +9,19 @@ import { useBuilderTranslation } from '../../config/i18n';
import { useMutation } from '../../config/queryClient';
import TreeModal from '../main/TreeModal';

const CopyItemModalContext = createContext();
const CopyItemModalContext = createContext<{
openModal?: (ids: string[]) => void;
}>({});

const CopyItemModalProvider = ({ children }) => {
const CopyItemModalProvider = ({
children,
}: {
children: JSX.Element | JSX.Element[];
}): JSX.Element => {
const { t: translateBuilder } = useBuilderTranslation();
const { mutate: copyItems } = useMutation(MUTATION_KEYS.COPY_ITEMS);
const [open, setOpen] = useState(false);
const [itemIds, setItemIds] = useState(false);
const [open, setOpen] = useState<boolean>(false);
const [itemIds, setItemIds] = useState<string[] | null>(null);

const openModal = (newItemIds) => {
setOpen(true);
Expand Down Expand Up @@ -64,12 +69,4 @@ const CopyItemModalProvider = ({ children }) => {
);
};

CopyItemModalProvider.propTypes = {
children: PropTypes.node,
};

CopyItemModalProvider.defaultProps = {
children: null,
};

export { CopyItemModalProvider, CopyItemModalContext };
4 changes: 2 additions & 2 deletions src/components/context/CreateShortcutModalContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ const CreateShortcutModalProvider: FC<Props> = ({ children }) => {
setItem(null);
};

const onConfirm = ({ id: target, to }) => {
const onConfirm = ({ ids: [target], to }) => {
const shortcut = {
name: translateBuilder(BUILDER.CREATE_SHORTCUT_DEFAULT_NAME, {
name: item.name,
}),
extra: buildShortcutExtra(target[0]),
extra: buildShortcutExtra(target),
type: ItemType.SHORTCUT,
// set parent id if not root
parentId: to !== TREE_MODAL_MY_ITEMS_ID ? to : undefined,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,18 @@ import { createContext, useEffect, useMemo } from 'react';
import i18n from '../../config/i18n';
import { hooks } from '../../config/queryClient';

const CurrentUserContext = createContext();
const CurrentUserContext = createContext(null);

type Props = {
children: JSX.Element | JSX.Element[];
};

const { useCurrentMember } = hooks;
const CurrentUserContextProvider = ({ children }) => {
const CurrentUserContextProvider = ({ children }: Props): JSX.Element => {
const query = useCurrentMember();

// update language depending on user setting
const lang = query?.data?.extra?.lang;
const lang = query?.data?.extra?.lang as string;
useEffect(() => {
if (lang !== i18n.language) {
i18n.changeLanguage(lang);
Expand Down
Loading