ops: merge staging back into develop

.github/helpers/deploy.sh

@@ -12,6 +12,7 @@ ref=${6:-"develop"}
 [ "$desk" == "talk" ] && from="talk" || from="desk"
 folder=$ship/$desk
 
+echo "Deploying $desk from $ref of $repo to $ship in $zone of $project"
 set -e
 set -o pipefail
 cmdfile=$(mktemp "${TMPDIR:-/tmp/}janeway.XXXXXXXXX")

.github/workflows/deploy-canary.yml

@@ -10,12 +10,68 @@ on:
   push:
     branches:
       - 'staging'
+env:
+  tag: ${{ github.event.inputs.tag || 'staging' }}
 jobs:
+  build-frontend:
+    runs-on: ubuntu-latest
+    name: 'Build Frontend'
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ env.tag }}
+      - uses: actions/setup-node@v3
+        with:
+          node-version-file: ./ui/.nvmrc
+      - working-directory: ./ui
+        run: |
+          npm ci
+          npm run build
+      - uses: actions/upload-artifact@v3
+        with:
+          name: 'ui-dist'
+          path:  ui/dist
+  glob:
+    runs-on: ubuntu-latest
+    name: 'Make a glob'
+    needs: build-frontend
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ env.tag }}
+      - uses: actions/download-artifact@v3
+        with:
+          name: 'ui-dist'
+          path: ui/dist
+      - id: 'auth'
+        uses: 'google-github-actions/auth@v1'
+        with:
+          credentials_json: '${{ secrets.GCP_SERVICE_KEY }}'
+      - name: 'Set up Cloud SDK'
+        uses: 'google-github-actions/setup-gcloud@v1'
+      - name: 'glob'
+        uses: ./.github/actions/glob
+        with:
+          folder: 'ui/dist/*'
+          docket: 'desk/desk.docket-0'
+      - name: Commit and Push Glob
+        run: |
+          git config --global user.name github-actions
+          git config --global user.email [email protected]
+          git add desk/desk.docket-0
+          git commit -n -m "update glob: ${{ steps.glob.outputs.hash }} [skip actions]" || echo "No changes to commit"
+          INPUT=${{ env.tag }}
+          BRANCH=${INPUT:-"staging"}
+          git pull origin $BRANCH --rebase --autostash
+          git push
   deploy:
     runs-on: ubuntu-latest
     name: "Release to ~binnec-dozzod-marnus (canary)"
+    needs: glob
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: ${{ env.tag }}
       - id: 'auth'
         uses: 'google-github-actions/auth@v1'
         with:
@@ -25,7 +81,7 @@ jobs:
       - id: deploy
         name: Deploy
         run:
-          ./.github/helpers/deploy.sh tloncorp/landscape-apps groups binnec-dozzod-marnus us-central1-a mainnet-tlon-other-2d ${{ github.event.inputs.tag }}
+          ./.github/helpers/deploy.sh tloncorp/landscape-apps groups binnec-dozzod-marnus us-central1-a mainnet-tlon-other-2d ${{ env.tag }}
         env:
           SSH_SEC_KEY: ${{ secrets.GCP_SSH_SEC_KEY }}
           SSH_PUB_KEY: ${{ secrets.GCP_SSH_PUB_KEY }}

.github/workflows/deploy.yml

@@ -10,14 +10,16 @@ on:
   push:
     branches:
       - 'develop'
+env: 
+  tag: ${{ github.event.inputs.tag || 'develop' }}
 jobs:
   build-frontend:
     runs-on: ubuntu-latest
     name: 'Build Frontend'
     steps:
       - uses: actions/checkout@v3
         with:
-          ref: ${{ github.event.inputs.tag }}
+          ref: ${{ env.tag }}
       - uses: actions/setup-node@v3
         with:
           node-version-file: ./ui/.nvmrc
@@ -36,7 +38,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          ref: ${{ github.event.inputs.tag }}
+          ref: ${{ env.tag }}
       - uses: actions/download-artifact@v3
         with:
           name: 'ui-dist'
@@ -58,7 +60,7 @@ jobs:
           git config --global user.email [email protected]
           git add desk/desk.docket-0
           git commit -n -m "update glob: ${{ steps.glob.outputs.hash }} [skip actions]" || echo "No changes to commit"
-          INPUT=${{ github.event.inputs.tag }}
+          INPUT=${{ env.tag }}
           BRANCH=${INPUT:-"develop"}
           git pull origin $BRANCH --rebase --autostash
           git push
