Feature/organization

package.json

@@ -35,6 +35,7 @@
     "formik-mui": "^4.0.0-alpha.3",
     "git-url-parse": "^14.0.0",
     "history": "^5.3.0",
+    "jdenticon": "^3.3.0",
     "js-cookie": "^3.0.1",
     "katex": "^0.16.4",
     "lodash": "^4.17.21",
@@ -45,6 +46,7 @@
     "react-diff-viewer-continued": "^3.4.0",
     "react-dom": "^18.2.0",
     "react-helmet-async": "^2.0.4",
+    "react-jdenticon": "^1.4.0",
     "react-markdown": "^8.0.7",
     "react-markdown-editor-lite": "^1.3.4",
     "react-redux": "^8.0.5",

src/components/AddUserToOrganization/AddUserToOrganization.jsx

@@ -0,0 +1,8 @@
+import React from 'react';
+import Box from '@mui/material/Box';
+
+const AddUserToOrganization = () => {
+  return <Box></Box>;
+};
+//
+export default AddUserToOrganization;

src/components/Audit-card.jsx

@@ -22,23 +22,58 @@ const AuditCard = ({ audit, request }) => {
       <Tooltip title={audit.project_name} arrow placement="top">
         <Typography sx={auditNameStyle}>{audit.project_name}</Typography>
       </Tooltip>
-      <Box sx={{ display: 'grid' }}>
-        <Tooltip
-          title={
-            audit?.auditor_contacts.email !== null
-              ? audit?.auditor_contacts?.email
-              : 'Hidden'
-          }
-          arrow
-          placement="top"
+      {audit?.auditor_organization?.id ? (
+        <Box sx={{ display: 'grid' }}>
+          <Tooltip
+            title={
+              audit?.auditor_organization?.contacts?.email !== null
+                ? audit?.auditor_organization?.contacts?.email
+                : 'Hidden'
+            }
+            arrow
+            placement="top"
+          >
+            <Typography sx={nameTextStyle} noWrap={true}>
+              {audit?.auditor_organization?.contacts?.email !== null
+                ? audit?.auditor_organization?.contacts?.email
+                : 'Hidden'}
+            </Typography>
+          </Tooltip>
+        </Box>
+        ) : (
+        <Box sx={{ display: 'grid' }}>
+          <Tooltip
+            title={
+              audit?.auditor_contacts.email !== null
+                ? audit?.auditor_contacts?.email
+                : 'Hidden'
+            }
+            arrow
+            placement="top"
+          >
+            <Typography sx={nameTextStyle} noWrap={true}>
+              {audit?.auditor_contacts.email !== null
+                ? audit?.auditor_contacts?.email
+                : 'Hidden'}
+            </Typography>
+          </Tooltip>
+        </Box>
+        )}
+      {audit?.auditor_organization?.id && (
+        <Box
+          sx={{
+            display: 'flex',
+            flexDirection: 'column',
+            alignItems: 'center',
+            gap: '7px',
+          }}
         >
-          <Typography sx={nameTextStyle} noWrap={true}>
-            {audit?.auditor_contacts.email !== null
-              ? audit?.auditor_contacts?.email
-              : 'Hidden'}
+          <Typography sx={priceTextStyle}>Organization</Typography>
+          <Typography sx={auditNameStyle}>
+            {audit?.auditor_organization?.name}
           </Typography>
-        </Tooltip>
-      </Box>
+        </Box>
+      )}
       <Tooltip
         title={audit?.tags?.map(el => el).join(', ') ?? ''}
         arrow

src/components/Audit-request-card.jsx

@@ -48,6 +48,24 @@ const AuditRequestCard = ({ type, request, audit }) => {
           </Box>
         </Box>
       </Box>
+      {request.auditor_organization?.id && (
+        <Box>
+          <Typography
+            variant="h5"
+            sx={{ mb: '7px', fontSize: '14px!important', color: 'grey' }}
+            textAlign="center"
+          >
+            Organization:
+          </Typography>
+          <Typography
+            variant="h5"
+            sx={[projectNameSx, { height: 'unset', maxHeight: '66px' }]}
+            textAlign="center"
+          >
+            {request.auditor_organization.name}
+          </Typography>
+        </Box>
+      )}
       <Box sx={buttonWrapper}>
         <Button
           variant="contained"
@@ -239,6 +257,8 @@ const cardWrapper = theme => ({
   border: '1px solid rgba(67, 66, 66, 0.1)',
   alignItems: 'center',
   gap: '15px',
+  height: '100%',
+  justifyContent: 'space-between',
   '& h5': {
     fontSize: '18px',
     fontWeight: 500,

src/components/Audit-request.jsx

@@ -1,13 +1,18 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { Box, Button, Grid } from '@mui/material';
 import AuditRequestCard from './Audit-request-card';
 import { useSelector } from 'react-redux';
 import { addTestsLabel } from '../lib/helper.js';
 import { useNavigate } from 'react-router-dom/dist';
 import Headings from '../router/Headings.jsx';
+import { useDispatch } from 'react-redux';
+import { getOrganizationAuditRequests } from '../redux/actions/auditAction.js';
 
 const AuditRequest = () => {
   const auditRequests = useSelector(s => s.audits.auditRequests);
+  const organizationAuditRequests = useSelector(
+    s => s.audits.organizationAuditRequests,
+  );
   const navigate = useNavigate();
 
   const handleNavigate = () => {
@@ -35,6 +40,11 @@ const AuditRequest = () => {
             <AuditRequestCard request={request} />
           </Grid>
         ))}
+        {organizationAuditRequests?.map(request => (
+          <Grid item sx={gridItemStyle} key={request.id}>
+            <AuditRequestCard request={request} />
+          </Grid>
+        ))}
       </Grid>
     </Box>
   );

src/components/AuditorModal.jsx

@@ -31,6 +31,7 @@ import { setCurrentChat } from '../redux/actions/chatActions.js';
 import ChatIcon from './icons/ChatIcon.jsx';
 import { getAuditorRating } from '../redux/actions/auditorAction.js';
 import Star from './icons/Star.jsx';
+import TypeChat from './Chat/TypeChat.jsx';
 import { SCOPE_GIT_BLOCK, SCOPE_LINKS } from '../services/constants.js';
 
 export default function AuditorModal({
@@ -52,10 +53,12 @@ export default function AuditorModal({
   const { auditorRating } = useSelector(s => s.auditor);
   const { chatList } = useSelector(s => s.chat);
   const myProjects = useSelector(state => state.project.myProjects);
+  const [isOpenType, setIsOpenType] = useState(false);
 
   const [mode, setMode] = useState('info');
   const [message, setMessage] = useState('');
   const [scope, setScope] = useState([]);
+  const { organizations, own } = useSelector(s => s.organization);
 
   const handleInvite = () => {
     if (
@@ -94,29 +97,34 @@ export default function AuditorModal({
   };
 
   const handleSendMessage = () => {
-    window.scrollTo(0, 0);
+    // TODO add check for pm or org chat
+    if (organizations.length || own.length) {
+      setIsOpenType(true);
+    } else {
+      window.scrollTo(0, 0);
 
-    const existingChat = chatList.find(chat =>
-      chat.members?.find(
-        member =>
-          member.id === auditor?.user_id &&
-          member.role?.toLowerCase() === AUDITOR,
-      ),
-    );
-    const chatId = existingChat ? existingChat.id : auditor?.user_id;
-    const members = [auditor?.user_id, user.id];
+      const existingChat = chatList.find(chat =>
+        chat.members?.find(
+          member =>
+            member.id === auditor?.user_id &&
+            member.role?.toLowerCase() === AUDITOR,
+        ),
+      );
+      const chatId = existingChat ? existingChat.id : auditor?.user_id;
+      const members = [auditor?.user_id, user.id];
 
-    dispatch(
-      setCurrentChat(chatId, {
-        name: auditor.first_name,
-        avatar: auditor.avatar,
-        role: AUDITOR,
-        isNew: !existingChat,
-        members,
-      }),
-    );
-    localStorage.setItem('path', window.location.pathname);
-    navigate(`/chat/${existingChat ? existingChat.id : auditor?.user_id}`);
+      dispatch(
+        setCurrentChat(chatId, {
+          name: auditor.first_name,
+          avatar: auditor.avatar,
+          role: AUDITOR,
+          isNew: !existingChat,
+          members,
+        }),
+      );
+      localStorage.setItem('path', window.location.pathname);
+      navigate(`/chat/${existingChat ? existingChat.id : auditor?.user_id}`);
+    }
   };
 
   useEffect(() => {
@@ -306,14 +314,17 @@ export default function AuditorModal({
                   Invite to project
                 </Button>
                 {!budge && (
-                  <Button
-                    variant="text"
-                    onClick={handleSendMessage}
-                    disabled={auditor?.user_id === user.id}
-                    {...addTestsLabel('message-button')}
-                  >
-                    <ChatIcon />
-                  </Button>
+                  // <Button
+                  //   variant="text"
+                  //   // sx={[findButton, messageButton]}
+                  //   onClick={handleSendMessage}
+                  //   disabled={auditor?.user_id === user.id}
+                  //   {...addTestsLabel('message-button')}
+                  // >
+                  //   <ChatIcon />
+                  //   {isOpenType && <TypeChat />}
+                  // </Button>
+                  <TypeChat auditor={auditor} />
                 )}
               </Box>
             </Box>
@@ -678,6 +689,7 @@ const dateWrapper = {
     },
   },
 };
+
 const dateStyle = {
   width: '150px',
   height: '40px',