Merge pull request #2702 from objectcomputing/release/0.8

mkimberlin · web-flow · commit 2e4bac3fc000 · 2024-10-31T20:01:48.000-05:00
Deploy v0.8.1 to develop
diff --git a/.github/workflows/gradle-build-production.yml b/.github/workflows/gradle-build-production.yml
@@ -3,25 +3,25 @@ on:
   push:
     branches:
       - "master"
-
 env:
   PROJECT_ID: ${{ secrets.RUN_PROJECT }}
   RUN_REGION: us-central1
   SERVICE_NAME: checkins-master
+  TARGET_URL: https://checkins.objectcomputing.com
 jobs:
   build:
     runs-on: ubuntu-latest
     permissions:
-      contents: read
-      packages: write
+      contents: 'read'
+      id-token: 'write'
     environment:
       name: Production
-      url: https://checkins.objectcomputing.com/
+      url: ${{ env.TARGET_URL }}
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up Node Stable
+      - name: Set up Node LTS
         uses: actions/setup-node@v4
         with:
           node-version: '22'
@@ -36,42 +36,29 @@ jobs:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
           restore-keys: ${{ runner.os }}-gradle
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
-      - name: Build with Gradle
-        uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+      - id: 'auth'
+        uses: 'google-github-actions/auth@v2'
         with:
-          arguments: assemble
-        env:
-          VITE_APP_API_URL: https://checkins.objectcomputing.com
-#      - name: Publish package
-#        uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
-#        with:
-#          arguments: publish
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GIT_HUB_TOKEN }}
-      - name: Setup python
-        run: |
-          sudo apt-get install python2.7
-      - name: Export gcloud related env variable
-        run: export CLOUDSDK_PYTHON="/usr/bin/python2"
-      - name: Setup gcloud CLI
-        uses: google-github-actions/setup-gcloud@v0
+          project_id: 'oci-intern-2019'
+          workload_identity_provider: 'projects/832140020593/locations/global/workloadIdentityPools/github/providers/my-repo'
+      - name: 'Set up Cloud SDK'
+        uses: google-github-actions/setup-gcloud@v2
         with:
-          version: "290.0.1"
-          service_account_key: ${{ secrets.RUN_SA_KEY }}
-          project_id: ${{ secrets.RUN_PROJECT }}
-      - name: Auth Configure Docker
+          version: '>= 363.0.0'
+      - name: 'Auth Configure Docker'
         run: |-
           gcloud --quiet auth configure-docker
       - name: Build the Docker image
         run: |-
+          ./gradlew assemble
           cd server
           docker build --tag "gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA" .
+        env:
+          VITE_APP_API_URL: ${{ env.TARGET_URL }}
       - name: Push the Docker image to Google Container Registry
-        run: |-
-          cd server
-          docker push "gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA"
+        run: docker push "gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA"
       - name: Deploy image to Cloud Run
         run: |-
           gcloud run deploy "$SERVICE_NAME" \
@@ -89,21 +76,12 @@ jobs:
             --set-env-vars "OAUTH_CLIENT_SECRET=${{ secrets.OAUTH_CLIENT_SECRET }}" \
             --set-env-vars "OAUTH_CALLBACK_URI"=${{ secrets.OAUTH_CALLBACK_URI }} \
             --set-env-vars "DIRECTORY_ID=${{ secrets.DIRECTORY_ID }}" \
