Merge

dust-tt · Oct 26, 2023 · 85a30b0 · 85a30b0
1 parent a34f9fb
commit 85a30b0
Showing 1 changed file with 42 additions and 0 deletions.
diff --git a/front/pages/w/[wId]/workspace/index.tsx b/front/pages/w/[wId]/workspace/index.tsx
@@ -316,11 +316,53 @@ export default function WorkspaceAdmin({
                 }}
               />
             </div>
+<<<<<<< HEAD
 <<<<<<< HEAD
           </Page.Vertical>
 =======
           </>
 >>>>>>> 8f36eb7c (Polishing Admin Pages)
+=======
+          </>
+        )}
+        {!!monthOptions.length && (
+          <Page.Vertical align="stretch" gap="md">
+            <Page.SectionHeader
+              title="Workspace Activity"
+              description="Download monthly workspace activity details."
+            />
+            <Page.Horizontal>
+              <DropdownMenu>
+                <DropdownMenu.Button>
+                  <Button
+                    type="select"
+                    labelVisible={true}
+                    label={selectedMonth || ""}
+                    variant="secondary"
+                    size="sm"
+                  />
+                </DropdownMenu.Button>
+                <DropdownMenu.Items origin="topLeft">
+                  {monthOptions.map((month) => (
+                    <DropdownMenu.Item
+                      key={month}
+                      label={month}
+                      onClick={() => handleSelectMonth(month)}
+                    />
+                  ))}
+                </DropdownMenu.Items>
+              </DropdownMenu>
+              <Button
+                label="Download activity data"
+                icon={CloudArrowDownIcon}
+                variant="secondary"
+                onClick={() => {
+                  void handleDownload(selectedMonth);
+                }}
+              />
+            </Page.Horizontal>
+          </Page.Vertical>
+>>>>>>> 677de35a (Merge)
         )}
       </Page.Vertical>
     </AppLayout>