Add Notion import status

server/src/helpers/routes/docs.ts

@@ -1,5 +1,5 @@
 import Doc from '../../models/Doc';
-import { OrgType } from '../../models/Org';
+import Org, { OrgType } from '../../models/Org';
 import { ConfluencePage } from '../../routes/integrations/confluence';
 import { GoogleDoc } from '../../routes/integrations/google';
 import { NotionPage } from '../../routes/integrations/notion';
@@ -66,6 +66,7 @@ export const importDocsFromNotion = async (pages: NotionPage[], org: OrgType, us
   }));
 
   await Promise.all(addDocPromises);
+  await Org.findById(orgId, { 'importStatus.notion': false })
 }
 
 export const importDocsFromGoogleDocs = async (docs: GoogleDoc[], org: OrgType, userId: string) => {

server/src/models/Org.ts

@@ -34,6 +34,12 @@ export type OrgType = {
     google?: GoogleDocsCredentials;
     confluence?: ConfluenceCredentials;
   };
+  importStatus?: {
+    notion?: boolean,
+    github?: boolean,
+    confluence?: boolean,
+    googledocs?: boolean,
+  },
   users: string[];
   invitedEmails?: string[];
   notifications: {
@@ -106,6 +112,12 @@ const OrgSchema = new Schema({
       }]
     }
   },
+  importStatus: {
+    notion: Boolean,
+    confluence: Boolean,
+    googledocs: Boolean,
+    github: Boolean,
+  },
   notifications: {
     monthlyDigest: { type: Boolean, default: true },
     newsletter: { type: Boolean, default: true },

server/src/routes/docs.ts

@@ -143,12 +143,12 @@ docsRouter.get('/', userMiddleware, async (req, res) => {
   }
 });
 
-const groupNameMap: Record<ScrapingMethod, string> = {
-  'notion-private': 'Notion Workspace',
-  'confluence-private': 'Confluence Space',
-  'googledocs-private': 'Google Docs',
-  'github': 'GitHub Markdown',
-  'web': 'Web Pages',
+const groupMap: Record<ScrapingMethod, { name: string, importStatusId: string }> = {
+  'notion-private': { name: 'Notion Workspace', importStatusId: 'notion' },
+  'confluence-private': { name: 'Confluence Space', importStatusId: 'confluence' },
+  'googledocs-private': { name: 'Google Docs', importStatusId: 'googledocs' },
+  'github': { name: 'GitHub Markdown', importStatusId: 'github' },
+  'web': { name: 'Web Pages', importStatusId: '' },
 }
 
 docsRouter.get('/groups', userMiddleware, async (_, res) => {
@@ -198,12 +198,14 @@ docsRouter.get('/groups', userMiddleware, async (_, res) => {
     },
   ]);
 
-  const groupsWithNames = groups.map((group: { _id: ScrapingMethod }) => {
+  const groupsWithNames: any[] = groups.map((group: { _id: ScrapingMethod }) => {
+    const groupData = groupMap[group._id];
     return {
       ...group,
-      name: groupNameMap[group._id],
+      name: groupData.name,
+      isLoading: Boolean(org.importStatus[groupData.importStatusId])
     }
-  })
+  });
 
   return res.send({ groups: groupsWithNames })
 });

server/src/routes/integrations/notion.ts

@@ -86,7 +86,7 @@ notionRouter.get('/authorization', async (req, res) => {
   if (state == null) return res.status(403).send('No state provided');
   const parsedState = JSON.parse(decodeURIComponent(state as string));
   const { org: orgId, userId } = parsedState;
-  const org = await Org.findByIdAndUpdate(orgId, { 'integrations.notion': { ...response } });
+  const org = await Org.findByIdAndUpdate(orgId, { 'integrations.notion': { ...response }, 'importStatus.notion': true });
 
   if (org == null) {
     return res.status(403).send({ error: 'Invalid organization ID' });
@@ -113,6 +113,7 @@ notionRouter.get('/authorization', async (req, res) => {
     }
     return res.redirect(redirectUrl);
   } catch {
+    await Org.findById(orgId, { 'importStatus.notion': false })
     return res.redirect(redirectUrl);
   }
 });

web/components/GroupItem.tsx

@@ -13,6 +13,7 @@ export type Group = {
   count: number;
   lastUpdatedDoc: Doc;
   tasksCount: number;
+  isLoading: boolean;
 }
 
 type GroupItemProps = {
@@ -65,7 +66,13 @@ export default function GroupItem({ group, setSelectedGroup }: GroupItemProps) {
         <a className="relative group flex items-center space-x-2.5">
           <span className="flex items-center space-x-2.5 text-sm text-gray-500 truncate">
             <div>
-            {group.count} documents • Last updated {timeAgo.format(Date.parse(group.lastUpdatedDoc.lastUpdatedAt))}
+              { group.isLoading
+                ? <span className="flex items-center text-gran-400">
+                  <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 512 512" className="h-3 w-3 text-gray-500 animate-spin mr-2">
+                    <path d="M449.9 39.96l-48.5 48.53C362.5 53.19 311.4 32 256 32C161.5 32 78.59 92.34 49.58 182.2c-5.438 16.81 3.797 34.88 20.61 40.28c16.97 5.5 34.86-3.812 40.3-20.59C130.9 138.5 189.4 96 256 96c37.96 0 73 14.18 100.2 37.8L311.1 178C295.1 194.8 306.8 223.4 330.4 224h146.9C487.7 223.7 496 215.3 496 204.9V59.04C496 34.99 466.9 22.95 449.9 39.96zM441.8 289.6c-16.94-5.438-34.88 3.812-40.3 20.59C381.1 373.5 322.6 416 256 416c-37.96 0-73-14.18-100.2-37.8L200 334C216.9 317.2 205.2 288.6 181.6 288H34.66C24.32 288.3 16 296.7 16 307.1v145.9c0 24.04 29.07 36.08 46.07 19.07l48.5-48.53C149.5 458.8 200.6 480 255.1 480c94.45 0 177.4-60.34 206.4-150.2C467.9 313 458.6 294.1 441.8 289.6z"/>
+                  </svg>
+                  Importing</span>
+                : <>{group.count} documents • Last updated {timeAgo.format(Date.parse(group.lastUpdatedDoc.lastUpdatedAt))}</> }
             </div>
           </span>
         </a>

web/components/commands/documentation/AddDocumentation.tsx

@@ -44,7 +44,7 @@ export const addDocumentationMap: Record<AddDocumentationType, AddDocumentationS
   webpage: {
     type: 'webpage',
     title: 'Web Page',
-    description: 'Add public web page with URL',
+    description: 'Add web page with URL',
   },
 }