reorder things in profile

siddharthkp · siddharthkp · commit 8d46bcfd9aff · 2020-09-04T12:19:58.000+02:00
diff --git a/packages/app/src/app/overmind/namespaces/profile/actions.ts b/packages/app/src/app/overmind/namespaces/profile/actions.ts
@@ -243,6 +243,9 @@ export const addFeaturedSandboxes: AsyncAction<{
     sandbox => sandbox.id
   );
 
+  // already featured
+  if (currentFeaturedSandboxIds.includes(sandboxId)) return;
+
   // optimistic update
   actions.profile.addFeaturedSandboxesInState({ sandboxId });
 
@@ -294,6 +297,48 @@ export const removeFeaturedSandboxes: AsyncAction<{
   }
 };
 
+export const reorderFeaturedSandboxesInState: Action<{
+  startPosition: number;
+  endPosition: number;
+}> = ({ state, actions, effects }, { startPosition, endPosition }) => {
+  if (!state.profile.current) return;
+
+  // optimisic update
+  const featuredSandboxes = [...state.profile.current.featuredSandboxes];
+  const sandbox = featuredSandboxes.find((_, index) => index === startPosition);
+
+  // remove element first
+  featuredSandboxes.splice(startPosition, 1);
+  // now add at new position
+  featuredSandboxes.splice(endPosition, 0, sandbox);
+
+  state.profile.current.featuredSandboxes = featuredSandboxes;
+};
+
+export const saveFeaturedSandboxesOrder: AsyncAction = async ({
+  actions,
+  effects,
+  state,
+}) => {
+  try {
+    const featuredSandboxIds = state.profile.current.featuredSandboxes.map(
+      s => s.id
+    );
+    const profile = await effects.api.updateUserFeaturedSandboxes(
+      state.profile.current.id,
+      featuredSandboxIds
+    );
+    state.profile.current.featuredSandboxes = profile.featuredSandboxes;
+  } catch (error) {
+    // TODO: rollback optimisic update
+
+    actions.internal.handleError({
+      message: "We weren't able to re-order your pinned sandboxes",
+      error,
+    });
+  }
+};
+
 export const changeSandboxPrivacyInState: Action<{
   sandboxId: string;
   privacy: 0 | 1 | 2;
diff --git a/packages/app/src/app/overmind/namespaces/profile/state.ts b/packages/app/src/app/overmind/namespaces/profile/state.ts
@@ -50,6 +50,8 @@ export const state: State = {
   searchQuery: null,
   isLoadingSandboxes: false,
   sandboxToDeleteId: null,
+  currentSortBy: 'view_count',
+  currentSortDirection: 'desc',
   isProfileCurrentUser: derived((currentState: State, rootState: RootState) =>
     Boolean(
       rootState.user && rootState.user.id === currentState.currentProfileId
@@ -75,6 +77,4 @@ export const state: State = {
       ? currentState.sandboxes[currentState.current.username]
       : []
   ),
-  currentSortBy: 'view_count',
-  currentSortDirection: 'desc',
 };
diff --git a/packages/app/src/app/pages/Profile2/AllSandboxes.tsx b/packages/app/src/app/pages/Profile2/AllSandboxes.tsx
@@ -8,9 +8,10 @@ import {
   Menu,
 } from '@codesandbox/components';
 import css from '@styled-system/css';
+import { motion } from 'framer-motion';
 import { useOvermind } from 'app/overmind';
 import { SandboxCard, SkeletonCard } from './SandboxCard';
-import { SANDBOXES_PER_PAGE } from './constants';
+import { SANDBOXES_PER_PAGE, SandboxTypes } from './constants';
 
 export const AllSandboxes = ({ menuControls }) => {
   const {
@@ -119,7 +120,13 @@ export const AllSandboxes = ({ menuControls }) => {
               ))
           : sandboxes.map((sandbox, index) => (
               <Column key={sandbox.id}>
-                <SandboxCard sandbox={sandbox} menuControls={menuControls} />
+                <motion.div layoutTransition={{ duration: 0.15 }}>
+                  <SandboxCard
+                    type={SandboxTypes.ALL_SANDBOX}
+                    sandbox={sandbox}
+                    menuControls={menuControls}
+                  />
+                </motion.div>
               </Column>
             ))}
       </Grid>
diff --git a/packages/app/src/app/pages/Profile2/PinnedSandboxes.tsx b/packages/app/src/app/pages/Profile2/PinnedSandboxes.tsx
@@ -1,9 +1,11 @@
 import React from 'react';
 import { useOvermind } from 'app/overmind';
 import { useDrop } from 'react-dnd';
+import { motion } from 'framer-motion';
 import { Grid, Column, Stack, Text } from '@codesandbox/components';
 import css from '@styled-system/css';
 import { SandboxCard } from './SandboxCard';
+import { SandboxTypes } from './constants';
 
 export const PinnedSandboxes = ({ menuControls }) => {
   const {
@@ -16,7 +18,7 @@ export const PinnedSandboxes = ({ menuControls }) => {
   const myProfile = loggedInUser?.username === user.username;
 
   const [{ isOver }, drop] = useDrop({
-    accept: 'sandbox',
+    accept: [SandboxTypes.ALL_SANDBOX, SandboxTypes.PINNED_SANDBOX],
     drop: () => ({ name: 'PINNED_SANDBOXES' }),
     collect: monitor => ({
       isOver: monitor.isOver(),
@@ -31,9 +33,16 @@ export const PinnedSandboxes = ({ menuControls }) => {
         gridTemplateColumns: 'repeat(auto-fit, minmax(300px, 1fr))',
       }}
     >
-      {user.featuredSandboxes.map(sandbox => (
+      {user.featuredSandboxes.map((sandbox, index) => (
         <Column key={sandbox.id}>
-          <SandboxCard sandbox={sandbox} menuControls={menuControls} />
+          <motion.div layoutTransition={{ duration: 0.15 }}>
+            <SandboxCard
+              type={SandboxTypes.PINNED_SANDBOX}
+              sandbox={sandbox}
+              index={index}
+              menuControls={menuControls}
+            />
+          </motion.div>
         </Column>
       ))}
       {myProfile && (
diff --git a/packages/app/src/app/pages/Profile2/SandboxCard.tsx b/packages/app/src/app/pages/Profile2/SandboxCard.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { useDrag } from 'react-dnd';
+import { useDrag, useDrop } from 'react-dnd';
 import { useOvermind } from 'app/overmind';
 import {
   Stack,
@@ -11,43 +11,156 @@ import {
 } from '@codesandbox/components';
 import css from '@styled-system/css';
 import { sandboxUrl } from '@codesandbox/common/lib/utils/url-generator';
+import { SandboxTypes } from './constants';
+
+type DragItem = { type: 'sandbox'; sandboxId: string; index: number | null };
 
 export const SandboxCard = ({
+  type = SandboxTypes.DEFAULT_SANDBOX,
   sandbox,
   menuControls: { onKeyDown, onContextMenu },
+  index = null,
 }) => {
   const {
     state: {
       user: loggedInUser,
-      profile: { current: user },
+      profile: {
+        current: { username, featuredSandboxes },
+      },
     },
     actions: {
-      profile: { addFeaturedSandboxes },
+      profile: {
+        addFeaturedSandboxesInState,
+        addFeaturedSandboxes,
+        reorderFeaturedSandboxesInState,
+        saveFeaturedSandboxesOrder,
+        removeFeaturedSandboxesInState,
+      },
     },
   } = useOvermind();
 
-  const [, drag] = useDrag({
-    item: { id: sandbox.id, type: 'sandbox' },
-    end: (item: { id: string }, monitor) => {
+  const ref = React.useRef(null);
+  let previousPosition: number;
+
+  const [{ isDragging }, drag] = useDrag({
+    item: { type, sandboxId: sandbox.id, index },
+    collect: monitor => {
+      const dragItem = monitor.getItem();
+      return {
+        isDragging: dragItem?.sandboxId === sandbox.id,
+      };
+    },
+
+    begin: () => {
+      if (type === SandboxTypes.PINNED_SANDBOX) {
+        previousPosition = index;
+      }
+    },
+    end: (item: DragItem, monitor) => {
       const dropResult = monitor.getDropResult();
+
+      if (!dropResult) {
+        // This is the cancel event
+        if (item.type === SandboxTypes.PINNED_SANDBOX) {
+          // Rollback any reordering
+          reorderFeaturedSandboxesInState({
+            startPosition: index,
+            endPosition: previousPosition,
+          });
+        } else {
+          // remove newly added from featured in state
+          removeFeaturedSandboxesInState({ sandboxId: item.sandboxId });
+        }
+
+        return;
+      }
+
       if (dropResult.name === 'PINNED_SANDBOXES') {
-        const { id } = item;
-        addFeaturedSandboxes({ sandboxId: id });
+        if (featuredSandboxes.find(s => s.id === item.sandboxId)) {
+          saveFeaturedSandboxesOrder();
+        } else {
+          addFeaturedSandboxes({ sandboxId: item.sandboxId });
+        }
+      }
+    },
+  });
+
+  const [, drop] = useDrop({
+    accept: [SandboxTypes.ALL_SANDBOX, SandboxTypes.PINNED_SANDBOX],
+    hover: (item: DragItem, monitor) => {
+      if (!ref.current) return;
+
+      const hoverIndex = index;
+      let dragIndex = -1; // not in list
+
+      if (item.type === SandboxTypes.PINNED_SANDBOX) {
+        dragIndex = item.index;
+      }
+
+      if (item.type === SandboxTypes.ALL_SANDBOX) {
+        // When an item from ALL_SANDOXES is hoverered over
+        // an item in pinned sandboxes, we insert the sandbox
+        // into featuredSandboxes in state.
+        if (
+          hoverIndex &&
+          !featuredSandboxes.find(s => s.id === item.sandboxId)
+        ) {
+          addFeaturedSandboxesInState({ sandboxId: item.sandboxId });
+        }
+        dragIndex = featuredSandboxes.findIndex(s => s.id === item.sandboxId);
       }
+
+      // If the item doesn't exist in featured sandboxes yet, return
+      if (dragIndex === -1) return;
+
+      // Don't replace items with themselves
+      if (dragIndex === hoverIndex) return;
+
+      // Determine rectangle for hoverered item
+      const hoverBoundingRect = ref.current?.getBoundingClientRect();
+
+      // Get offsets for dragged item
+      const dragOffset = monitor.getClientOffset();
+      const hoverClientX = dragOffset.x - hoverBoundingRect.left;
+
+      const hoverMiddleX =
+        (hoverBoundingRect.right - hoverBoundingRect.left) / 2;
+
+      // Only perform the move when the mouse has crossed half of the items width
+
+      // Dragging forward
+      if (dragIndex < hoverIndex && hoverClientX < hoverMiddleX) return;
+
+      // Dragging backward
+      if (dragIndex > hoverIndex && hoverClientX > hoverMiddleX) return;
+
+      reorderFeaturedSandboxesInState({
+        startPosition: dragIndex,
+        endPosition: hoverIndex,
+      });
+      // We're mutating the monitor item here to avoid expensive index searches!
+      item.index = hoverIndex;
     },
+    drop: () => ({ name: 'PINNED_SANDBOXES' }),
   });
 
-  const myProfile = loggedInUser?.username === user.username;
+  const myProfile = loggedInUser?.username === username;
+
+  if (myProfile) {
+    if (type === SandboxTypes.ALL_SANDBOX) drag(ref);
+    else if (type === SandboxTypes.PINNED_SANDBOX) drag(drop(ref));
+  }
 
   return (
-    <div ref={myProfile ? drag : null}>
+    <div ref={ref}>
       <Stack
         as={Link}
         href={sandboxUrl({ id: sandbox.id })}
         direction="vertical"
         gap={4}
         onContextMenu={event => onContextMenu(event, sandbox.id)}
         onKeyDown={event => onKeyDown(event, sandbox.id)}
+        style={{ opacity: isDragging ? 0.2 : 1 }}
         css={css({
           backgroundColor: 'grays.700',
           border: '1px solid',
@@ -82,8 +195,10 @@ export const SandboxCard = ({
           }}
         />
         <Stack justify="space-between">
-          <Stack direction="vertical" gap={2} marginX={4} marginBottom={4}>
-            <Text>{sandbox.title || sandbox.alias || sandbox.id}</Text>
+          <Stack direction="vertical" marginX={4} marginBottom={4}>
+            <Text css={css({ height: 7 })}>
+              {sandbox.title || sandbox.alias || sandbox.id}
+            </Text>
             <Stats sandbox={sandbox} />
           </Stack>
           <IconButton
diff --git a/packages/app/src/app/pages/Profile2/constants.ts b/packages/app/src/app/pages/Profile2/constants.ts
@@ -1 +1,7 @@
 export const SANDBOXES_PER_PAGE = 15;
+
+export const SandboxTypes = {
+  ALL_SANDBOX: 'ALL_SANDBOX',
+  PINNED_SANDBOX: 'PINNED_SANDBOX',
+  DEFAULT_SANDBOX: 'DEFAULT_SANDBOX',
+};
diff --git a/packages/app/src/app/pages/Profile2/index.tsx b/packages/app/src/app/pages/Profile2/index.tsx
@@ -10,6 +10,8 @@
  * - Sandbox picker
  * - Order sandboxes
  * - Likes tab
+ * - Drag item for non-draggy pages
+ * - Drag items from all
  */
 
 import React from 'react';
