From b31adf579ea7f1b8566782a4fb31a465a3cf5167 Mon Sep 17 00:00:00 2001
From: Clemens Tolboom <c.g.w.m.tolboom@umcg.nl>
Date: Wed, 29 Nov 2023 13:11:42 +0100
Subject: [PATCH 1/7] Fixes #524

---
 ui/README.md                         | 12 +++++++++++-
 ui/src/views/Profiles.vue            | 10 ++++++++++
 ui/tests/unit/views/Profiles.spec.ts | 28 ++++++++++++++++++++++++----
 3 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/ui/README.md b/ui/README.md
index dae52a4df..00da5ad59 100644
--- a/ui/README.md
+++ b/ui/README.md
@@ -1,4 +1,14 @@
-# Vue 3 + Vite
+# Armadillo UI
+
+## Test as a UI developer
+
+- `cd ui/`
+- make sure you have `yarn` installed.
+- `yarn test --watch`
+- change one of `src/**`
+- change corresponding `tests/unit/**`
+
+## How this project was generated
 
 This template should help get you started developing with Vue 3 in Vite. The template uses Vue 3 `<script setup>` SFCs, check out the [script setup docs](https://v3.vuejs.org/api/sfc-script-setup.html#sfc-script-setup) to learn more.
 
diff --git a/ui/src/views/Profiles.vue b/ui/src/views/Profiles.vue
index b4aa30b34..8030a1dc4 100644
--- a/ui/src/views/Profiles.vue
+++ b/ui/src/views/Profiles.vue
@@ -303,6 +303,16 @@ export default defineComponent({
         return profile.name;
       });
 
+      const imageParts = profile.image.split(":");
+      if (imageParts.length == 1) {
+        this.errorMessage = `Save failed: [${profile.image}] needs a version added. Try [${profile.image}:latest]`;
+        return;
+      }
+      if (imageParts.length > 2) {
+        this.errorMessage = `Save failed: [${profile.image}] needs a version added. Try [${imageParts[0]}:latest]`;
+        return;
+      }
+
       const hostPortCombo = `${profile.host}:${profile.port}`;
 
       const hasDuplicates = this.profiles.some(
diff --git a/ui/tests/unit/views/Profiles.spec.ts b/ui/tests/unit/views/Profiles.spec.ts
index 4bea5752b..49fa02f3d 100644
--- a/ui/tests/unit/views/Profiles.spec.ts
+++ b/ui/tests/unit/views/Profiles.spec.ts
@@ -54,7 +54,7 @@ describe("Profiles", () => {
 
         default_profile_not_running = {
             name: "default",
-            image: "datashield/armadillo-rserver",
+            image: "datashield/rock-base:version",
             host: "localhost",
             port: 6311,
             packageWhitelist: [
@@ -67,8 +67,7 @@ describe("Profiles", () => {
             },
             container: {
                 tags:  [
-                    "datashield/armadillo-rserver:2.0.0",
-                    "datashield/armadillo-rserver:latest"
+                    "datashield/rock-base:latest"
                   ],
                 status: "NOT_RUNNING"
             }
@@ -109,7 +108,7 @@ describe("Profiles", () => {
 
         profileToAdd = {
             name: "profile-two",
-            image: "other_source/profile-two",
+            image: "other_source/profile-two:version-two",
             host: "localhost",
             port: 6313,
             packageWhitelist: [
@@ -217,6 +216,27 @@ describe("Profiles", () => {
         expect(wrapper.vm.errorMessage).toBe("Save failed: cannot rename 'default' package.");
     });
 
+    test("bad image name 'A' for profile", () => {
+        wrapper.vm.profiles.unshift(profileToAdd);
+        let p = {... profileToAdd};
+        p.image = 'A';
+        wrapper.vm.profiles.unshift(p);
+        wrapper.vm.profileToEditIndex = 0;
+        wrapper.vm.saveEditedProfile();
+        expect(wrapper.vm.errorMessage).toBe("Save failed: [A] needs a version added. Try [A:latest]");
+    });
+
+    test("bad image name 'A:B:C' for profile", () => {
+        wrapper.vm.profiles.unshift(profileToAdd);
+        let p = {... profileToAdd};
+        p.image = 'A:B:C';
+        wrapper.vm.profiles.unshift(p);
+        wrapper.vm.profileToEditIndex = 0;
+        wrapper.vm.saveEditedProfile();
+        expect(wrapper.vm.errorMessage).toBe("Save failed: [A:B:C] needs a version added. Try [A:latest]");
+
+    });
+
     test("fail to use same port for profile", () => {
         wrapper.vm.profiles.unshift(profileToAdd);
         let p = {... profileToAdd};

From bdcf3a488ac121a6be7f6f2d0d7edc0fb5f2f26d Mon Sep 17 00:00:00 2001
From: Clemens Tolboom <c.g.w.m.tolboom@umcg.nl>
Date: Fri, 1 Dec 2023 14:59:50 +0100
Subject: [PATCH 2/7] Rewrite text.

---
 ui/README.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ui/README.md b/ui/README.md
index 00da5ad59..bf314d7b1 100644
--- a/ui/README.md
+++ b/ui/README.md
@@ -2,11 +2,14 @@
 
 ## Test as a UI developer
 
+From the terminal:
 - `cd ui/`
 - make sure you have `yarn` installed.
 - `yarn test --watch`
-- change one of `src/**`
-- change corresponding `tests/unit/**`
+
+Do your develop stuff and watch your test fail or succeed on the go. That is:
+- change files in `src/**`
+- change files in `tests/unit/**`
 
 ## How this project was generated
 

From d83e428b0fd42d08afde061f0b01540ee150cc2f Mon Sep 17 00:00:00 2001
From: Clemens Tolboom <c.g.w.m.tolboom@umcg.nl>
Date: Mon, 4 Dec 2023 12:02:04 +0100
Subject: [PATCH 3/7] Add links to components + cleanup backtics

---
 CONTRIBUTING.md | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ebee4b918..c867efd85 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -5,17 +5,17 @@
 You can run from source code as follows:
 
 1. Install Java and Docker
-2. Checkout the source using ```git clone https://github.com/molgenis/molgenis-service-armadillo.git```
-3. Optionally copy ```application.template.yml``` to ```application.yml``` to change settings (will be .gitignored)
-4. Compile and execute the code using ```./gradlew run```
+2. Checkout the source using `git clone https://github.com/molgenis/molgenis-service-armadillo.git`
+3. Optionally copy `application.template.yml` to `application.yml` to change settings (will be .gitignored)
+4. Compile and execute the code using `./gradlew run`
 
 Note: contact MOLGENIS team if you want to contribute and need a testing OIDC config that you can run against localhost.
 
 # Developing Armadillo
 
 We use gradle to build:
-* run using ```./gradlew run```
-* run tests using ```./gradlew test```
+* run using `./gradlew run`
+* run tests using `./gradlew test`
 
 We use intellij to develop
 * To run or debug in intellij, right click on armadillo/src/main/java/org.molgenis.armdadillo/ArmadilloServiceAppliction and choose 'Run/Debug Armadillo...'
@@ -23,6 +23,19 @@ We use intellij to develop
 
 We have a swagger-ui to quickly see and test available web services at http://localhost:8080/swagger-ui/ 
 
+## Components
+
+We have several components
+
+- [Armadillo](./armadillo/src/) source
+- [UI](./ui/README.md) readme
+- [R](./r/) java integration source
+- [docker builds](./docker/) source
+- [scripts](./scripts/README.md) migration readme
+  - [install](./scripts/install/README.md) readme
+  - [release](./scripts/release/) source
+  - [ops](./scripts/ops/README.md) readme
+
 ## Profile xenon with resourcer whitelisted returns a host.docker.internal error
 When developing locally, it might be possible to come across the container error: `Could not resolve host: host.docker.internal`, 
 especially when developing on a non-supported operating system when resourcer is whitelisted (such as xenon). 

From 4aede678f5e905cc8873dff8933f17407c9822b4 Mon Sep 17 00:00:00 2001
From: Clemens Tolboom <c.g.w.m.tolboom@umcg.nl>
Date: Mon, 4 Dec 2023 14:43:25 +0100
Subject: [PATCH 4/7] chore: add section about conventional commits

---
 CONTRIBUTING.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c867efd85..df29d9f96 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -36,6 +36,18 @@ We have several components
   - [release](./scripts/release/) source
   - [ops](./scripts/ops/README.md) readme
 
+## Releasing
+
+We release through [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) which autoincrement using [Semantic versioning](https://semver.org/).
+
+Use `./gradlew nyxMake` to see what is build in [build/distributions](./build/distributions/).
+
+List messages to see usage of conventional commits from the past.
+
+```sh
+git log --pretty=format:"%s" | cut -c -20
+```
+
 ## Profile xenon with resourcer whitelisted returns a host.docker.internal error
 When developing locally, it might be possible to come across the container error: `Could not resolve host: host.docker.internal`, 
 especially when developing on a non-supported operating system when resourcer is whitelisted (such as xenon). 

From ca7b7ff270ee089636c7d800dd9bde8df719a0e5 Mon Sep 17 00:00:00 2001
From: Clemens Tolboom <c.g.w.m.tolboom@umcg.nl>
Date: Tue, 5 Dec 2023 08:32:27 +0100
Subject: [PATCH 5/7] Update Profiles.spec.ts

Add version to profile one
---
 ui/tests/unit/views/Profiles.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/tests/unit/views/Profiles.spec.ts b/ui/tests/unit/views/Profiles.spec.ts
index 49fa02f3d..ee156443d 100644
--- a/ui/tests/unit/views/Profiles.spec.ts
+++ b/ui/tests/unit/views/Profiles.spec.ts
@@ -79,7 +79,7 @@ describe("Profiles", () => {
         singleTestData = [
             {
                 name: "profile-one",
-                image: "source/some_profile-one",
+                image: "source/some_profile-one:version-one",
                 host: "localhost",
                 port: 6312,
                 packageWhitelist: [

From e424080c02667ff2931b6ea4f705e52df51ffa18 Mon Sep 17 00:00:00 2001
From: SietsmaRJ <work.robertsietsma@gmail.com>
Date: Tue, 5 Dec 2023 08:44:48 +0100
Subject: [PATCH 6/7] Added forgotten tag

---
 ui/tests/unit/views/Profiles.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/tests/unit/views/Profiles.spec.ts b/ui/tests/unit/views/Profiles.spec.ts
index ee156443d..d33663a5d 100644
--- a/ui/tests/unit/views/Profiles.spec.ts
+++ b/ui/tests/unit/views/Profiles.spec.ts
@@ -91,7 +91,7 @@ describe("Profiles", () => {
                     "datashield.seed": "100000001"
                 },
                 container: {
-                    tags: ["source/some_profile-two"],
+                    tags: ["source/some_profile-two:version-one"],
                     status: "NOT_RUNNING"
                 }
             }

From 64ac5a76b93aad2f14840962bba6b4ad0040a11d Mon Sep 17 00:00:00 2001
From: SietsmaRJ <work.robertsietsma@gmail.com>
Date: Tue, 5 Dec 2023 08:46:57 +0100
Subject: [PATCH 7/7] Fixed typo

---
 ui/tests/unit/views/Profiles.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/tests/unit/views/Profiles.spec.ts b/ui/tests/unit/views/Profiles.spec.ts
index d33663a5d..70f4819ea 100644
--- a/ui/tests/unit/views/Profiles.spec.ts
+++ b/ui/tests/unit/views/Profiles.spec.ts
@@ -91,7 +91,7 @@ describe("Profiles", () => {
                     "datashield.seed": "100000001"
                 },
                 container: {
-                    tags: ["source/some_profile-two:version-one"],
+                    tags: ["source/some_profile-one:version-one"],
                     status: "NOT_RUNNING"
                 }
             }