Merge pull request #241 from microsoft/dev

fix: Merging Dev to Main branch
microsoft · Jan 2, 2025 · cbc2535 · cbc2535
2 parents d756b7c + 1bc1e0c
commit cbc2535
Show file tree

Hide file tree

Showing 31 changed files with 7,487 additions and 18,134 deletions.
diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml
@@ -18,5 +18,8 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install -r ClientAdvisor/App/requirements.txt
-    - name: Run flake8
-      run: flake8 --config=ClientAdvisor/App/.flake8 ClientAdvisor/App
+        pip install -r ResearchAssistant/App/requirements.txt
+    - name: Run flake8 and pylint
+      run: |
+        flake8 --config=ClientAdvisor/App/.flake8 ClientAdvisor/App
+        flake8 --config=ResearchAssistant/App/.flake8 ResearchAssistant/App
diff --git a/ClientAdvisor/App/.flake8 b/ClientAdvisor/App/.flake8
@@ -1,4 +1,5 @@
 [flake8]
 max-line-length = 88
-extend-ignore = E501, E203
-exclude = .venv, frontend,
+extend-ignore = E501
+exclude = .venv, frontend
+ignore = E203, W503, G004, G200
diff --git a/ClientAdvisor/App/frontend/__mocks__/react-markdown.tsx b/ClientAdvisor/App/frontend/__mocks__/react-markdown.tsx
@@ -9,6 +9,11 @@ const mockNode = {
 const mockProps = { className: 'language-javascript' };
 
 const ReactMarkdown: React.FC<{ children: React.ReactNode , components: any }> = ({ children,components }) => {
+  if(!components.code){
+    components.code = ({ ...codeProps }) => {
+      return <div>Test Code text from markdown </div>
+    }
+  }
   return <div data-testid="reactMockDown">
     {components && components.code({ node: mockNode, ...mockProps })}
     {children}</div>; // Simply render the children