Merge branch 'dev' into mongo-action-store2

OpenMined · Oct 23, 2023 · 9e2c6a0 · 9e2c6a0
2 parents 4cdc87a + 6237264
commit 9e2c6a0
Show file tree

Hide file tree

Showing 26 changed files with 96 additions and 41 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.8.2-beta.39
+current_version = 0.8.2-beta.40
 tag = False
 tag_name = {new_version}
 commit = True

diff --git a/.github/workflows/pr-tests-frontend.yml b/.github/workflows/pr-tests-frontend.yml
@@ -198,9 +198,9 @@ jobs:
           # cache: "pnpm"
           # cache-dependency-path: packages/grid/frontend/pnpm-lock.yaml
 
-      # - name: Run Frontend Playwright e2e Tests
-      #   if: steps.changes.outputs.stack == 'true'
-      #   env:
-      #     DOCKER: true
-      #   run: |
-      #     tox -e frontend.test.e2e
+      - name: Run Frontend Playwright e2e Tests
+        if: steps.changes.outputs.stack == 'true'
+        env:
+          DOCKER: true
+        run: |
+          tox -e frontend.test.e2e
diff --git a/VERSION b/VERSION
@@ -1,5 +1,5 @@
 # Mono Repo Global Version
-__version__ = "0.8.2-beta.39"
+__version__ = "0.8.2-beta.40"
 # elsewhere we can call this file: `python VERSION` and simply take the stdout
 
 # stdlib

diff --git a/packages/grid/VERSION b/packages/grid/VERSION
@@ -1,5 +1,5 @@
 # Mono Repo Global Version
-__version__ = "0.8.2-beta.39"
+__version__ = "0.8.2-beta.40"
 # elsewhere we can call this file: `python VERSION` and simply take the stdout
 
 # stdlib

diff --git a/packages/grid/devspace.yaml b/packages/grid/devspace.yaml
@@ -15,13 +15,13 @@ pipelines:
     run: |-
       run_dependencies --all
       ensure_pull_secrets --all
-      build_images --all -t $(git rev-parse --short=6 HEAD) -t 0.8.2-beta.39 -t dev-latest
+      build_images --all -t $(git rev-parse --short=6 HEAD) -t 0.8.2-beta.40 -t dev-latest
       create_deployments --all
 
 vars:
   DEVSPACE_ENV_FILE: "default.env"
   CONTAINER_REGISTRY: "docker.io"
-  VERSION: "0.8.2-beta.39"
+  VERSION: "0.8.2-beta.40"
 
 # This is a list of `images` that DevSpace can build for this project
 # We recommend to skip image building during development (devspace dev) as much as possible

diff --git a/packages/grid/frontend/package.json b/packages/grid/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pygrid-ui",
-  "version": "0.8.2-beta.39",
+  "version": "0.8.2-beta.40",
   "private": true,
   "scripts": {
     "dev": "pnpm i && vite dev --host --port 80",

diff --git a/packages/grid/frontend/src/lib/components/Badge.svelte b/packages/grid/frontend/src/lib/components/Badge.svelte
@@ -2,7 +2,7 @@
   export let variant: 'gray' | 'primary-light' | 'primary-dark' = 'gray';
 </script>
 
-<span class={variant}>
+<span class={variant} data-testid="badge">
   <slot />
 </span>
 

diff --git a/packages/grid/frontend/src/lib/components/authentication/DomainMetadataPanel.svelte b/packages/grid/frontend/src/lib/components/authentication/DomainMetadataPanel.svelte
@@ -11,7 +11,10 @@
   $: domainInitials = getInitials(metadata?.name);
 </script>
 
-<section class="flex flex-col w-full sm:w-[36%] sm:min-w-[544px] max-w-[784px] gap-4 py-11 px-8">
+<section
+  class="flex flex-col w-full sm:w-[36%] sm:min-w-[544px] max-w-[784px] gap-4 py-11 px-8"
+  data-testid="domain-metadata-panel"
+>
   {#if metadata}
     <TagCloud tags={metadata.tags} />
     <div class="w-[97.5px] relative">

diff --git a/packages/grid/frontend/src/lib/components/authentication/Nav.svelte b/packages/grid/frontend/src/lib/components/authentication/Nav.svelte
@@ -9,11 +9,13 @@
   });
 </script>
 
