Skip to content

AC rendering + AC designer integration #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
May 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified packages/cli/templates/typescript/graph/appPackage/color.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/cli/templates/typescript/graph/appPackage/outline.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
90 changes: 54 additions & 36 deletions packages/devtools/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,33 +1,41 @@
import { useEffect, useMemo, useCallback, useRef, useDebugValue, useState } from 'react';
import {
useEffect,
useMemo,
useCallback,
useRef,
useDebugValue,
useState,
} from "react";
import {
Body1,
FluentProvider,
mergeClasses,
teamsDarkTheme,
teamsLightTheme,
Toaster,
} from '@fluentui/react-components';
import { BrowserRouter, Navigate, Route, Routes } from 'react-router';

import ActivitiesScreen from './screens/ActivitiesScreen/ActivitiesScreen';
import ChatScreen from './screens/ChatScreen/ChatScreen';
import Logger from './components/Logger/Logger';
import PageNav from './components/PageNav/PageNav';
import CardsScreen from './screens/CardsScreen';
import CustomScreen from './screens/CustomScreen';
import useTheme from './hooks/useTheme';
import { useActivityStore } from './stores/ActivityStore';
import { useChatStore } from './stores/ChatStore';
import { MetadataContext, useMetadataStore } from './stores/MetadataStore';
import { ActivityEvent } from './types/Event';
import { Page } from './types/Page';
import useAppClasses from './App.styles';
import { SocketClient } from './socket-client';
} from "@fluentui/react-components";
import { BrowserRouter, Navigate, Route, Routes } from "react-router";

import ActivitiesScreen from "./screens/ActivitiesScreen/ActivitiesScreen";
import ChatScreen from "./screens/ChatScreen/ChatScreen";
import Logger from "./components/Logger/Logger";
import PageNav from "./components/PageNav/PageNav";
import CardsScreen from "./screens/CardsScreen";
import CustomScreen from "./screens/CustomScreen";
import useTheme from "./hooks/useTheme";
import { useActivityStore } from "./stores/ActivityStore";
import { useChatStore } from "./stores/ChatStore";
import { MetadataContext, useMetadataStore } from "./stores/MetadataStore";
import { ActivityEvent } from "./types/Event";
import { Page } from "./types/Page";
import useAppClasses from "./App.styles";
import { SocketClient } from "./socket-client";

const socket = new SocketClient();

// Memoized selectors
const selectMetadataPages = (state: any) => state.metadata?.pages as Page[] | undefined;
const selectMetadataPages = (state: any) =>
state.metadata?.pages as Page[] | undefined;
const selectPutActivity = (state: any) => state.put;
const selectOnActivity = (state: any) => state.onActivity;
const selectSetMetadata = (state: any) => state.set;
Expand All @@ -40,19 +48,22 @@ export default function App() {

// Use specific selectors with debug values
const metadataPages = useMetadataStore(selectMetadataPages);
useDebugValue(metadataPages?.length ?? 0, (count) => `${count} metadata pages`);
useDebugValue(
metadataPages?.length ?? 0,
(count) => `${count} metadata pages`,
);

const putActivity = useActivityStore(selectPutActivity);
const onActivity = useChatStore(selectOnActivity);
const setMetadata = useMetadataStore(selectSetMetadata);

const handleConnect = useCallback(() => {
Logger.info('Connected to server...');
Logger.info("Connected to server...");
setConnected(true);
}, []);

const handleDisconnect = useCallback(() => {
Logger.info('Disconnected from server...');
Logger.info("Disconnected from server...");
setConnected(false);
}, []);

Expand All @@ -64,37 +75,37 @@ export default function App() {
onActivity(event);
});
},
[putActivity, onActivity]
[putActivity, onActivity],
);

const handleMetadata = useCallback(
(event: { body: any }) => {
setMetadata(event.body);
},
[setMetadata]
[setMetadata],
);