-            --set-env-vars "TYPE=${{ secrets.SA_KEY_TYPE }}" \
-            --set-env-vars "PROJECT_ID=${{ secrets.RUN_PROJECT }}" \
-            --set-env-vars "PRIVATE_KEY_ID=${{ secrets.SA_PRIVATE_KEY_ID }}" \
-            --set-env-vars "PRIVATE_KEY=${{ secrets.SA_PRIVATE_KEY }}" \
-            --set-env-vars "CLIENT_EMAIL=${{ secrets.SA_CLIENT_EMAIL }}" \
-            --set-env-vars "CLIENT_ID=${{ secrets.SA_CLIENT_ID }}" \
-            --set-env-vars "AUTH_URI=${{ secrets.SA_AUTH_URI }}" \
-            --set-env-vars "TOKEN_URI=${{ secrets.SA_TOKEN_URI }}" \
-            --set-env-vars "AUTH_PROVIDER_X509_CERT_URL=${{ secrets.SA_AUTH_PROVIDER_X509_CERT_URL }}" \
-            --set-env-vars "CLIENT_X509_CERT_URL=${{ secrets.SA_CLIENT_X509_CERT_URL }}" \
+            --set-env-vars "SERVICE_ACCOUNT_CREDENTIALS=${{ secrets.SERVICE_ACCOUNT_CREDENTIALS }}" \
             --set-env-vars "GSUITE_SUPER_ADMIN=${{ secrets.GSUITE_SUPER_ADMIN }}" \
             --set-env-vars "MJ_APIKEY_PUBLIC=${{ secrets.MJ_APIKEY_PUBLIC }}" \
             --set-env-vars "MJ_APIKEY_PRIVATE=${{ secrets.MJ_APIKEY_PRIVATE }}" \
             --set-env-vars "GIT_HUB_TOKEN=${{ secrets.GIT_HUB_TOKEN }}" \
-            --set-env-vars "WEB_ADDRESS=https://checkins.objectcomputing.com" \
+            --set-env-vars "WEB_ADDRESS=${{ env.TARGET_URL }}" \
             --set-env-vars "FROM_ADDRESS=kimberlinm@objectcomputing.com" \
             --set-env-vars "FROM_NAME=Check-Ins" \
             --set-env-vars "^@^MICRONAUT_ENVIRONMENTS=cloud,google,gcp" \
diff --git a/.github/workflows/gradle-deploy-develop.yml b/.github/workflows/gradle-deploy-develop.yml
@@ -49,7 +49,7 @@ jobs:
       - name: Set up Node LTS
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
       - name: Set up Temurin 21
         uses: actions/setup-java@v4
         with:
diff --git a/server/build.gradle b/server/build.gradle
@@ -7,7 +7,7 @@ plugins {
     id "jacoco"
 }
 
-version "0.7.0"
+version "0.8.1"
 group "com.objectcomputing.checkins"
 
 repositories {
diff --git a/server/src/main/java/com/objectcomputing/checkins/services/role/member_roles/MemberRoleController.java b/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);
diff --git a/web-ui/package.json b/web-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "web-ui",
-  "version": "0.7.0",
+  "version": "0.8.1",
   "private": true,
   "type": "module",
   "dependencies": {
diff --git a/web-ui/src/components/settings/types/boolean.jsx b/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"
diff --git a/web-ui/src/pages/AnniversaryReportPage.jsx b/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}
diff --git a/web-ui/src/pages/BirthdayReportPage.jsx b/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}
diff --git a/web-ui/src/pages/SettingsPage.jsx b/web-ui/src/pages/SettingsPage.jsx
@@ -214,6 +214,7 @@ const SettingsPage = () => {
        selectHasAdministerSettingsPermission(state) &&
       <div className="buttons">
         <Button
+          disableRipple
           color="primary"
           onClick={save}>
           Save
diff --git a/web-ui/src/pages/__snapshots__/SettingsPage.test.jsx.snap b/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>

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ plugins {`
`7`	`7`	`id "jacoco"`
`8`	`8`	`}`
`9`	`9`
`10`		`-version "0.7.0"`
	`10`	`+version "0.8.1"`
`11`	`11`	`group "com.objectcomputing.checkins"`
`12`	`12`
`13`	`13`	`repositories {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "web-ui",`
`3`		`- "version": "0.7.0",`
	`3`	`+ "version": "0.8.1",`
`4`	`4`	`"private": true,`
`5`	`5`	`"type": "module",`
`6`	`6`	`"dependencies": {`