[dashboard] Re-use data from UpdateOrganizationSettings

Tool: gitpod/catfood.gitpod.cloud

Author: filiptronicek

components/dashboard/src/data/organizations/org-settings-query.ts

@@ -36,6 +36,6 @@ export function useOrgSettingsQuery() {
     );
 }
 
-function getQueryKey(organizationId?: string) {
+export function getQueryKey(organizationId?: string) {
     return ["getOrganizationSettings", organizationId || "undefined"];
 }

components/dashboard/src/data/organizations/suggested-repositories-query.ts

@@ -6,11 +6,12 @@
 
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { useCallback } from "react";
-import { configurationClient, organizationClient } from "../../service/public-api";
+import { configurationClient } from "../../service/public-api";
 import { useCurrentOrg } from "./orgs-query";
 import { SuggestedRepository } from "@gitpod/public-api/lib/gitpod/v1/scm_pb";
 import { PlainMessage } from "@bufbuild/protobuf";
 import { Configuration } from "@gitpod/public-api/lib/gitpod/v1/configuration_pb";
+import { useOrgSettingsQuery } from "./org-settings-query";
 
 export function useOrgRepoSuggestionsInvalidator() {
     const organizationId = useCurrentOrg().data?.id;
@@ -27,13 +28,12 @@ export type SuggestedOrgRepository = PlainMessage<SuggestedRepository> & {
 
 export function useOrgSuggestedRepos() {
     const organizationId = useCurrentOrg().data?.id;
+    const orgSettings = useOrgSettingsQuery();
+
     const query = useQuery<SuggestedOrgRepository[], Error>(
         getQueryKey(organizationId),
         async () => {
-            const response = await organizationClient.getOrganizationSettings({
-                organizationId,
-            });
-            const repos = response.settings?.onboardingSettings?.recommendedRepositories ?? [];
+            const repos = orgSettings.data?.onboardingSettings?.recommendedRepositories ?? [];
 
             const suggestions: SuggestedOrgRepository[] = [];
             for (const configurationId of repos) {

components/dashboard/src/data/organizations/update-org-settings-mutation.ts

@@ -4,8 +4,8 @@
  * See License.AGPL.txt in the project root for license information.
  */
 
-import { useMutation } from "@tanstack/react-query";
-import { useOrgSettingsQueryInvalidator } from "./org-settings-query";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { getQueryKey, useOrgSettingsQueryInvalidator } from "./org-settings-query";
 import { useCurrentOrg } from "./orgs-query";
 import { organizationClient } from "../../service/public-api";
 import {
@@ -24,6 +24,8 @@ export const useUpdateOrgSettingsMutation = () => {
     const invalidateOrgSettings = useOrgSettingsQueryInvalidator();
     const invalidateWorkspaceClasses = useOrgWorkspaceClassesQueryInvalidator();
     const invalidateOrgRepoSuggestions = useOrgRepoSuggestionsInvalidator();
+
+    const queryClient = useQueryClient();
     const organizationId = org?.id ?? "";
 
     return useMutation<OrganizationSettings, Error, UpdateOrganizationSettingsArgs>({
@@ -47,10 +49,15 @@ export const useUpdateOrgSettingsMutation = () => {
             const settings = await organizationClient.updateOrganizationSettings(update);
             return settings.settings!;
         },
-        onSuccess: () => {
-            invalidateOrgSettings();
+        onSuccess: (settings) => {
             invalidateWorkspaceClasses();
             invalidateOrgRepoSuggestions();
+
+            if (settings) {
+                queryClient.setQueryData(getQueryKey(organizationId), settings);
+            } else {
+                invalidateOrgSettings();
+            }
         },
         onError: (err) => {
             if (!ErrorCode.isUserError((err as any)?.["code"])) {