Merge pull request #2703 from objectcomputing/release/0.8

Deploye v0.8.1 to production

Author: mkimberlin

server/build.gradle

@@ -7,7 +7,7 @@ plugins {
     id "jacoco"
 }
 
-version "0.8.0"
+version "0.8.1"
 group "com.objectcomputing.checkins"
 
 repositories {

server/src/main/java/com/objectcomputing/checkins/services/role/member_roles/MemberRoleController.java

@@ -6,6 +6,7 @@
 import io.micronaut.scheduling.annotation.ExecuteOn;
 import io.micronaut.security.annotation.Secured;
 import io.micronaut.security.rules.SecurityRule;
+import io.micronaut.cache.annotation.CacheInvalidate;
 import jakarta.validation.constraints.NotNull;
 
 import java.util.List;
@@ -34,6 +35,7 @@ HttpResponse<?> deleteMemberRole(@NotNull UUID roleId, @NotNull UUID memberId){
     }
 
     @Post
+    @CacheInvalidate(cacheNames = {"role-permission-cache"})
     HttpResponse<MemberRole> saveMemberRole(@NotNull @Body MemberRoleId id){
         MemberRole memberRole = memberRoleServices.saveByIds(id.getMemberId(), id.getRoleId());
         return HttpResponse.ok(memberRole);

web-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-ui",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "private": true,
   "type": "module",
   "dependencies": {

web-ui/src/components/settings/types/boolean.jsx

@@ -26,6 +26,7 @@ const SettingsBoolean = ({ name, description, value, handleChange }) => {
       </label>
       {description && <p>{description}</p>}
       <Switch
+        disableRipple
         id={labelId}
         className="settings-control"
         type="checkbox"

web-ui/src/pages/AnniversaryReportPage.jsx

@@ -18,6 +18,7 @@ import {
   noPermission,
 } from '../context/selectors';
 import { useQueryParameters } from '../helpers/query-parameters';
+import SkeletonLoader from '../components/skeleton_loader/SkeletonLoader';
 
 const months = [
   'January',
@@ -43,6 +44,7 @@ const AnniversaryReportPage = () => {
   const [searchAnniversaryResults, setSearchAnniversaryResults] = useState([]);
   const [selectedMonths, setSelectedMonths] = useState(defaultMonths);
   const [hasSearched, setHasSearched] = useState(false);
+  const [loading, setLoading] = useState(false);
 
   useQueryParameters([
     {
@@ -57,9 +59,22 @@ const AnniversaryReportPage = () => {
   ]);
 
   const handleSearch = async monthsToSearch => {
-    const anniversaryResults = await getAnniversaries(monthsToSearch, csrf);
-    setSearchAnniversaryResults(sortAnniversaries(anniversaryResults));
-    setHasSearched(true);
+    setLoading(true);
+    try {
+      const anniversaryResults = await getAnniversaries(monthsToSearch, csrf);
+      setSearchAnniversaryResults(sortAnniversaries(anniversaryResults));
+      setHasSearched(true);
+    } catch(e) {
+      console.error(e);
+      window.snackDispatch({
+        type: UPDATE_TOAST,
+        payload: {
+          severity: 'error',
+          toast: e,
+        }
+      });
+    }
+    setLoading(false);
   };
 
   function onMonthChange(event, newValue) {
@@ -111,6 +126,10 @@ const AnniversaryReportPage = () => {
       </div>
       <div>
         {
+          loading ?
+          Array.from({ length: 10 }).map((_, index) => (
+                        <SkeletonLoader key={index} type="feedback_requests" />
+                     )) :
           <div className="search-results">
             <SearchBirthdayAnniversaryResults
               hasSearched={hasSearched}

web-ui/src/pages/BirthdayReportPage.jsx

@@ -11,6 +11,7 @@ import { getBirthdays } from '../api/birthdayanniversary';
 import { UPDATE_TOAST } from '../context/actions';
 import SearchBirthdayAnniversaryResults from '../components/search-results/SearchBirthdayAnniversaryResults';
 import { sortBirthdays } from '../context/util';
+import SkeletonLoader from '../components/skeleton_loader/SkeletonLoader';
 
 import {
   selectCsrfToken,
@@ -43,6 +44,7 @@ const BirthdayReportPage = () => {
   const [searchBirthdayResults, setSearchBirthdayResults] = useState([]);
   const [selectedMonths, setSelectedMonths] = useState(defaultMonths);
   const [hasSearched, setHasSearched] = useState(false);
+  const [loading, setLoading] = useState(false);
 
   useQueryParameters([
     {
@@ -57,9 +59,21 @@ const BirthdayReportPage = () => {
   ]);
 
   const handleSearch = async monthsToSearch => {
-    const birthdayResults = await getBirthdays(monthsToSearch, csrf);
-    setSearchBirthdayResults(sortBirthdays(birthdayResults));
-    setHasSearched(true);
+    setLoading(true);
+    try {
+      const birthdayResults = await getBirthdays(monthsToSearch, csrf);
+      setSearchBirthdayResults(sortBirthdays(birthdayResults));
+      setHasSearched(true);
+    } catch(e) {
+      window.snackDispatch({
+        type: UPDATE_TOAST,
+        payload: {
+          severity: 'error',
+          toast: e,
+        }
+      });
+    }
+    setLoading(false);
   };
 
   function onMonthChange(event, newValue) {
@@ -111,6 +125,10 @@ const BirthdayReportPage = () => {
       </div>
       <div>
         {
+          loading ?
+          Array.from({ length: 10 }).map((_, index) => (
+                        <SkeletonLoader key={index} type="feedback_requests" />
+                     )) :
           <div className="search-results">
             <SearchBirthdayAnniversaryResults
               hasSearched={hasSearched}

web-ui/src/pages/SettingsPage.jsx

@@ -214,6 +214,7 @@ const SettingsPage = () => {
        selectHasAdministerSettingsPermission(state) &&
       <div className="buttons">
         <Button
+          disableRipple
           color="primary"
           onClick={save}>
           Save

web-ui/src/pages/__snapshots__/SettingsPage.test.jsx.snap

@@ -48,9 +48,6 @@ exports[`SettingsPage > renders correctly 1`] = `
           <span
             class="MuiSwitch-thumb css-jsexje-MuiSwitch-thumb"
           />
-          <span
-            class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
-          />
         </span>
         <span
           class="MuiSwitch-track css-1yjjitx-MuiSwitch-track"
@@ -125,9 +122,6 @@ exports[`SettingsPage > renders correctly 1`] = `
         type="button"
       >
         Save
-        <span
-          class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
-        />
       </button>
     </div>
   </div>