Core UI 2.0

.github/workflows/lint-web.yml

@@ -33,6 +33,9 @@ jobs:
         run: |
           npm i -g npm pnpm
           pnpm i --frozen-lockfile
+      - name: Build
+        working-directory: ./web
+        run: pnpm build
       - name: Lint
         working-directory: ./web
         run: pnpm run lint

.gitmodules

@@ -3,4 +3,4 @@
 	url = ../proto.git
 [submodule "web/src/shared/defguard-ui"]
 	path = web/src/shared/defguard-ui
-	url = ../ui.git
+	url = [email protected]:DefGuard/ui.git

Dockerfile

@@ -1,11 +1,10 @@
 FROM public.ecr.aws/docker/library/node:24 AS web
 
 WORKDIR /app
-COPY web/package.json web/pnpm-lock.yaml web/.npmrc ./
+COPY web/package.json web/pnpm-lock.yaml ./
 RUN npm i -g pnpm
 RUN pnpm install --ignore-scripts --frozen-lockfile
 COPY web/ .
-RUN pnpm run generate-translation-types
 RUN pnpm build
 
 FROM public.ecr.aws/docker/library/rust:1 AS chef
@@ -31,7 +30,6 @@ RUN cargo chef cook --release --recipe-path recipe.json
 
 # build project
 COPY --from=web /app/dist ./web/dist
-COPY web/src/shared/images/svg ./web/src/shared/images/svg
 RUN apt-get update && apt-get -y install protobuf-compiler libprotobuf-dev
 COPY Cargo.toml Cargo.lock ./
 # for vergen

e2e/config.ts

@@ -1,3 +1,4 @@
+import { table } from 'console';
 import { User } from './types';
 import { mergeObjects } from './utils/utils';
 
@@ -29,6 +30,25 @@ export const testsConfig: TestsConfig = mergeObjects(envConfig, defaultConfig);
 export const routes = {
   base: testsConfig.BASE_URL,
   me: '/me',
+  profile: '/user/',
+  tab: {
+    details: '?tab=details',
+    devices: '?tab=devices',
+    authentication_keys: '?tab=auth-keys',
+    api_tokens: '?tab=api-tokens',
+  },
+  firewall: {
+    rules: '/acl/rules',
+    aliases: '/acl/aliases',
+  },
+  locations: '/locations',
+  network_devices: '/network-devices',
+  openid_apps: '/openid',
+  webhooks: '/webhooks',
+  identity: {
+    users: '/users',
+    groups: '/groups',
+  },
   consent: '/consent',
   addDevice: '/add-device',
   auth: {
@@ -37,6 +57,14 @@ export const routes = {
     recovery: '/auth/mfa/recovery',
     email: '/auth/mfa/email',
   },
+  settings: {
+    base: '/settings',
+    smtp: '/settings/smtp',
+    openid: '/settings/openid',
+    tab: {
+      openid: '/settings?tab=openid',
+    },
+  },
   admin: {
     wizard: '/admin/wizard',
     users: '/admin/users',

e2e/tests/acl.spec.ts

@@ -0,0 +1,32 @@
+import { expect, test } from '@playwright/test';
+
+import { defaultUserAdmin, routes } from '../config';
+import { Protocols } from '../types';
+import { createAlias } from '../utils/acl';
+import { loginBasic } from '../utils/controllers/login';
+import { dockerRestart } from '../utils/docker';
+
+test.describe('Test aliases', () => {
+  // let testUser: User;
+
+  test.beforeEach(() => {
+    dockerRestart();
+    // testUser = { ...testUserTemplate, username: 'test' };
+  });
+
+  test('Create alias and check content', async ({ page, browser }) => {
+    const name = 'TestAlias';
+    const addresses = ['1.2.3.4/24', '10.10.10.10/20', '1.2.4.2'];
+    const ports = ['80', '443'];
+    const protocols = [Protocols.UDP, Protocols.ICMP];
+    await createAlias(browser, name, addresses, ports, protocols);
+    await loginBasic(page, defaultUserAdmin);
+    await page.goto(routes.base + routes.firewall.aliases);
+    const aliasRow = await page.locator('.virtual-row').filter({ hasText: name });
+    await expect(aliasRow).toBeVisible();
+    await expect(aliasRow).toContainText(addresses.join(', '));
+    await expect(aliasRow).toContainText(ports.join(', '));
+    await expect(aliasRow).toContainText(Protocols.UDP);
+    await expect(aliasRow).toContainText(Protocols.ICMP);
+  });
+});