Merge branch 'master' into development

pom.xml

@@ -9,7 +9,7 @@
   <groupId>ca.corefacility.bioinformatics</groupId>
   <artifactId>irida</artifactId>
   <packaging>war</packaging>
-  <version>22.09-SNAPSHOT</version>
+  <version>22.07-SNAPSHOT</version>
   <name>irida</name>
   <url>http://www.irida.ca</url>
 

src/main/resources/ca/corefacility/bioinformatics/irida/database/changesets/22.05/user-account-project-subscription.xml

@@ -6,6 +6,7 @@
          http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.3.xsd">
 
     <changeSet id="user-account-project-subscription" author="katherine">
+        <validCheckSum>8:e75125f4b2af1759f21078bafe3b8ed9</validCheckSum>
         <createTable tableName="project_subscription">
             <column name="id" type="bigint(20)" autoIncrement="true">
                 <constraints primaryKey="true" nullable="false"/>
@@ -57,7 +58,7 @@
             INSERT INTO project_subscription (project_id, user_id, email_subscription, created_date)
             SELECT project_id, user_id, IF(email_subscription=b'1', 1, 0), now() FROM project_user
             UNION
-            SELECT p.project_id, m.user_id, 0, now() from user_group_member m LEFT JOIN user_group_project p ON
+            SELECT p.project_id, m.user_id, 0, now() from user_group_member m INNER JOIN user_group_project p ON
             m.group_id = p.user_group_id;
         </sql>
 

src/main/webapp/resources/js/pages/projects/share/ShareSampleListItem.jsx

@@ -1,9 +1,12 @@
+import { Avatar, Button, List, Tooltip } from "antd";
 import React from "react";
 import { useDispatch } from "react-redux";
-import { Avatar, Button, List, Tooltip } from "antd";
-import { green6 } from "../../../styles/colors";
 import { IconLocked, IconUnlocked } from "../../../components/icons/Icons";
-import { SampleDetailViewer } from "../../../components/samples/SampleDetailViewer";
+import {
+  SampleDetailViewer
+} from "../../../components/samples/SampleDetailViewer";
+import { green6 } from "../../../styles/colors";
+import { removeSample } from "./shareSlice";
 
 /**
  * Render a list item for the samples to be shared with another project.

src/main/webapp/resources/js/pages/projects/share/ShareSamples.jsx

@@ -13,24 +13,19 @@ import { updatedLocked, updateMoveSamples } from "./shareSlice";
  */
 export function ShareSamples({ samples = [] }) {
   const dispatch = useDispatch();
-  const { associated, originalSamples, locked, remove, currentProject } =
-    useSelector((state) => state.shareReducer);
-
-  const SHOW_SAMPLES = samples.length > 0;
-  const SHOW_NO_SAMPLES_WARNING = samples.length === 0;
-  const SHOW_SOME_SAMPLES_WARNING =
-    SHOW_SAMPLES && samples.length < originalSamples.length;
-  const SHOW_ASSOCIATED = SHOW_SAMPLES && associated.length > 0;
+  const { associated, samples: originalSamples, locked, remove } = useSelector(
+    (state) => state.shareReducer
+  );
 
   return (
     <Space direction="vertical" style={{ width: `100%` }}>
       <Typography.Title level={5}>
         {i18n("ShareSamplesList.title")}
       </Typography.Title>
-      {SHOW_ASSOCIATED && <ShareAssociated />}
-      {SHOW_SAMPLES && (
+      {associated.length > 0 && <ShareAssociated />}
+      {samples.length > 0 && (
         <>
-          <SharedSamplesList list={samples} currentProject={currentProject} />
+          <SharedSamplesList list={samples} />
           <Checkbox
             className="t-move-checkbox"
             checked={remove}
@@ -52,7 +47,7 @@ export function ShareSamples({ samples = [] }) {
           </Checkbox>
         </>
       )}
-      {SHOW_NO_SAMPLES_WARNING && (
+      {samples.length === 0 && (
         <Alert
           type="warning"
           className="t-no-sample-warning"
@@ -61,7 +56,7 @@ export function ShareSamples({ samples = [] }) {
           description={i18n("ShareSamples.no-samples.description")}
         />
       )}
-      {SHOW_SOME_SAMPLES_WARNING && (
+      {originalSamples.length - samples.length > 0 && (
         <Alert
           className="t-same-samples-warning"
           type="info"

src/main/webapp/resources/js/pages/projects/share/SharedSamplesList.jsx

@@ -1,5 +1,4 @@
 import { List } from "antd";
-import { sample } from "lodash";
 import React from "react";
 import { FixedSizeList as VList } from "react-window";
 import ShareSamplesListItem from "./ShareSampleListItem";
@@ -10,7 +9,7 @@ import ShareSamplesListItem from "./ShareSampleListItem";
  * @returns {JSX.Element}
  * @constructor
  */
-export function SharedSamplesList({ list = [], currentProject }) {
+export function SharedSamplesList({ list = [] }) {
   const Row = ({ index, style }) => {
     const sample = list[index];
 

src/main/webapp/resources/js/pages/projects/share/shareSlice.js

@@ -1,5 +1,7 @@
 import { createAction, createSlice } from "@reduxjs/toolkit";
-import { compareRestrictionLevels } from "../../../utilities/restriction-utilities";
+import {
+  compareRestrictionLevels
+} from "../../../utilities/restriction-utilities";
 
 /**
  * Action to set the target project for the samples
@@ -83,8 +85,9 @@ const initialState = (() => {
     return {};
   }
 
-  const { samples: allSamples, projectId: currentProject } =
-    JSON.parse(stringData);
+  const { samples: allSamples, projectId: currentProject } = JSON.parse(
+    stringData
+  );
   const samples = [];
   const associated = [];
   allSamples.forEach((sample) => {
@@ -96,7 +99,6 @@ const initialState = (() => {
   });
 
   return {
-    originalSamples: samples,
     samples,
     associated,
     currentProject,
@@ -115,7 +117,7 @@ const shareSlice = createSlice({
     });
 
     builder.addCase(removeSample, (state, action) => {
-      state.originalSamples = state.originalSamples.filter(
+      state.samples = state.samples.filter(
         (sample) => sample.id !== action.payload.sampleId
       );
     });