From b80a0c62ebd4893698272ffc4df8b2714c61ed03 Mon Sep 17 00:00:00 2001
From: Brian Krabach <brkrabac@microsoft.com>
Date: Mon, 4 Nov 2024 17:16:49 -0800
Subject: [PATCH] makes new UX the default UX, share redemptions updated to
 point to new path, old dashboard avail through menu (#208)

---
 workbench-app/src/Constants.ts                |  2 +-
 .../src/components/App/ExperimentalNotice.tsx | 32 ++++++++++--
 .../src/components/FrontDoor/Chat/Chat.tsx    | 10 +++-
 .../Controls/ConversationListOptions.tsx      | 42 ++++++++++------
 .../FrontDoor/Controls/SiteMenuButton.tsx     |  2 +-
 .../src/components/FrontDoor/MainContent.tsx  |  2 +
 .../src/libs/useConversationUtility.ts        |  8 ++-
 workbench-app/src/main.tsx                    |  8 ++-
 .../src/redux/features/app/AppState.ts        |  1 +
 .../src/redux/features/app/appSlice.ts        |  8 +++
 workbench-app/src/routes/Dashboard.tsx        | 50 +++++++++----------
 workbench-app/src/routes/ShareRedeem.tsx      | 15 ++++--
 12 files changed, 121 insertions(+), 59 deletions(-)

diff --git a/workbench-app/src/Constants.ts b/workbench-app/src/Constants.ts
index fafacae7..f3f2d8ad 100644
--- a/workbench-app/src/Constants.ts
+++ b/workbench-app/src/Constants.ts
@@ -1,7 +1,7 @@
 export const Constants = {
     app: {
         name: 'Semantic Workbench',
-        conversationRedirectPath: '/frontdoor',
+        conversationRedirectPath: '',
         defaultTheme: 'light',
         defaultBrand: 'local',
         autoScrollThreshold: 100,
diff --git a/workbench-app/src/components/App/ExperimentalNotice.tsx b/workbench-app/src/components/App/ExperimentalNotice.tsx
index 4d5481a3..0502effc 100644
--- a/workbench-app/src/components/App/ExperimentalNotice.tsx
+++ b/workbench-app/src/components/App/ExperimentalNotice.tsx
@@ -9,15 +9,17 @@ import {
     Image,
     Link,
     MessageBar,
+    MessageBarActions,
     MessageBarBody,
     MessageBarTitle,
     makeStyles,
     shorthands,
     tokens,
 } from '@fluentui/react-components';
+import { DismissRegular } from '@fluentui/react-icons';
 import React from 'react';
 import { useAppDispatch, useAppSelector } from '../../redux/app/hooks';
-import { setCompletedFirstRun } from '../../redux/features/app/appSlice';
+import { setCompletedFirstRun, setHideExperimentalNotice } from '../../redux/features/app/appSlice';
 
 const useClasses = makeStyles({
     surface: {
@@ -57,9 +59,16 @@ const useClasses = makeStyles({
     },
 });
 
-export const ExperimentalNotice: React.FC = () => {
+interface ExperimentalNoticeProps {
+    className?: string;
+    containerAction?: React.ReactElement;
+    actions?: React.ReactElement | React.ReactElement[];
+}
+
+export const ExperimentalNotice: React.FC<ExperimentalNoticeProps> = (props) => {
+    const { className, containerAction, actions } = props;
     const classes = useClasses();
-    const completedFirstRun = useAppSelector((state) => state.app.completedFirstRun);
+    const { completedFirstRun, hideExperimentalNotice } = useAppSelector((state) => state.app);
     const dispatch = useAppDispatch();
     const [showDialog, setShowDialog] = React.useState(!completedFirstRun?.experimental);
     const [currentIndex, setCurrentIndex] = React.useState(0);
@@ -137,6 +146,18 @@ export const ExperimentalNotice: React.FC = () => {
         },
     ];
 
+    const defaultContainerAction = (
+        <Button
+            appearance="transparent"
+            onClick={() => dispatch(setHideExperimentalNotice(true))}
+            icon={<DismissRegular />}
+        />
+    );
+
+    if (hideExperimentalNotice) {
+        return null;
+    }
+
     return (
         <Dialog
             open={showDialog}
@@ -150,12 +171,15 @@ export const ExperimentalNotice: React.FC = () => {
             }}
         >
             <DialogTrigger>
-                <MessageBar intent="warning" layout="multiline">
+                <MessageBar className={className} intent="warning" layout="multiline">
                     <MessageBarBody>
                         <MessageBarTitle>Experimental App Reminder:</MessageBarTitle>
                         features <em>will</em> break, data <em>will</em> be lost, data <em>is not</em> secure. &nbsp;
                         <Link>[details]</Link>
                     </MessageBarBody>
+                    <MessageBarActions containerAction={containerAction ?? defaultContainerAction}>
+                        {actions}
+                    </MessageBarActions>
                 </MessageBar>
             </DialogTrigger>
             <DialogSurface className={classes.surface}>
diff --git a/workbench-app/src/components/FrontDoor/Chat/Chat.tsx b/workbench-app/src/components/FrontDoor/Chat/Chat.tsx
index 0a7cf75f..936a1567 100644
--- a/workbench-app/src/components/FrontDoor/Chat/Chat.tsx
+++ b/workbench-app/src/components/FrontDoor/Chat/Chat.tsx
@@ -12,6 +12,7 @@ import {
     useGetConversationParticipantsQuery,
     useGetConversationQuery,
 } from '../../../services/workbench';
+import { ExperimentalNotice } from '../../App/ExperimentalNotice';
 import { Loading } from '../../App/Loading';
 import { ConversationShare } from '../../Conversations/ConversationShare';
 import { InteractHistory } from '../../Conversations/InteractHistory';
@@ -59,12 +60,16 @@ const useClasses = makeStyles({
             flex: '0 0 auto',
         },
 
+        '&.center': {
+            overflow: 'visible',
+        },
+
         '&.after': {
             right: 0,
             flex: '0 0 auto',
         },
     },
-    errorList: {
+    centerContent: {
         position: 'absolute',
         top: 0,
         left: tokens.spacingHorizontalM,
@@ -231,6 +236,9 @@ export const Chat: React.FC<ChatProps> = (props) => {
         <div className={classes.root}>
             <div className={classes.header}>
                 <div className={mergeClasses(classes.headerControls, 'before')}>{headerBefore}</div>
+                <div className={mergeClasses(classes.headerControls, 'center')}>
+                    <ExperimentalNotice className={classes.centerContent} />
+                </div>
                 <div className={mergeClasses(classes.headerControls, 'after')}>
                     {otherParticipants.length === 1 && (
                         <ParticipantAvatarGroup participants={otherParticipants} layout="spread" />
diff --git a/workbench-app/src/components/FrontDoor/Controls/ConversationListOptions.tsx b/workbench-app/src/components/FrontDoor/Controls/ConversationListOptions.tsx
index d1256d50..9848bbca 100644
--- a/workbench-app/src/components/FrontDoor/Controls/ConversationListOptions.tsx
+++ b/workbench-app/src/components/FrontDoor/Controls/ConversationListOptions.tsx
@@ -26,6 +26,8 @@ import {
     CheckboxUncheckedRegular,
     DismissRegular,
     FilterRegular,
+    MailReadRegular,
+    MailUnreadRegular,
     PinOffRegular,
     PinRegular,
     PlugDisconnectedRegular,
@@ -71,6 +73,10 @@ const useClasses = makeStyles({
         flexDirection: 'row',
         alignItems: 'center',
     },
+    bulkActionsLabel: {
+        marginLeft: tokens.spacingHorizontalM,
+        color: tokens.colorNeutralForeground2,
+    },
     toolbarTextButton: {
         minWidth: 'auto',
         paddingLeft: tokens.spacingHorizontalXS,
@@ -428,22 +434,23 @@ export const ConversationListOptions: React.FC<ConversationListOptionsProps> = (
         () => (
             <Overflow padding={90}>
                 <Toolbar size="small">
-                    <Button
-                        className={classes.toolbarTextButton}
-                        appearance="transparent"
-                        disabled={!enableBulkActions.read}
-                        onClick={handleMarkAllAsReadForSelected}
-                    >
-                        Read
-                    </Button>
-                    <Button
-                        className={classes.toolbarTextButton}
-                        appearance="transparent"
-                        disabled={!enableBulkActions.unread}
-                        onClick={handleMarkAsUnreadForSelected}
-                    >
-                        Unread
-                    </Button>
+                    <Tooltip content="Mark selected conversations as read" relationship="label">
+                        <Button
+                            className={classes.toolbarTextButton}
+                            appearance="transparent"
+                            icon={<MailReadRegular />}
+                            disabled={!enableBulkActions.read}
+                            onClick={handleMarkAllAsReadForSelected}
+                        />
+                    </Tooltip>
+                    <Tooltip content="Mark selected conversations as unread" relationship="label">
+                        <Button
+                            appearance="transparent"
+                            icon={<MailUnreadRegular />}
+                            disabled={!enableBulkActions.unread}
+                            onClick={handleMarkAsUnreadForSelected}
+                        />
+                    </Tooltip>
                     <Tooltip content="Remove selected conversations" relationship="label">
                         <Button
                             // hide this until implemented
@@ -538,6 +545,9 @@ export const ConversationListOptions: React.FC<ConversationListOptionsProps> = (
             </div>
             <div className={classes.bulkActions}>
                 {bulkSelectForActionsButton}
+                <Label className={classes.bulkActionsLabel} size="small">
+                    Actions
+                </Label>
                 {bulkSelectForActionsToolbar}
             </div>
         </div>
diff --git a/workbench-app/src/components/FrontDoor/Controls/SiteMenuButton.tsx b/workbench-app/src/components/FrontDoor/Controls/SiteMenuButton.tsx
index 49dbf0c2..5d43527f 100644
--- a/workbench-app/src/components/FrontDoor/Controls/SiteMenuButton.tsx
+++ b/workbench-app/src/components/FrontDoor/Controls/SiteMenuButton.tsx
@@ -95,7 +95,7 @@ export const SiteMenuButton: React.FC = () => {
                     <MenuItem
                         icon={<NavigationRegular />}
                         onClick={() => {
-                            navigate('/');
+                            navigate('/dashboard');
                         }}
                     >
                         Dashboard
diff --git a/workbench-app/src/components/FrontDoor/MainContent.tsx b/workbench-app/src/components/FrontDoor/MainContent.tsx
index 8556af17..136d8b7e 100644
--- a/workbench-app/src/components/FrontDoor/MainContent.tsx
+++ b/workbench-app/src/components/FrontDoor/MainContent.tsx
@@ -5,6 +5,7 @@ import React from 'react';
 import { useConversationUtility } from '../../libs/useConversationUtility';
 import { useCreateConversation } from '../../libs/useCreateConversation';
 import { useAppSelector } from '../../redux/app/hooks';
+import { ExperimentalNotice } from '../App/ExperimentalNotice';
 import { ConversationsImport } from '../Conversations/ConversationsImport';
 import { Chat } from './Chat/Chat';
 import { NewConversationForm } from './Controls/NewConversationForm';
@@ -112,6 +113,7 @@ export const MainContent: React.FC<MainContentProps> = (props) => {
                 <>
                     <div className={classes.header}>
                         {headerBefore}
+                        <ExperimentalNotice />
                         {headerAfter}
                     </div>
                     <div className={classes.body}>
diff --git a/workbench-app/src/libs/useConversationUtility.ts b/workbench-app/src/libs/useConversationUtility.ts
index d56a69e4..98c8a358 100644
--- a/workbench-app/src/libs/useConversationUtility.ts
+++ b/workbench-app/src/libs/useConversationUtility.ts
@@ -33,8 +33,12 @@ export const useConversationUtility = () => {
     // region Navigation
 
     const navigateToConversation = React.useCallback(
-        (conversationId?: string) => {
-            navigate([Constants.app.conversationRedirectPath, conversationId].join('/'));
+        (conversationId?: string, hash?: string) => {
+            let path = conversationId ? [Constants.app.conversationRedirectPath, conversationId].join('/') : '';
+            if (hash) {
+                path += `#${hash}`;
+            }
+            navigate(path);
         },
         [navigate],
     );
diff --git a/workbench-app/src/main.tsx b/workbench-app/src/main.tsx
index 380bc6e3..a997a763 100644
--- a/workbench-app/src/main.tsx
+++ b/workbench-app/src/main.tsx
@@ -67,12 +67,16 @@ const authenticatedRouter = createBrowserRouter([
         children: [
             {
                 index: true,
-                element: <Dashboard />,
+                element: <FrontDoor />,
             },
             {
-                path: '/frontdoor/:conversationId?',
+                path: '/:conversationId?',
                 element: <FrontDoor />,
             },
+            {
+                path: '/dashboard',
+                element: <Dashboard />,
+            },
             {
                 path: '/settings',
                 element: <Settings />,
diff --git a/workbench-app/src/redux/features/app/AppState.ts b/workbench-app/src/redux/features/app/AppState.ts
index 0be147a6..7412c609 100644
--- a/workbench-app/src/redux/features/app/AppState.ts
+++ b/workbench-app/src/redux/features/app/AppState.ts
@@ -12,6 +12,7 @@ export interface AppState {
         experimental: boolean;
         workflow: boolean;
     };
+    hideExperimentalNotice: boolean;
     chatWidthPercent: number;
     isDraggingOverBody?: boolean;
     activeConversationId?: string;
diff --git a/workbench-app/src/redux/features/app/appSlice.ts b/workbench-app/src/redux/features/app/appSlice.ts
index 66bf6c5a..2e3251ad 100644
--- a/workbench-app/src/redux/features/app/appSlice.ts
+++ b/workbench-app/src/redux/features/app/appSlice.ts
@@ -13,6 +13,7 @@ const localStorageKey = {
     completedFirstRunApp: 'completedFirstRun:app',
     completedFirstRunExperimental: 'completedFirstRun:experimental',
     completedFirstRunWorkflow: 'completedFirstRun:workflow',
+    hideExperimentalNotice: 'hideExperimentalNotice',
 };
 
 const initialState: AppState = {
@@ -27,6 +28,8 @@ const initialState: AppState = {
             AppStorage.getInstance().loadObject<boolean>(localStorageKey.completedFirstRunExperimental) ?? false,
         workflow: AppStorage.getInstance().loadObject<boolean>(localStorageKey.completedFirstRunWorkflow) ?? false,
     },
+    hideExperimentalNotice:
+        AppStorage.getInstance().loadObject<boolean>(localStorageKey.hideExperimentalNotice) ?? false,
 };
 
 export const appSlice = createSlice({
@@ -87,6 +90,10 @@ export const appSlice = createSlice({
                 state.completedFirstRun.workflow = action.payload.workflow;
             }
         },
+        setHideExperimentalNotice: (state: AppState, action: PayloadAction<boolean>) => {
+            AppStorage.getInstance().saveObject(localStorageKey.hideExperimentalNotice, action.payload);
+            state.hideExperimentalNotice = action.payload;
+        },
         setActiveConversationId: (state: AppState, action: PayloadAction<string | undefined>) => {
             if (action.payload === state.activeConversationId) {
                 return;
@@ -109,6 +116,7 @@ export const {
     clearErrors,
     setChatWidthPercent,
     setCompletedFirstRun,
+    setHideExperimentalNotice,
     setActiveConversationId,
 } = appSlice.actions;
 
diff --git a/workbench-app/src/routes/Dashboard.tsx b/workbench-app/src/routes/Dashboard.tsx
index d5a93212..dec6207b 100644
--- a/workbench-app/src/routes/Dashboard.tsx
+++ b/workbench-app/src/routes/Dashboard.tsx
@@ -1,16 +1,14 @@
 // Copyright (c) Microsoft. All rights reserved.
 
-import { makeStyles, MessageBar, MessageBarBody, MessageBarTitle, tokens } from '@fluentui/react-components';
+import { makeStyles, tokens } from '@fluentui/react-components';
 import React from 'react';
-import { Link, useNavigate } from 'react-router-dom';
-import { AppMenu } from '../components/App/AppMenu';
+import { useNavigate } from 'react-router-dom';
 import { AppView } from '../components/App/AppView';
 import { ExperimentalNotice } from '../components/App/ExperimentalNotice';
 import { Loading } from '../components/App/Loading';
 import { MyAssistants } from '../components/Assistants/MyAssistants';
 import { MyConversations } from '../components/Conversations/MyConversations';
 import { MyWorkflows } from '../components/Workflows/MyWorkflows';
-import { Constants } from '../Constants';
 import { useSiteUtility } from '../libs/useSiteUtility';
 import { Conversation } from '../models/Conversation';
 import { useAppSelector } from '../redux/app/hooks';
@@ -21,13 +19,18 @@ const useClasses = makeStyles({
     root: {
         display: 'flex',
         flexDirection: 'column',
-        gap: tokens.spacingVerticalXXXL,
+        gap: tokens.spacingVerticalM,
     },
     messageBars: {
         display: 'flex',
         flexDirection: 'column',
         gap: tokens.spacingVerticalS,
     },
+    body: {
+        display: 'flex',
+        flexDirection: 'column',
+        gap: tokens.spacingVerticalXXXL,
+    },
 });
 
 export const Dashboard: React.FC = () => {
@@ -71,11 +74,9 @@ export const Dashboard: React.FC = () => {
         [navigate],
     );
 
-    const appMenuAction = <AppMenu />;
-
     if (isLoadingAssistants || isLoadingConversations || isLoadingWorkflowDefinitions) {
         return (
-            <AppView title="Dashboard" actions={{ items: [appMenuAction], replaceExisting: true }}>
+            <AppView title="Dashboard">
                 <Loading />
             </AppView>
         );
@@ -86,33 +87,28 @@ export const Dashboard: React.FC = () => {
         conversations?.filter((conversation) => conversation.ownerId !== localUserStateId) || [];
 
     return (
-        <AppView title="Dashboard" actions={{ items: [appMenuAction], replaceExisting: true }}>
+        <AppView title="Dashboard">
             <div className={classes.root}>
                 <div className={classes.messageBars}>
                     <ExperimentalNotice />
-                    <MessageBar intent="info" layout="multiline">
-                        <MessageBarBody>
-                            <MessageBarTitle>New Feature</MessageBarTitle>
-                            Try out the new conversation-first UX. &nbsp;
-                            <Link to={Constants.app.conversationRedirectPath}>[view]</Link>
-                        </MessageBarBody>
-                    </MessageBar>
                 </div>
-                <MyAssistants assistants={assistants} />
-                <MyConversations
-                    conversations={myConversations}
-                    participantId="me"
-                    onCreate={handleConversationCreate}
-                />
-                {conversationsSharedWithMe.length > 0 && (
+                <div className={classes.body}>
+                    <MyAssistants assistants={assistants} />
                     <MyConversations
-                        title="Conversations Shared with Me"
-                        conversations={conversationsSharedWithMe}
+                        conversations={myConversations}
                         participantId="me"
                         onCreate={handleConversationCreate}
                     />
-                )}
-                <MyWorkflows workflowDefinitions={workflowDefinitions} />
+                    {conversationsSharedWithMe.length > 0 && (
+                        <MyConversations
+                            title="Conversations Shared with Me"
+                            conversations={conversationsSharedWithMe}
+                            participantId="me"
+                            onCreate={handleConversationCreate}
+                        />
+                    )}
+                    <MyWorkflows workflowDefinitions={workflowDefinitions} />
+                </div>
             </div>
         </AppView>
     );
diff --git a/workbench-app/src/routes/ShareRedeem.tsx b/workbench-app/src/routes/ShareRedeem.tsx
index e679c72b..ddd47ab1 100644
--- a/workbench-app/src/routes/ShareRedeem.tsx
+++ b/workbench-app/src/routes/ShareRedeem.tsx
@@ -6,6 +6,7 @@ import { useNavigate, useParams } from 'react-router-dom';
 import { AppView } from '../components/App/AppView';
 import { DialogControl } from '../components/App/DialogControl';
 import { Loading } from '../components/App/Loading';
+import { Constants } from '../Constants';
 import { ConversationShareType, useConversationUtility } from '../libs/useConversationUtility';
 import { useSiteUtility } from '../libs/useSiteUtility';
 import { useWorkbenchService } from '../libs/useWorkbenchService';
@@ -69,12 +70,12 @@ export const ShareRedeem: React.FC = () => {
                     });
                 }
 
-                navigate(`/conversation/${conversationShare.conversationId}${hash}`, { replace: true });
+                conversationUtility.navigateToConversation(conversationShare.conversationId, hash);
             } finally {
                 setSubmitted(false);
             }
         },
-        [conversationShare, redeemShare, navigate, createConversationMessage, localUserName],
+        [conversationShare, redeemShare, conversationUtility, createConversationMessage, localUserName],
     );
 
     const handleClickDuplicate = React.useCallback(async () => {
@@ -101,11 +102,11 @@ export const ShareRedeem: React.FC = () => {
 
             // navigate to the newly duplicated conversation
             const conversationId = duplicatedConversationIds[0];
-            navigate(`/conversation/${conversationId}`, { replace: true });
+            conversationUtility.navigateToConversation(conversationId);
         } finally {
             setSubmitted(false);
         }
-    }, [redeemShare, conversationShare, navigate, workbenchService, removeConversationParticipant, setSubmitted]);
+    }, [conversationShare, redeemShare, workbenchService, conversationUtility, removeConversationParticipant]);
 
     const handleDismiss = React.useCallback(() => {
         navigate(`/`);
@@ -233,7 +234,11 @@ export const ShareRedeem: React.FC = () => {
             <ul>
                 {existingDuplicateConversations.map((conversation) => (
                     <li key={conversation.id}>
-                        <a href={`${window.location.origin}/conversation/${conversation.id}`}>{conversation.title}</a>
+                        <a
+                            href={`${window.location.origin}/${Constants.app.conversationRedirectPath}/${conversation.id}`}
+                        >
+                            {conversation.title}
+                        </a>
                     </li>
                 ))}
             </ul>