Skip to content

Commit d76019e

Browse files
Roopan-MicrosoftRoopan-Microsoft
authored
Merge pull request #239 from microsoft/dependabotchanges
build: Dependabotchanges to Dev branch
2 parents c572154 + d9a8fa0 commit d76019e

File tree

19 files changed

+6979
-17915
lines changed

19 files changed

+6979
-17915
lines changed

‎ClientAdvisor/App/frontend/__mocks__/react-markdown.tsx

+5
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ const mockNode = {
99
const mockProps = { className: 'language-javascript' };
1010

1111
const ReactMarkdown: React.FC<{ children: React.ReactNode , components: any }> = ({ children,components }) => {
12+
if(!components.code){
13+
components.code = ({ ...codeProps }) => {
14+
return <div>Test Code text from markdown </div>
15+
}
16+
}
1217
return <div data-testid="reactMockDown">
1318
{components && components.code({ node: mockNode, ...mockProps })}
1419
{children}</div>; // Simply render the children

‎ClientAdvisor/App/frontend/package-lock.json

+3,310-15,150
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ClientAdvisor/App/frontend/package.json

+34-34
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"dev": "vite",
88
"build": "tsc && vite build",
99
"watch": "tsc && vite build --watch",
10-
"test": "jest --coverage --verbose",
10+
"test": "jest --coverage --verbose --runInBand",
1111
"test:coverage": "jest --coverage --verbose --watchAll",
1212
"lint": "npx eslint src",
1313
"lint:fix": "npx eslint --fix",
@@ -16,66 +16,66 @@
1616
"format": "npm run prettier:fix && npm run lint:fix"
1717
},
1818
"dependencies": {
19-
"@fluentui/font-icons-mdl2": "^8.5.42",
20-
"@fluentui/react": "^8.105.3",
19+
"@fluentui/font-icons-mdl2": "^8.5.57",
20+
"@fluentui/react": "^8.122.2",
2121
"@fluentui/react-hooks": "^8.6.29",
22-
"@fluentui/react-icons": "^2.0.195",
23-
"dompurify": "^3.0.8",
22+
"@fluentui/react-icons": "^2.0.270",
23+
"dompurify": "^3.2.3",
2424
"lodash": "^4.17.21",
2525
"lodash-es": "^4.17.21",
2626
"react": "^18.2.0",
2727
"react-dom": "^18.2.0",
28-
"react-router-dom": "^6.8.1",
29-
"react-syntax-highlighter": "^15.5.0",
28+
"react-router-dom": "^7.1.0",
29+
"react-syntax-highlighter": "^15.6.1",
3030
"react-uuid": "^2.0.0",
31-
"rehype-raw": "^6.1.1",
32-
"remark-gfm": "^3.0.1",
33-
"remark-supersub": "^1.0.0",
34-
"undici": "^5.0.0"
31+
"rehype-raw": "^7.0.0",
32+
"remark-gfm": "^4.0.0",
33+
"remark-supersub": "^1.0.0"
3534
},
3635
"devDependencies": {
37-
"@eslint/eslintrc": "^3.0.2",
38-
"@eslint/js": "^9.1.1",
39-
"@testing-library/jest-dom": "^6.5.0",
40-
"@testing-library/react": "^16.0.1",
36+
"@eslint/eslintrc": "^3.2.0",
37+
"@eslint/js": "^9.17.0",
38+
"@testing-library/jest-dom": "^6.6.3",
39+
"@testing-library/react": "^16.1.0",
4140
"@testing-library/user-event": "^14.5.2",
42-
"@types/dompurify": "^3.0.5",
41+
"@types/dompurify": "^3.2.0",
4342
"@types/eslint-config-prettier": "^6.11.3",
4443
"@types/jest": "^29.5.12",
4544
"@types/lodash-es": "^4.17.12",
46-
"@types/mocha": "^10.0.6",
47-
"@types/node": "^20.14.1",
45+
"@types/mocha": "^10.0.10",
46+
"@types/node": "^22.10.2",
4847
"@types/react": "^18.0.27",
4948
"@types/react-dom": "^18.0.10",
50-
"@types/react-syntax-highlighter": "^15.5.11",
49+
"@types/react-syntax-highlighter": "^15.5.13",
5150
"@types/testing-library__user-event": "^4.2.0",
52-
"@typescript-eslint/eslint-plugin": "^6.21.0",
53-
"@typescript-eslint/parser": "^6.21.0",
54-
"@vitejs/plugin-react": "^3.1.0",
51+
"@typescript-eslint/eslint-plugin": "^6.4.0",
52+
"@typescript-eslint/parser": "^6.4.0",
53+
"@vitejs/plugin-react": "^4.3.4",
5554
"dotenv": "^16.4.5",
5655
"eslint": "^8.57.0",
5756
"eslint-config-prettier": "^9.1.0",
5857
"eslint-config-standard-with-typescript": "^43.0.1",
59-
"eslint-plugin-jsx-a11y": "^6.8.0",
60-
"eslint-plugin-n": "^16.6.2",
61-
"eslint-plugin-prettier": "^5.1.3",
62-
"eslint-plugin-promise": "^6.1.1",
63-
"eslint-plugin-react": "^7.34.1",
64-
"eslint-plugin-react-hooks": "^4.6.0",
65-
"eslint-plugin-simple-import-sort": "^12.1.0",
58+
"eslint-plugin-jsx-a11y": "^6.10.2",
59+
"eslint-plugin-n": "^16.0.0",
60+
"eslint-plugin-prettier": "^5.2.1",
61+
"eslint-plugin-promise": "^6.6.0",
62+
"eslint-plugin-react": "^7.37.2",
63+
"eslint-plugin-react-hooks": "^5.1.0",
64+
"eslint-plugin-simple-import-sort": "^12.1.1",
6665
"globals": "^15.0.0",
6766
"identity-obj-proxy": "^3.0.0",
6867
"jest": "^29.7.0",
6968
"jest-environment-jsdom": "^29.7.0",
70-
"lint-staged": "^15.2.2",
69+
"lint-staged": "^15.2.11",
7170
"msw": "2.2.2",
7271
"prettier": "^3.2.5",
73-
"react-markdown": "^8.0.0",
72+
"react-markdown": "^9.0.1",
7473
"react-test-renderer": "^18.2.0",
7574
"string.prototype.replaceall": "^1.0.10",
7675
"ts-jest": "^29.2.5",
7776
"ts-node": "^10.9.2",
78-
"typescript": "^4.9.5",
79-
"vite": "^4.1.5"
77+
"typescript": "^5.3.3",
78+
"vite": "^4.1.5",
79+
"undici": "^5.0.0"
8080
}
81-
}
81+
}