useEffect(() => {
const socket = socketRef.current;

socket.on('connect', handleConnect);
socket.on('disconnect', handleDisconnect);
socket.on('activity', handleActivity);
socket.on('metadata', handleMetadata);
socket.on("connect", handleConnect);
socket.on("disconnect", handleDisconnect);
socket.on("activity", handleActivity);
socket.on("metadata", handleMetadata);

socket.connect();

return () => {
socket.off('connect');
socket.off('disconnect');
socket.off('activity');
socket.off('metadata');
socket.off("connect");
socket.off("disconnect");
socket.off("activity");
socket.off("metadata");
socket.disconnect();
};
}, [handleConnect, handleDisconnect, handleActivity, handleMetadata]);

const fluentTheme = useMemo(() => {
return theme === 'dark' ? teamsDarkTheme : teamsLightTheme;
return theme === "dark" ? teamsDarkTheme : teamsLightTheme;
}, [theme]);

return (
Expand All @@ -115,11 +126,18 @@ export default function App() {
<PageNav connected={connected} />
<main id="page-content" className={classes.mainContent}>
<Routes>
<Route path="" element={<ChatScreen isConnected={connected} />} />
<Route
path=""
element={<ChatScreen isConnected={connected} />}
/>
<Route path="cards" element={<CardsScreen />} />
<Route path="activities" element={<ActivitiesScreen />} />
{metadataPages?.map((page: Page) => (
<Route key={page.name} path={page.name} element={<CustomScreen {...page} />} />
<Route
key={page.name}
path={page.name}
element={<CustomScreen {...page} />}
/>
))}
<Route path="*" element={<Navigate to="/" replace />} />
</Routes>
Expand All @@ -132,4 +150,4 @@ export default function App() {
);
}

App.displayName = 'App';
App.displayName = "App";
Original file line number Diff line number Diff line change
@@ -1,79 +1,75 @@
import { makeStyles, tokens } from '@fluentui/react-components';
import { makeStyles, tokens } from "@fluentui/react-components";

const useAttachmentsContainerClasses = makeStyles({
root: {
// Card width breakpoints
'--card-width-very-narrow': '13.375rem', // 214px
'--card-width-narrow': '21.4375rem', // 343px
'--card-width-standard': '31.125rem', // 498px
"--card-width-very-narrow": "13.375rem", // 214px
"--card-width-narrow": "21.4375rem", // 343px
"--card-width-standard": "31.125rem", // 498px
},
inlineAttachmentsContainer: {
display: 'flex',
flexDirection: 'column',
width: 'fit-content',
display: "flex",
flexDirection: "column",
width: "fit-content",
padding: tokens.spacingHorizontalS,
userSelect: 'none',
userSelect: "none",
},
inlineAttachmentCard: {
backgroundColor: tokens.colorNeutralBackground2,
border: `${tokens.strokeWidthThin} solid ${tokens.colorNeutralStroke1}`,
borderRadius: tokens.borderRadiusSmall,
marginBottom: tokens.spacingVerticalXXS,
overflow: 'hidden',
position: 'relative',
overflow: "hidden",
position: "relative",
height: "fit-content",
},
removeAttachmentButton: {
borderRadius: tokens.borderRadiusSmall,
backgroundColor: tokens.colorNeutralBackground6,
border: `${tokens.strokeWidthThin} solid ${tokens.colorNeutralStroke1}`,
boxShadow: tokens.shadow4,
position: 'absolute',
position: "absolute",
top: tokens.spacingVerticalXXS,
right: tokens.spacingHorizontalXXS,
'&:hover': {
"&:hover": {
backgroundColor: tokens.colorNeutralBackground3,
},
},
inlineCardContent: {
padding: tokens.spacingHorizontalS,
width: 'var(--card-width-standard)',
overflow: 'auto',
width: "var(--card-width-standard)",
overflow: "auto",
'&[data-target-width="veryNarrow"]': {
width: 'var(--card-width-very-narrow)',
width: "var(--card-width-very-narrow)",
},
'&[data-target-width="narrow"]': {
width: 'var(--card-width-narrow)',
width: "var(--card-width-narrow)",
},
'&[data-target-width="standard"]': {
width: 'var(--card-width-standard)',
width: "var(--card-width-standard)",
},
'&[data-target-width="wide"]': {
width: '100%',
width: "100%",
},
'&[data-target-width="atLeast:veryNarrow"]': {
minWidth: 'var(--card-width-very-narrow)',
minWidth: "var(--card-width-very-narrow)",
},
'&[data-target-width="atLeast:narrow"]': {
minWidth: 'var(--card-width-narrow)',
minWidth: "var(--card-width-narrow)",
},
'&[data-target-width="atLeast:standard"]': {
minWidth: 'var(--card-width-standard)',
minWidth: "var(--card-width-standard)",
},
'&[data-target-width="atMost:veryNarrow"]': {
maxWidth: 'var(--card-width-very-narrow)',
maxWidth: "var(--card-width-very-narrow)",
},
'&[data-target-width="atMost:narrow"]': {
maxWidth: 'var(--card-width-narrow)',
maxWidth: "var(--card-width-narrow)",
},
'&[data-target-width="atMost:standard"]': {
maxWidth: 'var(--card-width-standard)',
maxWidth: "var(--card-width-standard)",
},
},
attachmentImage: {
borderRadius: tokens.borderRadiusSmall,
},
fileAttachment: {
display: 'inline-block',
display: "inline-block",
padding: `${tokens.spacingVerticalXXS} ${tokens.spacingHorizontalS}`,
backgroundColor: tokens.colorNeutralBackground1,
borderRadius: tokens.borderRadiusSmall,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
import { FC, memo, useCallback } from 'react';
import { Button, Image, Tooltip } from '@fluentui/react-components';
import { FC, memo, useCallback } from "react";
import { Button, Image, Tooltip } from "@fluentui/react-components";
import {
bundleIcon,
DismissFilled,
DismissRegular,
FluentIcon,
} from '@fluentui/react-icons/lib/fonts';
} from "@fluentui/react-icons/lib/fonts";

import { AttachmentType } from '../../types/Attachment';
import AdaptiveCard from '../Card/AdaptiveCard';
import { AttachmentType } from "../../types/Attachment";
import AdaptiveCard from "../Card/AdaptiveCard";

import useAttachmentsContainerClasses from './AttachmentsContainer.styles';
import useAttachmentsContainerClasses from "./AttachmentsContainer.styles";

const DismissIcon = bundleIcon(DismissFilled as FluentIcon, DismissRegular as FluentIcon);
const DismissIcon = bundleIcon(
DismissFilled as FluentIcon,
DismissRegular as FluentIcon,
);

interface AttachmentItemProps {
attachment: AttachmentType;
Expand All @@ -27,22 +30,26 @@ const AttachmentItem: FC<AttachmentItemProps> = memo(

const renderAttachmentContent = useCallback(() => {
switch (attachment.type) {
case 'card':
return attachment.content && <AdaptiveCard value={attachment.content} />;
case 'image':
case "card":
return (
attachment.content && <AdaptiveCard card={attachment.content} />
);
case "image":
return (
<Image
src={attachment.content}
alt={attachment.name || 'Image attachment'}
alt={attachment.name || "Image attachment"}
className={classes.attachmentImage}
/>
);
case 'file':
case "file":
return (
<div className={classes.fileAttachment}>{attachment.name || 'File attachment'}</div>
<div className={classes.fileAttachment}>
{attachment.name || "File attachment"}
</div>
);
default:
return <div>{attachment.name || 'Attachment'}</div>;
return <div>{attachment.name || "Attachment"}</div>;
}
}, [attachment.content, attachment.type, attachment.name, classes]);

Expand All @@ -63,14 +70,16 @@ const AttachmentItem: FC<AttachmentItemProps> = memo(
contentEditable={false}
className={classes.inlineCardContent}
data-target-width={
attachment.type === 'card' ? attachment.content?.msteams?.targetWidth : undefined
attachment.type === "card"
? attachment.content?.msteams?.targetWidth
: undefined
}
>
{renderAttachmentContent()}
</div>
</div>
);
}
},
);

interface AttachmentsContainerProps {
Expand Down
24 changes: 0 additions & 24 deletions packages/devtools/src/components/Card/Actions/ActionCard.tsx

This file was deleted.

Loading