Merge branch 'develop' into feature-2349/bi-weekly-pulse-emails

objectcomputing · Sep 17, 2024 · 3d10da8 · 3d10da8
2 parents 9546817 + 60dd938
commit 3d10da8
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 13 deletions.
diff --git a/server/build.gradle b/server/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id 'java-library'
     id 'maven-publish'
     id("com.gradleup.shadow") version "8.3.1"
-    id("io.micronaut.application") version "4.4.0"
+    id("io.micronaut.application") version "4.4.2"
     id "jacoco"
     id("org.openrewrite.rewrite") version "latest.release"
 }

diff --git a/server/gradle.properties b/server/gradle.properties
@@ -1,2 +1,2 @@
-micronautVersion=4.5.0
+micronautVersion=4.6.2
 seleniumVersion=4.21.0
diff --git a/server/src/main/java/com/objectcomputing/checkins/services/permissions/Permission.java b/server/src/main/java/com/objectcomputing/checkins/services/permissions/Permission.java
@@ -15,7 +15,7 @@ public enum Permission {
   CAN_VIEW_FEEDBACK_ANSWER("View feedback answers", "Feedback"),
   CAN_DELETE_ORGANIZATION_MEMBERS("Delete organization members", "User Management"),
   CAN_CREATE_ORGANIZATION_MEMBERS("Create organization members", "User Management"),
-  CAN_IMPERSONATE_MEMBERS("Impersonate organization members", "User Management"),
+  CAN_IMPERSONATE_MEMBERS("Impersonate organization members", "Security"),
   CAN_VIEW_ROLE_PERMISSIONS("View role permissions", "Security"),
   CAN_ASSIGN_ROLE_PERMISSIONS("Assign role permissions", "Security"),
   CAN_VIEW_PERMISSIONS("View all permissions", "Security"),

diff --git a/...r/src/test/java/com/objectcomputing/checkins/configuration/CheckInsConfigurationTest.java b/...r/src/test/java/com/objectcomputing/checkins/configuration/CheckInsConfigurationTest.java
@@ -15,7 +15,7 @@ class CheckInsConfigurationTest {
     @Test
     void checkConfigurationGetsParsed() {
         try (var ctx = ApplicationContext.run(Map.of(
-                "datasources.enabled", false,
+                "datasources.default.enabled", false,
                 "check-ins.web-address", "http://google.com",
                 "check-ins.application.name", "Fancy app"
         ))) {
@@ -28,7 +28,7 @@ void checkConfigurationGetsParsed() {
     @Test
     void checkWebAddressGetsValidated() {
         try (var ctx = ApplicationContext.run(Map.of(
-                "datasources.enabled", false,
+                "datasources.default.enabled", false,
                 "check-ins.web-address", "",
                 "check-ins.application.name", "Fancy app"
         ))) {
@@ -40,7 +40,7 @@ void checkWebAddressGetsValidated() {
     @Test
     void checkApplicationNameGetsValidated() {
         try (var ctx = ApplicationContext.run(Map.of(
-                "datasources.enabled", false,
+                "datasources.default.enabled", false,
                 "check-ins.web-address", "http://google.com",
                 "check-ins.application.name", ""
         ))) {

diff --git a/.../test/java/com/objectcomputing/checkins/notifications/email/MailJetConfigurationTest.java b/.../test/java/com/objectcomputing/checkins/notifications/email/MailJetConfigurationTest.java
@@ -15,7 +15,7 @@ void happyConfig() {
         String name = "Tim";
 
         try (var ctx = ApplicationContext.run(Map.of(
-                "datasources.enabled", false,
+                "datasources.default.enabled", false,
                 "mail-jet.from-address", email,
                 "mail-jet.from-name", name
         ))) {
@@ -25,7 +25,7 @@ void happyConfig() {
         }
 
         try (var ctx = ApplicationContext.run(Map.of(
-                "datasources.enabled", false,
+                "datasources.default.enabled", false,
                 "mail-jet.fromAddress", email,
                 "mail-jet.fromName", name
         ))) {
@@ -35,7 +35,7 @@ void happyConfig() {
         }
 
         try (var ctx = ApplicationContext.run(Map.of(
-                "datasources.enabled", false,
+                "datasources.default.enabled", false,
                 "mailJet.fromAddress", email,
                 "mailJet.fromName", name
         ))) {
@@ -45,7 +45,7 @@ void happyConfig() {
         }
 
         try (var ctx = ApplicationContext.run(Map.of(
-                "datasources.enabled", false,
+                "datasources.default.enabled", false,
                 "mailJet.from_address", email,
                 "mailJet.from_name", name
         ))) {

diff --git a/...r/src/test/java/com/objectcomputing/checkins/security/GoogleServiceConfigurationTest.java b/...r/src/test/java/com/objectcomputing/checkins/security/GoogleServiceConfigurationTest.java
@@ -69,7 +69,7 @@ void testConfigurationLoadedCorrectlyFromConfiguration() throws IOException {
                 Map.entry("encoded-gcp-credentials", ENCODED_EXAMPLE_GOOGLE_SERVICE_CONFIGURATION)
         );
         try (var ctx = ApplicationContext.run(Map.ofEntries(
-                Map.entry("datasources.enabled", false),
+                Map.entry("datasources.default.enabled", false),
                 Map.entry("service-account-credentials.directory-id", values.get("directory")),
                 Map.entry("service-account-credentials.encoded-value", values.get("encoded-gcp-credentials"))
         ))) {

diff --git a/server/src/test/java/com/objectcomputing/checkins/services/github/GithubControllerTest.java b/server/src/test/java/com/objectcomputing/checkins/services/github/GithubControllerTest.java
@@ -44,7 +44,7 @@ class GithubControllerTest extends TestContainersSuite {
     void startClient() {
         // Make a GitHub mock application (with no datasource, and security turned off)
         mockGithub = ApplicationContext.run(EmbeddedServer.class, Map.of(
-                "datasources.enabled", StringUtils.FALSE,
+                "datasources.default.enabled", StringUtils.FALSE,
                 "micronaut.security.enabled", StringUtils.FALSE,
                 "spec.name", "GithubControllerTest"
         ));

diff --git a/web-ui/src/components/reviews/TeamReviews.jsx b/web-ui/src/components/reviews/TeamReviews.jsx
@@ -225,7 +225,7 @@ const TeamReviews = ({ onBack, periodId }) => {
       revieweeId: tm.id,
       reviewerId: tm.supervisorid,
       reviewPeriodId: periodId,
-      approved: true
+      approved: false
     }));
 
     const res = await resolve({
@@ -241,8 +241,21 @@ const TeamReviews = ({ onBack, periodId }) => {
     if (res.error) return;
 
     setTeamMembers(teamMembers);
+    addAssignmentForMemberWithNone(teamMembers);
   };
 
+  const addAssignmentForMemberWithNone = async (members) => {
+    members.forEach(member => {
+      const exists = assignments.some(
+          a => a.revieweeId === member.id
+      );
+      if (!!!exists && member.supervisorid) {
+        const reviewers = [{ id: member.supervisorid }];
+        updateReviewers(member, reviewers);
+      }
+    });
+  }
+
   const getReviewStatus = useCallback(
     teamMemberId => {
       let reviewStates = { submitted: false, inProgress: false };