‎ClientAdvisor/App/frontend/src/components/Answer/Answer.tsx

+43-25
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { FormEvent, useContext, useEffect, useMemo, useState } from 'react'
2-
import ReactMarkdown from 'react-markdown'
2+
import ReactMarkdown, { Components, Options } from 'react-markdown'
33
import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter'
44
import { nord } from 'react-syntax-highlighter/dist/esm/styles/prism'
55
import { Checkbox, DefaultButton, Dialog, FontIcon, Stack, Text } from '@fluentui/react'
@@ -228,19 +228,38 @@ export const Answer = ({ answer, onCitationClicked }: Props) => {
228228
)
229229
}
230230

231-
const components = {
232-
code({ node, ...props }: { node: any;[key: string]: any }) {
233-
let language
234-
if (props.className) {
235-
const match = props.className.match(/language-(\w+)/)
236-
language = match ? match[1] : undefined
231+
const components: Components = {
232+
a: ({ href, children, ...props }) => (
233+
<a href={href} target="_blank" rel="noopener noreferrer" {...props}>
234+
{children}
235+
</a>
236+
),
237+
code({ inline, className, children, ...props }: {
238+
inline?: boolean;
239+
className?: string;
240+
children?: React.ReactNode;
241+
[key: string]: any
242+
}) {
243+
const match = /language-(\w+)/.exec(className || '');
244+
// Handle inline and block code rendering
245+
if (inline) {
246+
return (
247+
<code className={className} {...props}>
248+
{children}
249+
</code>
250+
);
251+
} else if (match) {
252+
return (
253+
<SyntaxHighlighter
254+
style={nord}
255+
language={match[1]}
256+
PreTag="div"
257+
{...props}
258+
>
259+
{String(children).replace(/\n$/, '')}
260+
</SyntaxHighlighter>
261+
);
237262
}
238-
const codeString = node.children[0].value ?? ''
239-
return (
240-
<SyntaxHighlighter style={nord} language={language} PreTag="div" {...props}>
241-
{codeString}
242-
</SyntaxHighlighter>
243-
)
244263
}
245264
}
246265
return (
@@ -249,18 +268,17 @@ export const Answer = ({ answer, onCitationClicked }: Props) => {
249268
<Stack.Item>
250269
<Stack horizontal grow>
251270
<Stack.Item grow>
252-
<ReactMarkdown
253-
linkTarget="_blank"
254-
remarkPlugins={[remarkGfm, supersub]}
255-
rehypePlugins={[rehypeRaw]}
256-
children={
257-
SANITIZE_ANSWER
258-
? DOMPurify.sanitize(parsedAnswer.markdownFormatText, { ALLOWED_TAGS: XSSAllowTags })
259-
: parsedAnswer.markdownFormatText
260-
}
261-
className={styles.answerText}
262-
components={components}
263-
/>
271+
<ReactMarkdown
272+
remarkPlugins={[remarkGfm, supersub]}
273+
rehypePlugins={[rehypeRaw]}
274+
children={
275+
SANITIZE_ANSWER
276+
? DOMPurify.sanitize(parsedAnswer.markdownFormatText, { ALLOWED_TAGS: XSSAllowTags, ALLOWED_ATTR: ['href', 'target', 'rel'] })
277+
: parsedAnswer.markdownFormatText
278+
}
279+
className={styles.answerText}
280+
components={components}
281+
/>
264282
</Stack.Item>
265283
<Stack.Item className={styles.answerHeader}>
266284
{FEEDBACK_ENABLED && answer.message_id !== undefined && (

‎ClientAdvisor/App/frontend/src/components/ChatHistory/ChatHistoryPanel.test.tsx

+27-25
Original file line numberDiff line numberDiff line change
@@ -121,38 +121,40 @@ describe('ChatHistoryPanel Component', () => {
121121
})
122122

123123
it('hides the dialog when cancel or close is clicked', async () => {
124-
userEvent.setup()
125-
124+
const user = userEvent.setup();
125+
126126
const compState = {
127127
chatHistory: [{ id: 1, message: 'Test Message' }],
128128
chatHistoryLoadingState: ChatHistoryLoadingState.Success,
129-
isCosmosDBAvailable: { cosmosDB: true, status: CosmosDBStatus.Working }
130-
}
131-
132-
renderWithContext(<ChatHistoryPanel isLoading={false} />, compState)
133-
134-
const moreButton = screen.getByRole('button', { name: /clear all chat history/i })
135-
fireEvent.click(moreButton)
136-
137-
const clearAllItem = await screen.findByRole('menuitem')
129+
isCosmosDBAvailable: { cosmosDB: true, status: CosmosDBStatus.Working },
130+
};
131+
132+
renderWithContext(<ChatHistoryPanel isLoading={false} />, compState);
133+
134+
const moreButton = screen.getByRole('button', { name: /clear all chat history/i });
135+
fireEvent.click(moreButton);
136+
137+
const clearAllItem = await screen.findByRole('menuitem');
138138
await act(() => {
139-
userEvent.click(clearAllItem)
140-
})
141-
139+
user.click(clearAllItem);
140+
});
141+
142142
await waitFor(() =>
143143
expect(screen.getByText(/are you sure you want to clear all chat history/i)).toBeInTheDocument()
144-
)
145-
146-
const cancelButton = screen.getByRole('button', { name: /cancel/i })
147-
148-
await act(() => {
149-
userEvent.click(cancelButton)
150-
})
151-
144+
);
145+
146+
const cancelButton = screen.getByRole('button', { name: /cancel/i });
147+
act(() => {
148+
user.click(cancelButton);
149+
});
150+
152151
await waitFor(() =>
153-
expect(screen.queryByText(/are you sure you want to clear all chat history/i)).not.toBeInTheDocument()
154-
)
155-
})
152+
{
153+
expect(screen.queryByText(/are you sure you want to clear all chat history/i)).not.toBeInTheDocument()
154+
}
155+
);
156+
});
157+
156158