@@ -69,7 +71,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          ref: ${{ github.event.inputs.tag }}
+          ref: ${{ env.tag }}
       - id: 'auth'
         uses: 'google-github-actions/auth@v1'
         with:
@@ -79,7 +81,7 @@ jobs:
       - id: deploy
         name: Deploy
         run:
-          ./.github/helpers/deploy.sh tloncorp/landscape-apps groups wannec-dozzod-marnus us-central1-a mainnet-tlon-other-2d ${{ github.event.inputs.tag }}
+          ./.github/helpers/deploy.sh tloncorp/landscape-apps groups wannec-dozzod-marnus us-central1-a mainnet-tlon-other-2d ${{ env.tag }}
         env:
           SSH_SEC_KEY: ${{ secrets.GCP_SSH_SEC_KEY }}
           SSH_PUB_KEY: ${{ secrets.GCP_SSH_PUB_KEY }}

ui/src/components/Leap/useLeap.tsx

@@ -13,7 +13,6 @@ import {
   LEAP_RESULT_TRUNCATE_SIZE,
 } from '@/constants';
 import { emptyContact, useContacts } from '@/state/contact';
-import { useModalNavigate } from '@/logic/routing';
 import { useCheckDmUnread, useDms, useMultiDms } from '@/state/chat';
 import useIsGroupUnread from '@/logic/useIsGroupUnread';
 import { useCheckChannelUnread } from '@/logic/channel';
@@ -30,6 +29,7 @@ import ShapesIcon from '../icons/ShapesIcon';
 import NotebookIcon from '../icons/NotebookIcon';
 import PeopleIcon from '../icons/PeopleIcon';
 import GridIcon from '../icons/GridIcon';
+import useActiveTab from '../Sidebar/util';
 
 interface LeapContext {
   isOpen: boolean;
@@ -88,7 +88,6 @@ export default function useLeap() {
     setSelectedIndex,
   } = React.useContext(LeapContext);
   const navigate = useNavigate();
-  const modalNavigate = useModalNavigate();
   const groups = useGroups();
   const currentGroupFlag = useGroupFlag();
   const { isGroupUnread } = useIsGroupUnread();
@@ -103,6 +102,7 @@ export default function useLeap() {
   const charges = useCharges();
   const location = useLocation();
   const mutuals = useMutuals();
+  const tab = useActiveTab();
   const preSiggedMutuals = useMemo(
     () => Object.keys(mutuals).map((m) => preSig(m)),
     [mutuals]
@@ -231,7 +231,7 @@ export default function useLeap() {
             0,
             LEAP_DESCRIPTION_TRUNCATE_LENGTH
           ),
-          to: `/profile/${patp}`,
+          to: `/dm/${patp}`,
           resultIndex: idx,
         };
       }),
