Skip to content

Commit a078437

Browse files
authored
Merge branch 'release/2.0.0' into feature/CAES-1526-fix-error-when-download-attach-to-existing-item
2 parents 2935cde + 421af61 commit a078437

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

packages/common/sagas/entities/team.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,7 @@ export function* encryptMemberTeamKey({ user, keypair }) {
210210

211211
return {
212212
userId,
213-
secret: JSON.stringify({ data }),
214-
raws,
213+
secret: JSON.stringify({ data, raws }),
215214
teamRole,
216215
};
217216
}
@@ -254,8 +253,7 @@ export function* createTeamSaga({
254253
const serverPayload = {
255254
team,
256255
keypair: {
257-
secret: JSON.stringify({ data }),
258-
raws,
256+
secret: JSON.stringify({ data, raws }),
259257
},
260258
};
261259

packages/components/List/Item/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ const SharedUsersCount = ({ isInModal = false, sharedCount = 0 }) => {
5959
};
6060

6161
const FavItemIcon = ({ favorite = false, isClosable = true }) => {
62-
if (!favorite || !isClosable) return <></>;
62+
if (!favorite || (isClosable && favorite)) return <></>;
6363

6464
return (
6565
<Addon>

packages/containers/Dashboard/components/MiddleColumn.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ const MiddleColumnComponent = ({
8181
const currentTeamItems = useSelector(state =>
8282
teamItemsSelector(state, { teamId: currentTeamId }),
8383
);
84+
8485
const searchedItems = useMemo(
8586
() =>
8687
filter(

packages/containers/Dashboard/utils.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,7 @@ const searchFn = (obj, pattern) =>
4343
obj && pattern && obj.toLowerCase().includes(pattern.toLowerCase());
4444

4545
export const filter = memoize((data, pattern) =>
46-
pattern ? data.filter(({ title }) => searchFn(title, pattern)) : data,
46+
pattern
47+
? data.filter(({ meta: { title } }) => searchFn(title, pattern))
48+
: data,
4749
);

0 commit comments

Comments
 (0)