-<nav class="flex justify-between items-center">
+<nav class="flex justify-between items-center" data-testid="auth-nav">
   <section class="flex gap-6 items-center w-min h-min">
     <img src="/assets/small-logo.png" alt="PyGrid logo" class="h-10 object-contain" />
     {#if version}
-      <p class="text-gray-400 whitespace-nowrap">Version {version}</p>
+      <p class="text-gray-400 whitespace-nowrap" data-testid="auth-nav-version">
+        Version {version}
+      </p>
     {/if}
   </section>
   <section>

diff --git a/packages/grid/frontend/tests/e2e/metadata-panel.spec.ts b/packages/grid/frontend/tests/e2e/metadata-panel.spec.ts
@@ -0,0 +1,11 @@
+import { test, expect } from '@playwright/test';
+
+test('should display domain metadata, has a valid id', async ({ page }) => {
+  await page.goto('/');
+  const metadataPanel = page.getByTestId('domain-metadata-panel');
+  expect(await metadataPanel.isVisible()).toBe(true);
+
+  // check if id is shown
+  const badge = metadataPanel.getByTestId('badge');
+  expect(await badge.textContent()).toBeTruthy();
+});
diff --git a/packages/grid/frontend/tests/e2e/nav.spec.ts b/packages/grid/frontend/tests/e2e/nav.spec.ts
@@ -0,0 +1,10 @@
+import { test, expect } from '@playwright/test';
+
+test('should display syft version in header', async ({ page }) => {
+  await page.goto('/');
+
+  // is the version showing?
+  const versionText = await page.getByTestId('auth-nav-version').textContent();
+  expect(versionText).toBeTruthy();
+  expect(versionText).toMatch(/version/i);
+});
diff --git a/packages/grid/frontend/tests/e2e/page.spec.ts b/packages/grid/frontend/tests/e2e/page.spec.ts
@@ -0,0 +1,13 @@
+import { test, expect } from '@playwright/test';
+
+test('should display the page correctly', async ({ page }) => {
+  await page.goto('/');
+  const title = await page.title();
+  expect(title).toBe('PyGrid');
+});
+
+test('should navigate to login page', async ({ page }) => {
+  await page.goto('/login');
+  const title = await page.title();
+  expect(title).toBe('PyGrid');
+});
diff --git a/packages/grid/helm/repo/index.yaml b/packages/grid/helm/repo/index.yaml
@@ -1,9 +1,25 @@
 apiVersion: v1
 entries:
   syft:
+  - apiVersion: v2
+    appVersion: 0.8.2-beta.40
+    created: "2023-10-22T13:02:54.368586813Z"
+    dependencies:
+    - name: component-chart
+      repository: https://charts.devspace.sh
+      version: 0.9.1
+    description: Perform numpy-like analysis on data that remains in someone elses
+      server
+    digest: 13509d464bd3f98b95dca5efacbc880e8a6efcefc5ca35d77d484f8891c0b06f
+    icon: https://raw.githubusercontent.com/OpenMined/PySyft/dev/docs/img/title_syft_light.png
+    name: syft
+    type: application
+    urls:
+    - https://openmined.github.io/PySyft/helm/syft-0.8.2-beta.40.tgz
+    version: 0.8.2-beta.40
   - apiVersion: v2
     appVersion: 0.8.2-beta.39
-    created: "2023-10-17T09:03:01.501190318Z"
+    created: "2023-10-22T13:02:54.368010476Z"
     dependencies:
     - name: component-chart
       repository: https://charts.devspace.sh
@@ -19,7 +35,7 @@ entries:
     version: 0.8.2-beta.39
   - apiVersion: v2
     appVersion: 0.8.2-beta.38
-    created: "2023-10-17T09:03:01.500060002Z"
+    created: "2023-10-22T13:02:54.367433309Z"
     dependencies:
     - name: component-chart
       repository: https://charts.devspace.sh
@@ -35,7 +51,7 @@ entries:
     version: 0.8.2-beta.38
   - apiVersion: v2
     appVersion: 0.8.2-beta.37
-    created: "2023-10-17T09:03:01.499483237Z"
+    created: "2023-10-22T13:02:54.366860409Z"
     dependencies:
     - name: component-chart
       repository: https://charts.devspace.sh
@@ -51,7 +67,7 @@ entries:
     version: 0.8.2-beta.37
   - apiVersion: v2
     appVersion: 0.8.1
-    created: "2023-10-17T09:03:01.498751844Z"
+    created: "2023-10-22T13:02:54.366267111Z"
     dependencies:
     - name: component-chart
       repository: https://charts.devspace.sh
@@ -65,4 +81,4 @@ entries:
     urls:
     - https://openmined.github.io/PySyft/helm/syft-0.8.1.tgz
     version: 0.8.1
-generated: "2023-10-17T09:03:01.498064433Z"
+generated: "2023-10-22T13:02:54.365542868Z"
diff --git a/packages/grid/helm/repo/syft-0.8.2-beta.40.tgz b/packages/grid/helm/repo/syft-0.8.2-beta.40.tgz
diff --git a/packages/grid/helm/syft/Chart.yaml b/packages/grid/helm/syft/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: syft
 description: Perform numpy-like analysis on data that remains in someone elses server
 type: application
-version: "0.8.2-beta.39"
-appVersion: "0.8.2-beta.39"
+version: "0.8.2-beta.40"
+appVersion: "0.8.2-beta.40"
 icon: https://raw.githubusercontent.com/OpenMined/PySyft/dev/docs/img/title_syft_light.png
 
 dependencies:

diff --git a/packages/grid/podman/podman-kube/podman-syft-kube.yaml b/packages/grid/podman/podman-kube/podman-syft-kube.yaml
@@ -41,7 +41,7 @@ spec:
         - configMapRef:
             name: podman-syft-config
 
-      image: docker.io/openmined/grid-backend:0.8.2-beta.39
+      image: docker.io/openmined/grid-backend:0.8.2-beta.40
       imagePullPolicy: IfNotPresent
       resources: {}
       tty: true
@@ -57,7 +57,7 @@ spec:
       envFrom:
         - configMapRef:
             name: podman-syft-config
-      image: docker.io/openmined/grid-frontend:0.8.2-beta.39
+      image: docker.io/openmined/grid-frontend:0.8.2-beta.40
       imagePullPolicy: IfNotPresent
       resources: {}
       tty: true

diff --git a/packages/hagrid/.bumpversion.cfg b/packages/hagrid/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.3.77
+current_version = 0.3.78
 tag = False
 tag_name = {new_version}
 commit = True

diff --git a/packages/hagrid/hagrid/deps.py b/packages/hagrid/hagrid/deps.py
@@ -42,7 +42,7 @@
 from .version import __version__
 
 LATEST_STABLE_SYFT = "0.8.1"
-LATEST_BETA_SYFT = "0.8.2-beta.39"
+LATEST_BETA_SYFT = "0.8.2-beta.40"
 
 DOCKER_ERROR = """
 You are running an old version of docker, possibly on Linux. You need to install v2.

diff --git a/packages/hagrid/hagrid/manifest_template.yml b/packages/hagrid/hagrid/manifest_template.yml
@@ -1,9 +1,9 @@
 manifestVersion: 0.1
-hagrid_version: 0.3.77
-syft_version: 0.8.2-beta.39
-dockerTag: 0.8.2-beta.39
+hagrid_version: 0.3.78
+syft_version: 0.8.2-beta.40
+dockerTag: 0.8.2-beta.40
 baseUrl: https://raw.githubusercontent.com/OpenMined/PySyft/
-hash: f81ed9bf568322aed2fb6eea423233fb38d05123
+hash: a12a0ca8d82b4b0c12289feeccadb7c1f8375d3f
 target_dir: ~/.hagrid/PySyft/
 files:
   grid:

diff --git a/packages/hagrid/hagrid/version.py b/packages/hagrid/hagrid/version.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # HAGrid Version
-__version__ = "0.3.77"
+__version__ = "0.3.78"
 
 if __name__ == "__main__":
     print(__version__)
diff --git a/packages/hagrid/setup.py b/packages/hagrid/setup.py
@@ -5,7 +5,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-__version__ = "0.3.77"
+__version__ = "0.3.78"
 
 DATA_FILES = {"img": ["hagrid/img/*.png"], "hagrid": ["*.yml"]}
 

diff --git a/packages/syft/setup.cfg b/packages/syft/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = syft
-version = attr: "0.8.2-beta.39"
+version = attr: "0.8.2-beta.40"
 description = Perform numpy-like analysis on data that remains in someone elses server
 author = OpenMined
 author_email = [email protected]

diff --git a/packages/syft/src/syft/VERSION b/packages/syft/src/syft/VERSION
@@ -1,5 +1,5 @@
 # Mono Repo Global Version
-__version__ = "0.8.2-beta.39"
+__version__ = "0.8.2-beta.40"
 # elsewhere we can call this file: `python VERSION` and simply take the stdout
 
 # stdlib

diff --git a/packages/syft/src/syft/__init__.py b/packages/syft/src/syft/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "0.8.2-beta.39"
+__version__ = "0.8.2-beta.40"
 
 # stdlib
 import pathlib

diff --git a/packages/syftcli/manifest.yml b/packages/syftcli/manifest.yml
@@ -1,11 +1,11 @@
 manifestVersion: 1.0
 
-syftVersion: 0.8.2-beta.39
-dockerTag: 0.8.2-beta.39
+syftVersion: 0.8.2-beta.40
+dockerTag: 0.8.2-beta.40
 
 images:
-  - docker.io/openmined/grid-frontend:0.8.2-beta.39
-  - docker.io/openmined/grid-backend:0.8.2-beta.39
+  - docker.io/openmined/grid-frontend:0.8.2-beta.40
+  - docker.io/openmined/grid-backend:0.8.2-beta.40
   - docker.io/library/mongo:latest
   - docker.io/traefik:v2.10
 

diff --git a/scripts/hagrid_hash b/scripts/hagrid_hash
@@ -1 +1 @@
-88589c42b08774c056bb2578a4b6c26d
+fd2a0d058ae65408d7214c6bb9e9195e
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		88589c42b08774c056bb2578a4b6c26d
		fd2a0d058ae65408d7214c6bb9e9195e