updated logs and analytics

frontend/src/settings/APIKeys.tsx

@@ -1,23 +1,20 @@
-import React, { useState, useEffect } from 'react';
+import React from 'react';
 import { useTranslation } from 'react-i18next';
 
 import userService from '../api/services/userService';
 import Trash from '../assets/trash.svg';
 import CreateAPIKeyModal from '../modals/CreateAPIKeyModal';
 import SaveAPIKeyModal from '../modals/SaveAPIKeyModal';
-import SkeletonLoader from '../utils/loader';
 import { APIKeyData } from './types';
 
 export default function APIKeys() {
   const { t } = useTranslation();
-  const [isCreateModalOpen, setCreateModal] = useState(false);
-  const [isSaveKeyModalOpen, setSaveKeyModal] = useState(false);
-  const [newKey, setNewKey] = useState('');
-  const [apiKeys, setApiKeys] = useState<APIKeyData[]>([]);
-  const [loading, setLoading] = useState(true);
+  const [isCreateModalOpen, setCreateModal] = React.useState(false);
+  const [isSaveKeyModalOpen, setSaveKeyModal] = React.useState(false);
+  const [newKey, setNewKey] = React.useState('');
+  const [apiKeys, setApiKeys] = React.useState<APIKeyData[]>([]);
 
   const handleFetchKeys = async () => {
-    setLoading(true);
     try {
       const response = await userService.getAPIKeys();
       if (!response.ok) {
@@ -27,8 +24,6 @@ export default function APIKeys() {
       setApiKeys(apiKeys);
     } catch (error) {
       console.log(error);
-    } finally {
-      setLoading(false);
     }
   };
 
@@ -77,10 +72,9 @@ export default function APIKeys() {
       });
   };
 
-  useEffect(() => {
+  React.useEffect(() => {
     handleFetchKeys();
   }, []);
-
   return (
     <div className="mt-8">
       <div className="flex flex-col max-w-[876px]">
@@ -104,51 +98,45 @@ export default function APIKeys() {
             close={() => setSaveKeyModal(false)}
           />
         )}
-
-        {loading ? (
-          <SkeletonLoader count={5} />
-        ) : (
-          <div className="mt-[27px] w-full">
-            <div className="w-full overflow-x-auto">
-              <table className="block w-max table-auto content-center justify-center rounded-xl border text-center dark:border-chinese-silver dark:text-bright-gray">
-                <thead>
+        <div className="mt-[27px] w-full">
+          <div className="w-full overflow-x-auto">
+            <table className="table-default">
+              <thead>
+                <tr>
+                  <th>{t('settings.apiKeys.name')}</th>
+                  <th>{t('settings.apiKeys.sourceDoc')}</th>
+                  <th>{t('settings.apiKeys.key')}</th>
+                  <th></th>
+                </tr>
+              </thead>
+              <tbody>
+                {!apiKeys?.length && (
                   <tr>
-                    <th className="w-[244px] border-r p-4">
-                      {t('settings.apiKeys.name')}
-                    </th>
-                    <th className="w-[244px] border-r px-4 py-2">
-                      {t('settings.apiKeys.sourceDoc')}
-                    </th>
-                    <th className="w-[244px] border-r px-4 py-2">
-                      {t('settings.apiKeys.key')}
-                    </th>
-                    <th className="px-4 py-2"></th>
+                    <td colSpan={4} className="!p-4">
+                      {t('settings.apiKeys.noData')}
+                    </td>
                   </tr>
-                </thead>
-                <tbody>
-                  {apiKeys?.map((element, index) => (
-                    <tr key={index}>
-                      <td className="border-r border-t p-4">{element.name}</td>
-                      <td className="border-r border-t p-4">
-                        {element.source}
-                      </td>
-                      <td className="border-r border-t p-4">{element.key}</td>
-                      <td className="border-t p-4">
-                        <img
-                          src={Trash}
-                          alt="Delete"
-                          className="h-4 w-4 cursor-pointer hover:opacity-50"
-                          id={`img-${index}`}
-                          onClick={() => handleDeleteKey(element.id)}
-                        />
-                      </td>
-                    </tr>
-                  ))}
-                </tbody>
-              </table>
-            </div>
+                )}
+                {apiKeys?.map((element, index) => (
+                  <tr key={index}>
+                    <td>{element.name}</td>
+                    <td>{element.source}</td>
+                    <td>{element.key}</td>
+                    <td>
+                      <img
+                        src={Trash}
+                        alt="Delete"
+                        className="h-4 w-4 cursor-pointer hover:opacity-50"
+                        id={`img-${index}`}
+                        onClick={() => handleDeleteKey(element.id)}
+                      />
+                    </td>
+                  </tr>
+                ))}
+              </tbody>
+            </table>
           </div>
-        )}
+        </div>
       </div>
     </div>
   );

frontend/src/settings/Documents.tsx

@@ -1,7 +1,7 @@
-import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { useTranslation } from 'react-i18next';
 import { useDispatch } from 'react-redux';
+
 import userService from '../api/services/userService';
 import SyncIcon from '../assets/sync.svg';
 import Trash from '../assets/trash.svg';
@@ -9,8 +9,8 @@ import DropdownMenu from '../components/DropdownMenu';
 import { Doc, DocumentsProps } from '../models/misc';
 import { getDocs } from '../preferences/preferenceApi';
 import { setSourceDocs } from '../preferences/preferenceSlice';
-import SkeletonLoader from '../utils/loader';
 
+// Utility function to format numbers
 const formatTokens = (tokens: number): string => {
   const roundToTwoDecimals = (num: number): string => {
     return (Math.round((num + Number.EPSILON) * 100) / 100).toString();
@@ -33,9 +33,6 @@ const Documents: React.FC<DocumentsProps> = ({
 }) => {
   const { t } = useTranslation();
   const dispatch = useDispatch();
-
-  const [loading, setLoading] = useState(false);
-
   const syncOptions = [
     { label: 'Never', value: 'never' },
     { label: 'Daily', value: 'daily' },
@@ -44,7 +41,6 @@ const Documents: React.FC<DocumentsProps> = ({
   ];
 
   const handleManageSync = (doc: Doc, sync_frequency: string) => {
-    setLoading(true);
     userService
       .manageSync({ source_id: doc.id, sync_frequency })
       .then(() => {
@@ -53,96 +49,81 @@ const Documents: React.FC<DocumentsProps> = ({
       .then((data) => {
         dispatch(setSourceDocs(data));
       })
-      .catch((error) => console.error(error))
-      .finally(() => setLoading(false));
+      .catch((error) => console.error(error));
   };
-
   return (
     <div className="mt-8">
-      {loading ? (
-        <SkeletonLoader count={4} />
-      ) : (
-        <div className="flex flex-col relative">
-          <div className="z-10 w-full overflow-x-auto">
-            <table className="block w-max table-auto content-center justify-center rounded-xl border text-center dark:border-chinese-silver dark:text-bright-gray">
-              <thead>
+      <div className="flex flex-col relative">
+        <div className="z-10 w-full overflow-x-auto">
+          <table className="table-default">
+            <thead>
+              <tr>
+                <th>{t('settings.documents.name')}</th>
+                <th>{t('settings.documents.date')}</th>
+                <th>{t('settings.documents.tokenUsage')}</th>
+                <th>{t('settings.documents.type')}</th>
+                <th></th>
+              </tr>
+            </thead>
+            <tbody>
+              {!documents?.length && (
                 <tr>
-                  <th className="border-r p-4 md:w-[244px]">
-                    {t('settings.documents.name')}
-                  </th>
-                  <th className="w-[244px] border-r px-4 py-2">
-                    {t('settings.documents.date')}
-                  </th>
-                  <th className="w-[244px] border-r px-4 py-2">
-                    {t('settings.documents.tokenUsage')}
-                  </th>
-                  <th className="w-[244px] border-r px-4 py-2">
-                    {t('settings.documents.type')}
-                  </th>
-                  <th className="px-4 py-2"></th>
+                  <td colSpan={5} className="!p-4">
+                    {t('settings.documents.noData')}
+                  </td>
                 </tr>
-              </thead>
-              <tbody>
-                {documents &&
-                  documents.map((document, index) => (
-                    <tr key={index}>
-                      <td className="border-r border-t px-4 py-2">
-                        {document.name}
-                      </td>
-                      <td className="border-r border-t px-4 py-2">
-                        {document.date}
-                      </td>
-                      <td className="border-r border-t px-4 py-2">
-                        {document.tokens ? formatTokens(+document.tokens) : ''}
-                      </td>
-                      <td className="border-r border-t px-4 py-2">
-                        {document.type === 'remote' ? 'Pre-loaded' : 'Private'}
-                      </td>
-                      <td className="border-t px-4 py-2">
-                        <div className="flex flex-row items-center">
-                          {document.type !== 'remote' && (
-                            <img
-                              src={Trash}
-                              alt="Delete"
-                              className="h-4 w-4 cursor-pointer hover:opacity-50"
-                              id={`img-${index}`}
-                              onClick={(event) => {
-                                event.stopPropagation();
-                                setLoading(true);
-                                handleDeleteDocument(index, document);
-                                setLoading(false);
+              )}
+              {documents &&
+                documents.map((document, index) => (
+                  <tr key={index}>
+                    <td>{document.name}</td>
+                    <td>{document.date}</td>
+                    <td>
+                      {document.tokens ? formatTokens(+document.tokens) : ''}
+                    </td>
+                    <td>
+                      {document.type === 'remote' ? 'Pre-loaded' : 'Private'}
+                    </td>
+                    <td>
+                      <div className="flex flex-row items-center">
+                        {document.type !== 'remote' && (
+                          <img
+                            src={Trash}
+                            alt="Delete"
+                            className="h-4 w-4 cursor-pointer hover:opacity-50"
+                            id={`img-${index}`}
+                            onClick={(event) => {
+                              event.stopPropagation();
+                              handleDeleteDocument(index, document);
+                            }}
+                          />
+                        )}
+                        {document.syncFrequency && (
+                          <div className="ml-2">
+                            <DropdownMenu
+                              name="Sync"
+                              options={syncOptions}
+                              onSelect={(value: string) => {
+                                handleManageSync(document, value);
                               }}
+                              defaultValue={document.syncFrequency}
+                              icon={SyncIcon}
                             />
-                          )}
-                          {document.syncFrequency && (
-                            <div className="ml-2">
-                              <DropdownMenu
-                                name="Sync"
-                                options={syncOptions}
-                                onSelect={(value: string) => {
-                                  handleManageSync(document, value);
-                                }}
-                                defaultValue={document.syncFrequency}
-                                icon={SyncIcon}
-                              />
-                            </div>
-                          )}
-                        </div>
-                      </td>
-                    </tr>
-                  ))}
-              </tbody>
-            </table>
-          </div>
+                          </div>
+                        )}
+                      </div>
+                    </td>
+                  </tr>
+                ))}
+            </tbody>
+          </table>
         </div>
-      )}
+      </div>
     </div>
   );
 };
-
 Documents.propTypes = {
   documents: PropTypes.array.isRequired,
   handleDeleteDocument: PropTypes.func.isRequired,
 };
-
 export default Documents;