Update the /Activity view to use email addresses from the /api/events response (#273 )

uses the events api response information to map user name and email
Fix last login for regular entries in users overview (#264 )
2026-09-23 00:30:43 -07:00 · 2023-09-23 10:45:27 +02:00 · 2023-09-23 10:40:22 +02:00 · 2023-09-22 16:32:40 +02:00 · 2023-09-20 10:58:26 +02:00 · 2023-09-19 15:13:31 +02:00
29 changed files with 1464 additions and 988 deletions
@@ -0,0 +1,56 @@
+import { Page, test, expect } from "@playwright/test";
+
+export class AccessControlPage {
+    private readonly accessControlUrl = 'http://localhost:3000/acls'
+    private readonly defaulAccessControl = this.page.getByRole('cell', { name: 'Default' })
+    private readonly deleteButton = this.page.getByRole('button', { name: 'Delete' })
+    private readonly deleteModal = this.page.getByTestId('confirm-delete-modal-title')
+    private readonly confirmButton = this.page.getByRole('button', { name: 'OK' })
+    private readonly addRulesButton = this.page.getByTestId('add-rule-empty-state-button')
+
+    constructor(private readonly page: Page) {}
+
+      async openAccessControlPage() {
+        await test.step('Open Access Control page', async () => {
+            await this.page.goto(this.accessControlUrl);
+        })
+      }
+  
+    async assertDefaultAccessCotrolIsCreated() {
+      await test.step('Assert that default cotrol access is created', async () => {
+          await expect(this.defaulAccessControl).toBeVisible();
+      })
+    }
+
+    async pressDeleteButton() {
+      await test.step('Press delete button', async () => {
+          await this.deleteButton.click();
+      })
+    }
+
+    async assertDeleteModalIsVisibile() {
+      await test.step('Assert access control deletion modal is visible', async () => {
+          await expect(this.deleteModal).toBeVisible();
+      })
+    }
+
+    async pressConfirmButton() {
+      await test.step('Press confirm button on access control deletion modal', async () => {
+        await this.confirmButton.click();
+      })
+    }
+
+    async assertDefaultAccessCotrolIsDeleted() {
+      await test.step('Assert default access control should be deleted', async () => {
+          await expect(this.defaulAccessControl).not.toBeVisible();
+      })
+    }
+
+    async assertAddRuleButtonIsVisile() {
+      await test.step('Assert Add Rules button is visible', async () => {
+          await expect(this.addRulesButton).toBeVisible();
+      })
+    }
+  }
+
+export default AccessControlPage;
@@ -0,0 +1,34 @@
+import { Page, test, expect} from "@playwright/test";
+
+export class LoginPage {
+    private readonly localUrl = 'http://localhost:3000/'
+    private readonly usernameField = this.page.getByPlaceholder('username@domain')
+    private readonly nextButton = this.page.getByRole('button', { name: 'next' })
+    private readonly passwordField = this.page.getByLabel('Password')
+    private readonly skipButton = this.page.getByRole('button', { name: 'skip' });
+    private readonly netBirdLogo = this.page.getByRole('link', { name: 'logo' })
+
+    constructor(private readonly page: Page) {}
+
+      async doLogin() {
+        await test.step('Login to local enviroment', async () => {
+          await this.page.goto(this.localUrl);
+          await this.usernameField.fill('admin@localhost');
+          await this.pressNextButton();
+          await this.passwordField.fill('testMe123@');
+          await this.pressNextButton();
+          if (await this.skipButton.isVisible({ timeout: 300 })) {
+              await this.skipButton.click();
+          }
+          await expect(this.netBirdLogo).toBeVisible();
+        })
+      }
+
+      async pressNextButton() {
+        await test.step('Press next button', async () => {
+          await this.nextButton.click();
+        })
+      }
+    }
+
+export default LoginPage;
@@ -1,4 +1,4 @@
-import { Page, test, expect } from "@playwright/test";
+import { Page, test } from "@playwright/test";

 export class PeersPage {
    private readonly addNewPeerButton = this.page.getByTestId('add-new-peer-button')
@@ -1,33 +1,22 @@
-import { test, expect } from '@playwright/test';
-import {AddPeerModal} from '../pages/modals/add-peer-modal'
-import {TopMenu} from '../pages/top-menu';
+import { test } from '@playwright/test'
+import {LoginPage} from '../pages/login-page'
+import {AccessControlPage} from '../pages/access-control-page'

-const URL = 'https://app.netbird.io/'
-const localUrl = 'http://localhost:3000/'
-let addPeerModal: AddPeerModal;
-let topMenu: TopMenu;
+let loginPage: LoginPage
+let accessControlPage: AccessControlPage

 test.beforeEach(async ({ page }) => {
-  addPeerModal = new AddPeerModal(page);
-  await page.goto(localUrl);
-  await page.getByPlaceholder('username@domain').fill('admin@localhost');
-  await page.getByRole('button', { name: 'next' }).click();
-  await page.getByLabel('Password').fill('testMe123@');
-  await page.getByRole('button', { name: 'next' }).click();
-  const skipButton = page.getByRole('button', { name: 'skip' });
-  if (await skipButton.isVisible({ timeout: 300 })) {
-      await skipButton.click();
-  }
-  await addPeerModal.assertPeerModalIsVisible();
+  loginPage = new LoginPage(page);
+  await loginPage.doLogin();
 });

 test('Confirm that new user has Default access', async ({ page }) => {
-  topMenu = new TopMenu(page);
-  await addPeerModal.closeAddPeerModal();
-  await addPeerModal.assertPeerModalIsNotVisible();
-  await topMenu.clickOnAccessControlOnTopMenu();
-  await expect(page.getByRole('cell', { name: 'Default' })).toBeVisible();
-  await page.getByRole('button', { name: 'Delete' }).click();
-  await expect(page.getByTestId('confirm-delete-modal-title')).toBeVisible();
-  await page.getByRole('button', { name: 'Cancel' }).click();
+  accessControlPage = new AccessControlPage(page);
+  await accessControlPage.openAccessControlPage();
+  await accessControlPage.assertDefaultAccessCotrolIsCreated();
+  await accessControlPage.pressDeleteButton();
+  await accessControlPage.assertDeleteModalIsVisibile();
+  await accessControlPage.pressConfirmButton();
+  await accessControlPage.assertDefaultAccessCotrolIsDeleted();
+  await accessControlPage.assertAddRuleButtonIsVisile();
 });
@@ -1,48 +1,41 @@
-import { test } from '@playwright/test';
+import { test } from '@playwright/test'
 import {AddPeerModal} from '../pages/modals/add-peer-modal'
 import {PeersPage} from '../pages/peers-page'
+import {LoginPage} from '../pages/login-page'

-const URL = 'https://app.netbird.io/'
-const localUrl = 'http://localhost:3000/'
-let addPeerModal: AddPeerModal;
-let peersPage: PeersPage;
+let addPeerModal: AddPeerModal
+let peersPage: PeersPage
+let loginPage: LoginPage

 test.beforeEach(async ({ page }) => {
  addPeerModal = new AddPeerModal(page);
-  await page.goto(localUrl);
-  await page.getByPlaceholder('username@domain').fill('admin@localhost');
-  await page.getByRole('button', { name: 'next' }).click();
-  await page.getByLabel('Password').fill('testMe123@');
-  await page.getByRole('button', { name: 'next' }).click();
-  const skipButton = page.getByRole('button', { name: 'skip' });
-  if (await skipButton.isVisible({ timeout: 300 })) {
-      await skipButton.click();
-  }
+  loginPage = new LoginPage(page);
+  await loginPage.doLogin();
  await addPeerModal.assertPeerModalIsVisible();
 });

-test('Test Linux tab on a first access add peer modal / @bc', async function ({ }) {
+test('Test Linux tab on a first access add peer modal / @bc', async function () {
    await addPeerModal.openLinuxTab();
    await addPeerModal.assertLinuxTabHasCorrectText();
  });

-test('Test Windows tab on a first access add peer modal / @bc', async ({ }) => {
+test('Test Windows tab on a first access add peer modal / @bc', async () => {
  await addPeerModal.openWindowsTab();
  await addPeerModal.assertWindowsDownloadButtonHasCorrectLink();
 });

-test('Test MacOS tab on a first access add peer modal / @bc', async ({ }) => {
+test('Test MacOS tab on a first access add peer modal / @bc', async () => {
  await addPeerModal.openMacTab();
  await addPeerModal.assertIntelDownloadButtonHasCorrectLink();
  await addPeerModal.assertM1M2DownloadButtonHasCorrectLink();
 });

-test('Test Android tab on a first access add peer modal', async ({  }) => {
+test('Test Android tab on a first access add peer modal', async () => {
  await addPeerModal.openAndroidTab();
  await addPeerModal.assertAndroidDownloadButtonHasCorrectLink();
 });

- test('Test Docker tab on a first access add peer modal', async ({  }) => {
+ test('Test Docker tab on a first access add peer modal', async () => {
  await addPeerModal.openDockerTab();
  await addPeerModal.assertDockerDownloadButtonHasCorrectLink();
 });
@@ -12,8 +12,6 @@
        "@axa-fr/react-oidc": "^5.14.0",
        "@headlessui/react": "^1.5.0",
        "@heroicons/react": "^1.0.4",
-        "@stripe/react-stripe-js": "^2.1.2",
-        "@stripe/stripe-js": "^2.1.0",
        "@testing-library/jest-dom": "^5.11.4",
        "@testing-library/react": "^11.1.0",
        "@testing-library/user-event": "^12.1.10",
@@ -3407,24 +3405,6 @@
        "@sinonjs/commons": "^1.7.0"
      }
    },
-    "node_modules/@stripe/react-stripe-js": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@stripe/react-stripe-js/-/react-stripe-js-2.1.2.tgz",
-      "integrity": "sha512-2JcKRvOdMD698uGrY0cINLHb6XHnY24L+wlWlw2+TbI2aXlQZ9t8Mc+KssFES+EuNgISbrp7fJR3w/13epfiOw==",
-      "dependencies": {
-        "prop-types": "^15.7.2"
-      },
-      "peerDependencies": {
-        "@stripe/stripe-js": "^1.44.1 || ^2.0.0",
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
-      }
-    },
-    "node_modules/@stripe/stripe-js": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@stripe/stripe-js/-/stripe-js-2.1.0.tgz",
-      "integrity": "sha512-AdMHWqIq/s3TLmoyuzdb6l21STKDKNm82cjce1VelyQGinVNjVgSEPH5UDtxENEP7OzgMZH8RTphFMi0fMJGLQ=="
-    },
    "node_modules/@surma/rollup-plugin-off-main-thread": {
      "version": "2.2.3",
      "resolved": "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz",
@@ -19497,19 +19477,6 @@
        "@sinonjs/commons": "^1.7.0"
      }
    },
-    "@stripe/react-stripe-js": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@stripe/react-stripe-js/-/react-stripe-js-2.1.2.tgz",
-      "integrity": "sha512-2JcKRvOdMD698uGrY0cINLHb6XHnY24L+wlWlw2+TbI2aXlQZ9t8Mc+KssFES+EuNgISbrp7fJR3w/13epfiOw==",
-      "requires": {
-        "prop-types": "^15.7.2"
-      }
-    },
-    "@stripe/stripe-js": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@stripe/stripe-js/-/stripe-js-2.1.0.tgz",
-      "integrity": "sha512-AdMHWqIq/s3TLmoyuzdb6l21STKDKNm82cjce1VelyQGinVNjVgSEPH5UDtxENEP7OzgMZH8RTphFMi0fMJGLQ=="
-    },
    "@surma/rollup-plugin-off-main-thread": {
      "version": "2.2.3",
      "resolved": "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz",
@@ -7,8 +7,6 @@
    "@axa-fr/react-oidc": "^5.14.0",
    "@headlessui/react": "^1.5.0",
    "@heroicons/react": "^1.0.4",
-    "@stripe/react-stripe-js": "^2.1.2",
-    "@stripe/stripe-js": "^2.1.0",
    "@testing-library/jest-dom": "^5.11.4",
    "@testing-library/react": "^11.1.0",
    "@testing-library/user-event": "^12.1.10",
@@ -81,7 +79,7 @@
    ]
  },
  "devDependencies": {
-    "@playwright/test": "^1.36.2",
-    "@types/react-syntax-highlighter": "^15.5.3"
+    "@types/react-syntax-highlighter": "^15.5.3",
+    "@playwright/test": "^1.36.2"
  }
 }
@@ -39,15 +39,15 @@ export default defineConfig({
      use: { channel: 'chrome', },
    },

-    {
-      name: 'firefox',
-      use: {  browserName: 'firefox', },
-    },
-
-    {
-      name: 'webkit',
-      use: { browserName: 'webkit', },
-    },
+    // {
+    //   name: 'firefox',
+    //   use: {  browserName: 'firefox', },
+    // },
+    //
+    // {
+    //   name: 'webkit',
+    //   use: { browserName: 'webkit', },
+    // },

    /* Test against mobile viewports. */
    // {
@@ -1,11 +0,0 @@
-{
-  "auth0Auth": "true",
-  "authAuthority": "https://netbird-localdev.eu.auth0.com",
-  "authClientId": "kBRMAOqIZ7hvpVCaypQLCJvTzkYYIXVt",
-  "authScopesSupported": "openid profile email api offline_access email_verified",
-  "authAudience": "http://localhost:3000/",
-
-  "apiOrigin": "http://0.0.0.0",
-  "grpcApiOrigin": "http://0.0.0.0:80",
-  "latestVersion": "v0.6.3"
-}
@@ -284,7 +284,7 @@ const AccessControlNew = () => {
      <Divider style={{ margin: "8px 0" }} />
      <Row style={{ padding: "0 8px 4px" }}>
        <Col flex="auto">
-          <Text type={"secondary"}>Add new ports by pressing "Enter"</Text>
+          <Text type={"secondary"}>Add new groups by pressing "Enter"</Text>
        </Col>
        <Col flex="none">
          <svg
@@ -179,6 +179,13 @@ const PeerUpdate = (props: any) => {

  useEffect(() => {}, [users]);

+  const routeAddAllowed = (os: string): boolean => {
+    return os !== ""
+        && !os.toLowerCase().startsWith("darwin")
+        && !os.toLowerCase().startsWith("windows")
+        && !os.toLowerCase().startsWith("android")
+  }
+
  const toggleEditName = (status: boolean, value?: string) => {
    setEditName(status);

@@ -965,6 +972,7 @@ const PeerUpdate = (props: any) => {
          {/* --- */}
          {!isGroupUpdateView && (
            <>
+              {routeAddAllowed(peer.os) &&
              <Card
                bordered={true}
                // loading={loading}ƒ
@@ -1090,7 +1098,7 @@ const PeerUpdate = (props: any) => {
                    </Space>
                  )}
                </div>
-              </Card>
+              </Card>}

              <Card bordered={true} style={{ marginBottom: "50px" }}>
                <Col span={24}>
@@ -13,6 +13,7 @@ import {
  Tag,
  Typography,
  Card,
+  Tooltip,
 } from "antd";
 import { RootState } from "typesafe-actions";
 import {
@@ -54,7 +55,7 @@ const SetupKeyNew = (props: any) => {
  const savedSetupKey = useSelector(
    (state: RootState) => state.setupKey.savedSetupKey
  );
-
+ 
  const groups = useSelector((state: RootState) => state.group.data);

  const [form] = Form.useForm();
@@ -91,14 +92,13 @@ const SetupKeyNew = (props: any) => {
        .filter((g) => allGroups.get(g))
        .map((g) => allGroups.get(g)!.name);
    }
-
    const fSetupKey = {
      ...setupKey,
      autoGroupNames: setupKey.auto_groups || [],
      exp: moment(setupKey.expires),
      last: moment(setupKey.last_used),
    } as FormSetupKey;
-    form.setFieldsValue(fSetupKey);
+     form.setFieldsValue(fSetupKey);
    setFormSetupKey(fSetupKey);
  }, [setupKey]);

@@ -117,6 +117,7 @@ const SetupKeyNew = (props: any) => {
      groupsToCreate: groupsToCreate,
      expires_in: expiresIn,
      usage_limit: formSetupKey.usage_limit,
+      ephemeral: formSetupKey.ephemeral,
    } as SetupKeyToSave;
  };

@@ -125,8 +126,7 @@ const SetupKeyNew = (props: any) => {
      await form.validateFields();
    } catch (e) {
      const errorFields = (e as any).errorFields;
-      return console.log("errorInfo", errorFields);
-    }
+     }

    const setupKeyToSave = createSetupKeyToSave();
    dispatch(
@@ -257,8 +257,7 @@ const SetupKeyNew = (props: any) => {
    dispatch(personalAccessTokenActions.resetPersonalAccessTokens(null));
    setVisibleNewSetupKey(false);
  };
-
-  return (
+   return (
    <>
      {!isGroupUpdateView && (
        <Breadcrumb
@@ -302,13 +301,9 @@ const SetupKeyNew = (props: any) => {
            {!isGroupUpdateView && (
              <Row style={{ marginTop: "10px" }}>
                <Col
-                  xs={24}
                  sm={24}
-                  md={11}
-                  lg={11}
-                  xl={11}
-                  xxl={11}
-                  span={11}
+                  md={8}
+                  lg={8}
                  style={{
                    paddingRight: "70px",
                  }}
@@ -342,7 +337,14 @@ const SetupKeyNew = (props: any) => {
                  />
                </Col>

-                <Col xs={24} sm={24} md={5} lg={5} xl={5} xxl={5} span={5}>
+                <Col
+                  sm={24}
+                  md={8}
+                  lg={6}
+                  style={{
+                    paddingRight: "70px",
+                  }}
+                >
                  <Paragraph
                    style={{
                      whiteSpace: "pre-line",
@@ -357,8 +359,48 @@ const SetupKeyNew = (props: any) => {
                        fontWeight: "500",
                      }}
                    ></Paragraph>
-                    {formSetupKey.type === "one-off" ? "One-off" : "Reusable"},
-                    available uses
+                    Type{" "}
+                    {formSetupKey.ephemeral ? (
+                      <Tooltip title="Peers that are offline for over 10 minutes will be removed automatically">
+                        <Tag>
+                          <Text type="secondary" style={{ fontSize: 10 }}>
+                            Ephemeral
+                          </Text>
+                        </Tag>
+                      </Tooltip>
+                    ) : (
+                      " "
+                    )}
+                  </Paragraph>
+                  <Col>
+                    <Input
+                      disabled
+                      value={
+                        formSetupKey.type === "one-off" ? "One-off" : "Reusable"
+                      }
+                      suffix={<LockOutlined style={{ color: "#BFBFBF" }} />}
+                      style={{ marginTop: "8px" }}
+                    />
+                  </Col>
+                </Col>
+
+                <Col sm={24} md={8} lg={3}>
+                  <Paragraph
+                    style={{
+                      whiteSpace: "pre-line",
+                      margin: 0,
+                      fontWeight: "500",
+                    }}
+                  >
+                    <Paragraph
+                      style={{
+                        whiteSpace: "pre-line",
+                        margin: 0,
+                        fontWeight: "500",
+                      }}
+                    ></Paragraph>
+                    {/* {formSetupKey.type === "one-off" ? "One-off" : "Reusable"}, */}
+                    Available uses
                  </Paragraph>
                  <Col>
                    <Input
@@ -376,6 +418,25 @@ const SetupKeyNew = (props: any) => {
                </Col>
              </Row>
            )}
+            <Row style={{ marginTop: `${isGroupUpdateView ? "0" : "39px"}` }}>
+              {!isGroupUpdateView && (
+                <Col xs={24} sm={24} md={5} lg={5} xl={5} xxl={5} span={5}>
+                  <Paragraph style={{ margin: 0, fontWeight: "500" }}>
+                    Expires
+                  </Paragraph>
+                  <Row>
+                    <Input
+                      style={{ marginTop: "8px" }}
+                      disabled
+                      suffix={<LockOutlined style={{ color: "#BFBFBF" }} />}
+                      value={
+                        customExpiresFormat(new Date(formSetupKey.expires))!
+                      }
+                    />
+                  </Row>
+                </Col>
+              )}
+            </Row>
            <Row style={{ marginTop: `${isGroupUpdateView ? "0" : "39px"}` }}>
              <Col
                xs={24}
@@ -413,7 +474,7 @@ const SetupKeyNew = (props: any) => {
                      dropdownRender={dropDownRender}
                      // enabled only when we have a new key !setupkey.id or when the key is valid
                      disabled={!(!setupKey.id || setupKey.valid)}
-                      optionFilterProp="serchValue"
+                      optionFilterProp="searchValue"
                    >
                      {tagGroups.map((m, index) => (
                        <Option key={index} value={m.id} serchValue={m.name}>
@@ -424,23 +485,6 @@ const SetupKeyNew = (props: any) => {
                  </Form.Item>
                </Col>
              </Col>
-              {!isGroupUpdateView && (
-                <Col xs={24} sm={24} md={5} lg={5} xl={5} xxl={5} span={5}>
-                  <Paragraph style={{ margin: 0, fontWeight: "500" }}>
-                    Expires
-                  </Paragraph>
-                  <Row>
-                    <Input
-                      style={{ marginTop: "8px" }}
-                      disabled
-                      suffix={<LockOutlined style={{ color: "#BFBFBF" }} />}
-                      value={
-                        customExpiresFormat(new Date(formSetupKey.expires))!
-                      }
-                    />
-                  </Row>
-                </Col>
-              )}
            </Row>
          </Form>
        </div>
@@ -75,6 +75,7 @@ const SetupKeyNew = () => {
    const expiresIn = formSetupKey.expires_in
      ? formSetupKey.expires_in * 24 * 3600
      : 7 * 24 * 3600; // the api expects seconds we have days
+
    return {
      id: formSetupKey.id,
      name: formSetupKey.name,
@@ -84,6 +85,7 @@ const SetupKeyNew = () => {
      groupsToCreate: groupsToCreate,
      expires_in: expiresIn,
      usage_limit: formSetupKey.usage_limit,
+      ephemeral: formSetupKey.ephemeral,
    } as SetupKeyToSave;
  };

@@ -155,6 +157,7 @@ const SetupKeyNew = () => {
        usage_limit: 0,
        used_times: 0,
        expires_in: 7,
+        ephemeral: false,
      } as SetupKey)
    );
    setFormSetupKey({} as FormSetupKey);
@@ -487,6 +490,42 @@ const SetupKeyNew = () => {
              </Col>
            </Row>

+            <Row style={{ marginTop: "24px" }} justify={"space-between"}>
+              <Col span={18}>
+                <Paragraph
+                  style={{
+                    whiteSpace: "pre-line",
+                    margin: 0,
+                    fontWeight: "500",
+                  }}
+                >
+                  Ephemeral peers
+                </Paragraph>
+                <Paragraph
+                  type={"secondary"}
+                  style={{ whiteSpace: "pre-line", margin: 0 }}
+                >
+                  Peers that are offline for over 10 minutes will be removed
+                  automatically
+                </Paragraph>
+              </Col>
+              <Col span={6}>
+                <Row justify={"end"}>
+                  <Form.Item name="ephemeral" valuePropName="checked">
+                    <Switch
+                      size="small"
+                      onChange={(checked) => {
+                        setFormSetupKey({
+                          ...formSetupKey,
+                          ephemeral: checked,
+                        });
+                      }}
+                    />
+                  </Form.Item>
+                </Row>
+              </Col>
+            </Row>
+
            <Row style={{ marginTop: "24px" }}>
              <Col span={24}>
                <Paragraph
@@ -519,4 +519,13 @@ ul.ant-list-items {
 .nohover {
    background: transparent!important;
    cursor: text;
+}
+.emp-wrapper {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.emp-wrapper p {
+  margin: 0;
 }
@@ -1,11 +1,20 @@
 import {ExpiresInValue} from "../../views/ExpiresInInput";

 export interface Account {
-    id: string;
-    settings: { peer_login_expiration_enabled: boolean, peer_login_expiration: number}
+  id: string;
+  settings: {
+    peer_login_expiration_enabled: boolean;
+    peer_login_expiration: number;
+    jwt_groups_enabled: boolean;
+    groups_propagation_enabled: boolean;
+    jwt_groups_claim_name: string;
+  };
 }

 export interface FormAccount extends Account {
-    peer_login_expiration_enabled: boolean
-    peer_login_expiration_formatted : ExpiresInValue
+  peer_login_expiration_enabled: boolean;
+  jwt_groups_enabled: boolean;
+  groups_propagation_enabled: boolean;
+  jwt_groups_claim_name: string;
+  peer_login_expiration_formatted: ExpiresInValue;
 }
@@ -1,9 +1,11 @@
 export interface Event {
-    id: string;
-    timestamp: string
-    activity: string
-    activity_code: string
-    initiator_id: string
-    target_id: string
-    meta: { [key: string]: string }
+  id: string;
+  timestamp: string;
+  activity: string;
+  activity_code: string;
+  initiator_id: string;
+  initiator_email: string;
+  initiator_name: string;
+  target_id: string;
+  meta: { [key: string]: string };
 }
@@ -63,7 +63,8 @@ export function* saveSetupKey(action: ReturnType<typeof actions.saveSetupKey.req
                    auto_groups: newGroups,
                    type: keyToSave.type,
                    expires_in: keyToSave.expires_in,
-                    usage_limit: keyToSave.usage_limit
+                    usage_limit: keyToSave.usage_limit,
+                    ephemeral: keyToSave.ephemeral
                } as SetupKeyToSave
            });
        } else {
@@ -14,6 +14,7 @@ export interface SetupKey {
  auto_groups: string[]
  expires_in: number;
  usage_limit: any;
+  ephemeral: boolean;
 }

 export interface FormSetupKey extends SetupKey {
@@ -1,54 +1,72 @@
-import {ActionType, createAction, createAsyncAction} from 'typesafe-actions';
-import {User, UserToSave} from './types';
-import {ApiError, CreateResponse, DeleteResponse, RequestPayload} from '../../services/api-client/types';
+import { ActionType, createAction, createAsyncAction } from "typesafe-actions";
+import { User, UserToSave } from "./types";
+import {
+  ApiError,
+  CreateResponse,
+  DeleteResponse,
+  RequestPayload,
+} from "../../services/api-client/types";

 const actions = {
  getUsers: createAsyncAction(
-      'GET_USERS_REQUEST',
-      'GET_USERS_SUCCESS',
-      'GET_USERS_FAILURE',
+    "GET_USERS_REQUEST",
+    "GET_USERS_SUCCESS",
+    "GET_USERS_FAILURE"
  )<RequestPayload<null>, User[], ApiError>(),

  getServiceUsers: createAsyncAction(
-      'GET_SERVICE_USERS_REQUEST',
-      'GET_SERVICE_USERS_SUCCESS',
-      'GET_SERVICE_USERS_FAILURE',
+    "GET_SERVICE_USERS_REQUEST",
+    "GET_SERVICE_USERS_SUCCESS",
+    "GET_SERVICE_USERS_FAILURE"
  )<RequestPayload<null>, User[], ApiError>(),

  getRegularUsers: createAsyncAction(
-      'GET_REGULAR_USERS_REQUEST',
-      'GET_REGULAR_USERS_SUCCESS',
-      'GET_REGULAR_USERS_FAILURE',
+    "GET_REGULAR_USERS_REQUEST",
+    "GET_REGULAR_USERS_SUCCESS",
+    "GET_REGULAR_USERS_FAILURE"
  )<RequestPayload<null>, User[], ApiError>(),

  deleteUser: createAsyncAction(
-        'DELETE_USER_REQUEST',
-       'DELETE_USER_SUCCESS',
-         'DELETE_USER_FAILURE',
-    )<RequestPayload<string>, DeleteResponse<string | null>, DeleteResponse<string | null>>(),
-  setDeletedUser: createAction('SET_DELETED_USER')<DeleteResponse<string | null>>(),
-  resetDeletedUser: createAction('RESET_DELETED_USER')<null>(),
+    "DELETE_USER_REQUEST",
+    "DELETE_USER_SUCCESS",
+    "DELETE_USER_FAILURE"
+  )<
+    RequestPayload<string>,
+    DeleteResponse<string | null>,
+    DeleteResponse<string | null>
+  >(),
+  setDeletedUser:
+    createAction("SET_DELETED_USER")<DeleteResponse<string | null>>(),
+  resetDeletedUser: createAction("RESET_DELETED_USER")<null>(),

  // used to set a user object that was picked in the user table in the UserUpdate drawer (user update window on right-side).
-  setUser: createAction('SET_USER')<User>(),
+  setUser: createAction("SET_USER")<User>(),
  // used to make the UserUpdate drawer visible in the UI.
-  setUpdateUserDrawerVisible: createAction('SET_UPDATE_USER_VISIBLE')<boolean>(),
+  setUpdateUserDrawerVisible: createAction(
+    "SET_UPDATE_USER_VISIBLE"
+  )<boolean>(),
  // used to make the ViewUserPopup visible in the UI.
-  setInviteUserPopupVisible: createAction('SET_INVITE_USER_VISIBLE')<boolean>(),
+  setInviteUserPopupVisible: createAction("SET_INVITE_USER_VISIBLE")<boolean>(),
  // used to make the EditUserPopup visible in the UI.
-  setEditUserPopupVisible: createAction('SET_EDIT_USER_VISIBLE')<boolean>(),
+  setEditUserPopupVisible: createAction("SET_EDIT_USER_VISIBLE")<boolean>(),
  // used to make the AddServiceUserPopup visible in the UI.
-  setAddServiceUserPopupVisible: createAction('SET_ADD_SERVICE_USER_VISIBLE')<boolean>(),
+  setAddServiceUserPopupVisible: createAction(
+    "SET_ADD_SERVICE_USER_VISIBLE"
+  )<boolean>(),
  // used to remember what tab was open on users page
-  setUserTabOpen: createAction('SET_USER_TAB_OPEN')<string>(),
+  setUserTabOpen: createAction("SET_USER_TAB_OPEN")<string>(),

  saveUser: createAsyncAction(
-      'SAVE_USER_REQUEST',
-      'SAVE_USER_SUCCESS',
-      'SAVE_USER_FAILURE',
-  )<RequestPayload<UserToSave>, CreateResponse<User | null>, CreateResponse<User | null>>(),
-  setSavedUser: createAction('SET_SAVED_USER')<CreateResponse<User | null>>(),
-  resetSavedUser: createAction('RESET_SAVED_USER')<null>(),
+    "SAVE_USER_REQUEST",
+    "SAVE_USER_SUCCESS",
+    "SAVE_USER_FAILURE"
+  )<
+    RequestPayload<UserToSave>,
+    CreateResponse<User | null>,
+    CreateResponse<User | null>
+  >(),
+  setSavedUser: createAction("SET_SAVED_USER")<CreateResponse<User | null>>(),
+  resetSavedUser: createAction("RESET_SAVED_USER")<null>(),
 };

 export type ActionTypes = ActionType<typeof actions>;
Author	SHA1	Message	Date
Sarooj bukhari	6c87f53195	Update the /Activity view to use email addresses from the /api/events response (#273 ) uses the events api response information to map user name and email	2023-09-23 10:45:27 +02:00
pascal-fischerandMaycon Santos	9bbbff7dc0	Fix last login for regular entries in users overview (#264 ) * add last login to user overview for regular entries without tag * add backward compatability to properly show with older version of management * Merge main and update delete user popup messages --------- Co-authored-by: Maycon Santos <mlsmaycon@gmail.com>	2023-09-23 10:40:22 +02:00
Sarooj bukhari	04a20fa31f	add new fields on setting pag (#258 )	2023-09-22 16:32:40 +02:00
Misha Bragin	3797db93f0	Hide network routes card for non-linux peers (#269 )	2023-09-20 10:58:26 +02:00
Sarooj bukhari	2e81765e85	add delete user functionality (#272 )	2023-09-19 15:13:31 +02:00
Yoann N	cb9f76c0fc	typo in ac creation (#266 )	2023-09-18 23:22:52 +02:00
Sarooj bukhariandMaycon Santos	54accb665c	setup ui (#268 ) * setup ui * capital letter --------- Co-authored-by: Maycon Santos <mlsmaycon@gmail.com>	2023-09-07 20:26:34 +02:00
Maycon Santos	cfea3bd489	Add ephemeral peers views and subviews (#267 )	2023-09-06 13:36:23 +02:00
Zoltan Papp	a44a1c5424	Feature/ephemeral peers (#263 ) * Add ephemeral peer switch for SetupKeyNew component * Add "sys" handling in activity view	2023-09-04 13:49:11 +02:00
Sarooj bukhari	c2c044421f	Peer search bug (#262 )	2023-08-25 12:25:58 +02:00
Yulia	e8d57c3445	Fix flaky Access control test (#261 ) Fixed flaky test by changing the way to access Access Control Page and add some test ids of Add Rules buttons. Temporary removed tests for Firefox and webkit(safari)	2023-08-22 11:38:11 +02:00
pascal-fischer	0b892c0056	Add User last login and new events Add last login to users overview list. Additionally added new events for dashboard login, peer expiration and peer login.	2023-08-18 19:23:56 +02:00
Misha Bragin	14d9b80029	Limit UI view for the "user" role (#259 )	2023-08-15 22:36:21 +02:00