Skip to content
Snippets Groups Projects
Unverified Commit 090c96de authored by Kyle Doherty's avatar Kyle Doherty
Browse files

Merge branch 'collections-project-bulk-actions' of...

Merge branch 'collections-project-bulk-actions' of github.com:metabase/metabase into collections-project-bulk-actions
parents fcddbd5d f1f22084
No related branches found
No related tags found
No related merge requests found
......@@ -150,13 +150,13 @@ class DefaultLanding extends React.Component {
<Flex align="center">
<h3>{item.getName()}</h3>
{collection.can_write &&
item.unpin && (
item.setPinned && (
<Box
ml="auto"
className="hover-child"
onClick={ev => {
ev.preventDefault();
item.unpin();
item.setPinned(false);
}}
>
<Icon name="pin" />
......@@ -194,8 +194,8 @@ class DefaultLanding extends React.Component {
item.getFavorited && item.getFavorited()
}
onPin={
collection.can_write && item.pin
? () => item.pin()
collection.can_write && item.setPinned
? () => item.setPinned(true)
: null
}
selected={selection.has(item)}
......
......@@ -16,12 +16,10 @@ const Dashboards = createEntity({
id,
collection_id: collection && collection.id,
}),
pin: ({ id }) => Dashboards.actions.update({ id, collection_position: 1 }),
unpin: ({ id }) =>
Dashboards.actions.update({ id, collection_position: null }),
setFavorited: ({id}, favorited) =>
setPinned: ({ id }, pinned) =>
Dashboards.actions.update({ id, collection_position: pinned ? 1 : null }),
setFavorited: ({ id }, favorited) =>
Dashboards.actions.update({ id, favorited }),
},
objectSelectors: {
......
......@@ -17,9 +17,8 @@ const Questions = createEntity({
id,
collection_id: collection && collection.id,
}),
pin: ({ id }) => Questions.actions.update({ id, collection_position: 1 }),
unpin: ({ id }) =>
Questions.actions.update({ id, collection_position: null }),
setPinned: ({ id }, pinned) =>
Questions.actions.update({ id, collection_position: pinned ? 1 : null }),
setFavorited: ({ id }, favorited) =>
Questions.actions.update({
id,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment