From 9debc08d8dabe630682a6be614d2d670f591f3c5 Mon Sep 17 00:00:00 2001
From: Ruslan Forostianov <ruslan@se4.bio>
Date: Wed, 2 Oct 2024 17:18:58 +0200
Subject: [PATCH 1/3] Implement RFC85 Dynamic Virtual Study

Added option to select a dynamic type of virtual study while creating it

Static type (the legacy one) is the default one
---
 src/globalStyles/global.scss                  |  8 ++
 .../studyView/virtualStudy/VirtualStudy.tsx   | 85 +++++++++++++++++++
 2 files changed, 93 insertions(+)

diff --git a/src/globalStyles/global.scss b/src/globalStyles/global.scss
index 81f33b14a2d..7b1839b6d60 100755
--- a/src/globalStyles/global.scss
+++ b/src/globalStyles/global.scss
@@ -47,6 +47,14 @@ div:active {
     }
 }
 
+.form-group-inline {
+    @extend .form-group;
+
+    label {
+        margin-right: 6px;
+    }
+}
+
 .posRelative {
     position: relative;
 }
diff --git a/src/pages/studyView/virtualStudy/VirtualStudy.tsx b/src/pages/studyView/virtualStudy/VirtualStudy.tsx
index 4a492d847c4..b933c17cf98 100644
--- a/src/pages/studyView/virtualStudy/VirtualStudy.tsx
+++ b/src/pages/studyView/virtualStudy/VirtualStudy.tsx
@@ -98,6 +98,7 @@ export default class VirtualStudy extends React.Component<
 > {
     @observable.ref private name: string;
     @observable.ref private description: string;
+    @observable.ref private isDynamic: boolean = false;
 
     @observable private saving = false;
     @observable private sharing = false;
@@ -167,6 +168,7 @@ export default class VirtualStudy extends React.Component<
                             study => study.studyId
                         ),
                         studies: studies,
+                        isDynamic: this.isDynamic,
                     };
                     return await sessionServiceClient.saveVirtualStudy(
                         parameters,
@@ -298,6 +300,89 @@ export default class VirtualStudy extends React.Component<
                                             />
                                         </div>
 
+                                        <div className="form-group-inline">
+                                            <label>Type:</label>
+                                            <label>
+                                                <input
+                                                    type="radio"
+                                                    name="option"
+                                                    value="static"
+                                                    checked={!this.isDynamic}
+                                                    onChange={_ =>
+                                                        (this.isDynamic = false)
+                                                    }
+                                                />{' '}
+                                                Static
+                                            </label>
+                                            <label>
+                                                <input
+                                                    type="radio"
+                                                    name="option"
+                                                    value="dynamic"
+                                                    checked={this.isDynamic}
+                                                    onChange={_ =>
+                                                        (this.isDynamic = true)
+                                                    }
+                                                />{' '}
+                                                Dynamic
+                                            </label>
+                                            <DefaultTooltip
+                                                mouseEnterDelay={0}
+                                                placement="right"
+                                                overlay={
+                                                    <div>
+                                                        <p>
+                                                            <strong>
+                                                                Type of Virtual
+                                                                Study:
+                                                            </strong>
+                                                        </p>
+                                                        <p>
+                                                            A Virtual Study is a
+                                                            set of sample IDs
+                                                            derived from
+                                                            selected studies.
+                                                            This set can be
+                                                            defined as either
+                                                            static or dynamic:
+                                                        </p>
+                                                        <ul>
+                                                            <li>
+                                                                <strong>
+                                                                    Static
+                                                                </strong>{' '}
+                                                                – Sample IDs are
+                                                                captured at the
+                                                                time of creation
+                                                                and do not
+                                                                update, even
+                                                                when the data in
+                                                                the parent
+                                                                studies changes.
+                                                            </li>
+                                                            <li>
+                                                                <strong>
+                                                                    Dynamic
+                                                                </strong>{' '}
+                                                                – Sample IDs are
+                                                                automatically
+                                                                refreshed to
+                                                                reflect any
+                                                                changes in the
+                                                                parent studies,
+                                                                ensuring the
+                                                                virtual study
+                                                                stays
+                                                                up-to-date.
+                                                            </li>
+                                                        </ul>
+                                                    </div>
+                                                }
+                                            >
+                                                <FontAwesome name="question-circle" />
+                                            </DefaultTooltip>
+                                        </div>
+
                                         <div>
                                             {this.showSaveButton && (
                                                 <button

From c7880ae5945a8eba9ea8763700483b0073a00a6e Mon Sep 17 00:00:00 2001
From: Ruslan Forostianov <ruslan@se4.bio>
Date: Sat, 12 Oct 2024 11:42:11 +0200
Subject: [PATCH 2/3] Rename boolean varialbe name isDynamic -> dynamic

To make it follow the conventions and escape confusion
with java bean property convenction during deserialisation on BE
---
 src/pages/studyView/virtualStudy/VirtualStudy.tsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pages/studyView/virtualStudy/VirtualStudy.tsx b/src/pages/studyView/virtualStudy/VirtualStudy.tsx
index b933c17cf98..623ad0e1ae2 100644
--- a/src/pages/studyView/virtualStudy/VirtualStudy.tsx
+++ b/src/pages/studyView/virtualStudy/VirtualStudy.tsx
@@ -98,7 +98,7 @@ export default class VirtualStudy extends React.Component<
 > {
     @observable.ref private name: string;
     @observable.ref private description: string;
-    @observable.ref private isDynamic: boolean = false;
+    @observable.ref private dynamic: boolean = false;
 
     @observable private saving = false;
     @observable private sharing = false;
@@ -168,7 +168,7 @@ export default class VirtualStudy extends React.Component<
                             study => study.studyId
                         ),
                         studies: studies,
-                        isDynamic: this.isDynamic,
+                        dynamic: this.dynamic,
                     };
                     return await sessionServiceClient.saveVirtualStudy(
                         parameters,
@@ -307,9 +307,9 @@ export default class VirtualStudy extends React.Component<
                                                     type="radio"
                                                     name="option"
                                                     value="static"
-                                                    checked={!this.isDynamic}
+                                                    checked={!this.dynamic}
                                                     onChange={_ =>
-                                                        (this.isDynamic = false)
+                                                        (this.dynamic = false)
                                                     }
                                                 />{' '}
                                                 Static
@@ -319,9 +319,9 @@ export default class VirtualStudy extends React.Component<
                                                     type="radio"
                                                     name="option"
                                                     value="dynamic"
-                                                    checked={this.isDynamic}
+                                                    checked={this.dynamic}
                                                     onChange={_ =>
-                                                        (this.isDynamic = true)
+                                                        (this.dynamic = true)
                                                     }
                                                 />{' '}
                                                 Dynamic

From ebbd1b7e0a2a08836eb8fa13fa3c86fb3d8ec976 Mon Sep 17 00:00:00 2001
From: Ruslan Forostianov <ruslan@se4.bio>
Date: Fri, 18 Oct 2024 18:26:30 +0200
Subject: [PATCH 3/3] Improve help tooltip text of virtual study type

Co-authored-by: pieterlukasse <pieterlukasse@gmail.com>
---
 .../studyView/virtualStudy/VirtualStudy.tsx   | 39 ++++++++-----------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/src/pages/studyView/virtualStudy/VirtualStudy.tsx b/src/pages/studyView/virtualStudy/VirtualStudy.tsx
index 623ad0e1ae2..3b78421e729 100644
--- a/src/pages/studyView/virtualStudy/VirtualStudy.tsx
+++ b/src/pages/studyView/virtualStudy/VirtualStudy.tsx
@@ -338,12 +338,11 @@ export default class VirtualStudy extends React.Component<
                                                             </strong>
                                                         </p>
                                                         <p>
-                                                            A Virtual Study is a
-                                                            set of sample IDs
-                                                            derived from
-                                                            selected studies.
-                                                            This set can be
-                                                            defined as either
+                                                            This Virtual Study will
+                                                            contain the set of sample IDs
+                                                            currently selected.
+                                                            Furthermore, you can
+                                                            define this Virtual Study  either
                                                             static or dynamic:
                                                         </p>
                                                         <ul>
@@ -352,28 +351,22 @@ export default class VirtualStudy extends React.Component<
                                                                     Static
                                                                 </strong>{' '}
                                                                 – Sample IDs are
-                                                                captured at the
-                                                                time of creation
-                                                                and do not
-                                                                update, even
-                                                                when the data in
-                                                                the parent
-                                                                studies changes.
+                                                                the ones currently selected
+                                                                and no new samples are
+                                                                added to this Virtual Study set,
+                                                                even if the database gets updated with
+                                                                new samples that match the
+                                                                same filtering/selection criteria
+                                                                as the samples in the current set.
                                                             </li>
                                                             <li>
                                                                 <strong>
                                                                     Dynamic
                                                                 </strong>{' '}
-                                                                – Sample IDs are
-                                                                automatically
-                                                                refreshed to
-                                                                reflect any
-                                                                changes in the
-                                                                parent studies,
-                                                                ensuring the
-                                                                virtual study
-                                                                stays
-                                                                up-to-date.
+                                                                – Unlike the Static option, 
+                                                                any new samples added to the database
+                                                                that match the criteria of this Virtual Study
+                                                                will automatically be included in its sample set.
                                                             </li>
                                                         </ul>
                                                     </div>