157159
test('handles API failure correctly', async () => {
158160
// Mock historyDeleteAll to return a failed response

‎ClientAdvisor/App/frontend/src/pages/chat/Components/CitationPanel.tsx

+9-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,13 @@ interface CitationPanelProps {
1414
onViewSource: (citation: Citation) => void;
1515
}
1616

17+
const renderLink = (props: any) => {
18+
return <a {...props} target="_blank" rel="noopener noreferrer" />;
19+
};
20+
1721
export const CitationPanel: React.FC<CitationPanelProps> = ({ activeCitation, IsCitationPanelOpen, onViewSource }) => {
22+
23+
1824
return (
1925
<Stack.Item className={styles.citationPanel} tabIndex={0} role="tabpanel" aria-label="Citations Panel">
2026
<Stack
@@ -41,11 +47,13 @@ export const CitationPanel: React.FC<CitationPanelProps> = ({ activeCitation, Is
4147
</h5>
4248
<div tabIndex={0}>
4349
<ReactMarkdown
44-
linkTarget="_blank"
4550
className={styles.citationPanelContent}
4651
children={DOMPurify.sanitize(activeCitation.content, { ALLOWED_TAGS: XSSAllowTags })}
4752
remarkPlugins={[remarkGfm]}
4853
rehypePlugins={[rehypeRaw]}
54+
components={{
55+
a: renderLink,
56+
}}
4957
/>
5058
</div>
5159
</Stack.Item>

‎ClientAdvisor/App/requirements-dev.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ python-dotenv==1.0.0
77
azure-cosmos==4.5.0
88
quart==0.19.9
99
uvicorn==0.24.0
10-
aiohttp==3.9.2
11-
gunicorn==20.1.0
10+
gunicorn==22.0.0
11+
aiohttp==3.10.2
1212
quart-session==3.0.0
1313
pymssql==2.3.0
1414
httpx==0.28.0

‎ClientAdvisor/App/requirements.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ python-dotenv==1.0.0
88
azure-cosmos==4.5.0
99
quart==0.19.9
1010
uvicorn==0.24.0
11-
aiohttp==3.9.2
12-
gunicorn==20.1.0
11+
gunicorn==22.0.0
12+
aiohttp==3.10.2
1313
quart-session==3.0.0
1414
pymssql==2.3.0
1515
httpx==0.28.0

‎ClientAdvisor/AzureFunction/requirements.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
azure-functions
66
azurefunctions-extensions-http-fastapi==1.0.0b1
7-
openai==1.55.3
8-
semantic_kernel==1.0.4
9-
pymssql==2.3.0
10-
azure-search-documents==11.6.0b3
7+
openai==1.58.1
8+
semantic_kernel==1.17.1
9+
pymssql==2.3.2
10+
azure-search-documents==11.6.0b8

‎ClientAdvisor/Deployment/scripts/fabric_scripts/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
msal==1.24.0b1
1+
msal==1.31.1
22
azure-identity
33
pandas
44
azure-storage-file-datalake

‎ClientAdvisor/Deployment/scripts/index_scripts/requirements.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ openai
44
pypdf
55
# pyodbc
66
# tiktoken
7-
msal[broker]==1.24.0b1
7+
msal[broker]==1.31.1
88
azure-identity
99
azure-ai-textanalytics
10-
azure-search-documents==11.6.0b3
10+
azure-search-documents==11.6.0b8
1111
azure-keyvault-secrets
1212
pandas
1313
pymssql

0 commit comments

Comments
 (0)