Skip to content

Commit b7b1f2c

Browse files
authored
Team memory inembedded (#326)
* the check needs to be for the pathname * remove mbql warning text * handle embedded messaging
1 parent dbc5474 commit b7b1f2c

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

web/src/components/common/DemoComponents.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export const DemoHelperMessage = ({url}: {url: string}) => {
1616
const selectedAsset = availableAssets.find(asset => asset.slug === selectedAssetId) ||
1717
(availableAssets.length > 0 ? availableAssets[0] : null)
1818

19-
const teamHelperMessage = (selectedAsset && useTeamMemory && selectedAsset.content?.isActive) ? selectedAsset.content?.helpertexts?.filter(text => url.includes(text.url) && text.is_published).map(t => t.text)?.[0] : null
19+
const teamHelperMessage = (selectedAsset && useTeamMemory && selectedAsset.content?.isActive) ? selectedAsset.content?.helpertexts?.filter(text => url.includes(new URL(text.url).pathname) && text.is_published).map(t => t.text)?.[0] : null
2020

2121
const helperMessage = useAppStore((state) => state.helperMessage)
2222
if (!helperMessage && !teamHelperMessage) {
@@ -39,7 +39,7 @@ export const DemoSuggestions = ({url}: {url: string}) => {
3939
(availableAssets.length > 0 ? availableAssets[0] : null)
4040

4141
const personalQuestions = showSavedQuestions ? savedQuestions : []
42-
const teamQuestions = (selectedAsset && useTeamMemory && selectedAsset.content?.isActive) ? selectedAsset.content?.questions?.filter(q => q.is_published && url.includes(q.source_url)).map(q => q.content) : []
42+
const teamQuestions = (selectedAsset && useTeamMemory && selectedAsset.content?.isActive) ? selectedAsset.content?.questions?.filter(q => q.is_published && url.includes(new URL(q.source_url).pathname)).map(q => q.content) : []
4343
const allQuestions = [...personalQuestions, ...teamQuestions]
4444

4545

web/src/components/common/TaskUI.tsx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -461,16 +461,16 @@ const TaskUI = forwardRef<HTMLTextAreaElement>((_props, ref) => {
461461
}
462462

463463
// 2. All cases when the input box should be enabled, but an alert shown
464-
if (toolContext.pageType === 'mbql'){
465-
return {
466-
inputBox: true,
467-
alert: {
468-
message: "Question Builder feature is new and still in progress. Some things might not work just yet.",
469-
type: "info",
470-
title: "Try Question Builder!"
471-
}
472-
}
473-
}
464+
// if (toolContext.pageType === 'mbql'){
465+
// return {
466+
// inputBox: true,
467+
// alert: {
468+
// message: "Question Builder feature is new and still in progress. Some things might not work just yet.",
469+
// type: "info",
470+
// title: "Try Question Builder!"
471+
// }
472+
// }
473+
// }
474474
if (!drMode) {
475475
return {
476476
inputBox: false,

web/src/components/devtools/TeamMemory.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ interface HelperText {
2626

2727
export const TeamMemory: React.FC = () => {
2828
const tool = getParsedIframeInfo().tool
29+
const isEmbedded = getParsedIframeInfo().isEmbedded as unknown === 'true'
2930
const availableAssets = useSelector((state: RootState) => state.settings.availableAssets)
3031
const selectedAssetId = useSelector((state: RootState) => state.settings.selectedAssetId)
3132
const assetsLoading = useSelector((state: RootState) => state.settings.assetsLoading)
3233
const useTeamMemory = useSelector((state: RootState) => state.settings.useTeamMemory)
3334

34-
3535
const handleAssetSelection = (assetSlug: string) => {
3636
dispatch(setSelectedAssetId(assetSlug === '' ? null : assetSlug))
3737
}
@@ -68,7 +68,7 @@ export const TeamMemory: React.FC = () => {
6868
</HStack>
6969

7070
{/* Asset Selection Section */}
71-
<Box position="relative">
71+
<Box position="relative" minH={"500px"}>
7272
<VStack align="stretch" spacing={4} mb={4}>
7373
<VStack align="stretch" spacing={2}>
7474
{assetsLoading ? (
@@ -232,7 +232,7 @@ export const TeamMemory: React.FC = () => {
232232
</VStack>
233233
{!useTeamMemory && (
234234
<DisabledOverlay
235-
toolEnabledReason="Turn on the **USE TEAM MEMORY** switch above to use your organization's assets and team context."
235+
toolEnabledReason={isEmbedded ? "Turn on the **USE TEAM MEMORY** switch above to let the AI use your organization's assets and team context." : "Turn on the **USE TEAM MEMORY** switch above to let MinusX use your organization's assets and team context."}
236236
local={true}
237237
/>
238238
)}

0 commit comments

Comments
 (0)