@@ -336,9 +336,11 @@ export default function useLeap() {
         section: 'Channels',
       },
       ...filteredChannels.map(({ groupFlag, group, channel, nest }, idx) => {
-        const [chType, chFlag] = nestToFlag(nest);
+        const [chType, _chFlag] = nestToFlag(nest);
+        const loc = `/groups/${groupFlag}/channels/${nest}`;
+        const nav = tab === 'messages' ? `/dm${loc}` : loc;
         const onSelect = () => {
-          navigate(`/groups/${groupFlag}/channels/${nest}`);
+          navigate(nav);
           setSelectedIndex(0);
           setInputValue('');
           setIsOpen(false);
@@ -363,7 +365,7 @@ export default function useLeap() {
           input: inputValue,
           title: channel.meta.title,
           subtitle: group.meta.title,
-          to: `/groups/${groupFlag}/channels/chat/${chFlag}`,
+          to: nav,
           resultIndex:
             idx +
             (shipResults.length > LEAP_RESULT_TRUNCATE_SIZE
@@ -373,6 +375,7 @@ export default function useLeap() {
       }),
     ];
   }, [
+    tab,
     currentGroupFlag,
     groups,
     inputValue,
@@ -571,9 +574,7 @@ export default function useLeap() {
     const scoreChargeResult = (
       entry: fuzzy.FilterResult<[string, ChargeWithDesk]>
     ): number => {
-      const { score, original } = entry;
-      const [_, charge] = original;
-
+      const { score } = entry;
       const newScore = score;
 
       return newScore;

ui/src/components/Sidebar/AddGroupSidebarItem.tsx

@@ -5,13 +5,14 @@ import { useLocation, useNavigate } from 'react-router-dom';
 import AddIcon16 from '../icons/Add16Icon';
 import HomeIconMobileNav from '../icons/HomeIconMobileNav';
 import SidebarItem from './SidebarItem';
-import useActiveTab from './util';
+import useActiveTab, { useNavToTab } from './util';
 
-export default function AddGroupSidebarItem() {
+export default function GroupSidebarItem() {
   const navigate = useNavigate();
   const location = useLocation();
   const activeTab = useActiveTab();
   const [open, setOpen] = useState(false);
+  const navToTab = useNavToTab();
 
   const onOpenChange = (openChange: boolean) => {
     setOpen(openChange);
@@ -21,6 +22,12 @@ export default function AddGroupSidebarItem() {
     navigate(path, { state: { backgroundLocation: location } });
   };
 
+  const onClick = () => {
+    if (activeTab !== 'groups') {
+      navToTab('groups');
+    }
+  };
+
   return (
     <Dropdown.Root open={open} onOpenChange={onOpenChange}>
       <SidebarItem
@@ -35,8 +42,9 @@ export default function AddGroupSidebarItem() {
             isInactive={activeTab !== 'groups'}
           />
         }
-        to="/groups"
+        onClick={onClick}
         color={activeTab === 'groups' ? 'text-black' : 'text-gray-600'}
+        highlightPath="/groups"
         actions={
           <Dropdown.Trigger data-testid="add-group-sidebar-button-icon">
             <AddIcon16 className="relative top-[2px] hidden h-4 w-4 group-hover:block" />

ui/src/components/Sidebar/GroupList.tsx

@@ -14,14 +14,14 @@ type AnyListItem = TopContentListItem | GroupListItem | SearchListItem;
 
 function itemContent(_i: number, item: AnyListItem) {
   if (item.type === 'top') {
-    return item.component;
+    return <div className="min-h-[1px]">{item.component}</div>;
   }
 
   if (item.type === 'search') {
     const record = item.data;
     if (record.type === 'group') {
       return (
-        <div className="px-4 sm:px-2">
+        <div className="min-h-[1px] px-4 sm:px-2">
           <GroupsSidebarItem
             flag={record.flag}
             isNew={record.status === 'new'}
@@ -31,7 +31,7 @@ function itemContent(_i: number, item: AnyListItem) {
     }
 
     return (
-      <div className="px-4 sm:px-2">
+      <div className="min-h-[1px] px-4 sm:px-2">
         <GangItem
           flag={record.flag}
           invited={record.status === 'invited'}
@@ -43,7 +43,7 @@ function itemContent(_i: number, item: AnyListItem) {
 
   const [flag] = item.data;
   return (
-    <div className="px-4 sm:px-2">
+    <div className="min-h-[1px] px-4 sm:px-2">
       <GroupsSidebarItem key={flag} flag={flag} />
     </div>
   );

ui/src/components/Sidebar/MessagesSidebarItem.tsx

@@ -0,0 +1,59 @@
+import cn from 'classnames';
+import { Link } from 'react-router-dom';
+import useMessagesUnreadCount from '@/logic/useMessagesUnreadCount';
+import MessagesIcon from '../icons/MessagesIcon';
+import SidebarItem from './SidebarItem';
+import useActiveTab, { useNavToTab } from './util';
+import AddIcon16 from '../icons/Add16Icon';
+import ActivityIndicator from './ActivityIndicator';
+
+export default function MessagesSidebarItem() {
+  const activeTab = useActiveTab();
+  const unreadCount = useMessagesUnreadCount();
+  const navToTab = useNavToTab();
+
+  const onClick = () => {
+    if (activeTab !== 'messages') {
+      navToTab('messages');
+    }
+  };
+
+  return (
+    <SidebarItem
+      icon={
+        <MessagesIcon
+          className={cn(
+            'm-1 h-4 w-4',
+            activeTab === 'messages' && 'text-black'
+          )}
+          nonNav
+          isInactive={activeTab !== 'messages'}
+        />
+      }
+      actions={
+        <div className="group">
+          {unreadCount > 0 && (
+            <ActivityIndicator
+              count={unreadCount}
+              className="group-hover:hidden"
+              bg={
+                activeTab === 'messages'
+                  ? 'bg-none text-black'
+                  : 'bg-blue-soft text-blue'
+              }
+            />
+          )}
+          <Link to="/dm/new" className="hidden items-center group-hover:flex">
+            <AddIcon16 className="h-4 w-4" />
+          </Link>
+        </div>
+      }
+      highlightPath="/messages"
+      onClick={onClick}
+      className="group"
+      color={activeTab === 'messages' ? 'text-black' : 'text-gray-600'}
+    >
+      Messages
+    </SidebarItem>
+  );
+}