refactor: change loading message for loading resrouces

Author: DanielMicrosoft

src/web/src/__tests__/components/WSEditorClientConfig.test.tsx

@@ -16,6 +16,10 @@ vi.mock("../../services", () => ({
       loadingMessage: "Loading modules for plane...",
       fn: vi.fn(),
     },
+    getResourcesForWorkspace: {
+      loadingMessage: "Loading resources...",
+      fn: vi.fn(),
+    },
     getResourceProviders: vi.fn(),
     getProviderResources: vi.fn(),
   },
@@ -57,7 +61,7 @@ describe("WSEditorClientConfigDialog", () => {
   beforeEach(() => {
     vi.clearAllMocks();
     (specsApi.getPlanes as any).mockResolvedValue(mockPlanes);
-    (specsApi.getModulesForPlane.fn as any).mockResolvedValue(["storage", "compute"]);
+    (specsApi.getResourcesForWorkspace.fn as any).mockResolvedValue(["storage", "compute"]);
     (specsApi.getResourceProviders as any).mockResolvedValue(mockResourceProviders);
     (specsApi.getProviderResources as any).mockResolvedValue(mockProviderResources);
     (errorHandlerApi.getErrorMessage as any).mockReturnValue("Mock error message");

src/web/src/__tests__/components/WSEditorSwaggerPicker.test.tsx

@@ -84,8 +84,8 @@ describe("WSEditorSwaggerPicker", () => {
     vi.mocked(workspaceApi).addSwaggerResources.mockResolvedValue(undefined);
     vi.mocked(workspaceApi).addTypespecResources.mockResolvedValue(undefined);
 
-    vi.mocked(specsApi).getModulesForPlane = {
-      loadingMessage: "Loading modules for plane...",
+    vi.mocked(specsApi).getResourcesForWorkspace = {
+      loadingMessage: "Loading resources...",
       fn: vi.fn().mockResolvedValue(mockModules),
     };
     vi.mocked(specsApi).getResourceProvidersWithType.mockResolvedValue(mockResourceProviders);
@@ -129,7 +129,7 @@ describe("WSEditorSwaggerPicker", () => {
       render(<WSEditorSwaggerPicker {...defaultProps} />);
 
       await waitFor(() => {
-        expect(vi.mocked(specsApi).getModulesForPlane.fn).toHaveBeenCalledWith("ResourceManagement");
+        expect(vi.mocked(specsApi).getResourcesForWorkspace.fn).toHaveBeenCalledWith("ResourceManagement");
       });
     });
 

src/web/src/services/specsApi.ts

@@ -26,8 +26,8 @@ export const specsApi = {
     return res.data.map((v: any) => v.name);
   },
 
-  getModulesForPlane: {
-    loadingMessage: "Loading modules for plane...",
+  getResourcesForWorkspace: {
+    loadingMessage: "Loading resources...",
     fn: async (planeName: string): Promise<string[]> => {
       const res = await axios.get(`/Swagger/Specs/${planeName}`);
       return res.data.map((v: any) => v.url);

src/web/src/views/workspace/components/WSEditor/WSEditorClientConfig.tsx

@@ -70,7 +70,7 @@ const WSEditorClientConfigDialog: React.FC<WSEditorClientConfigDialogProps> = ({
   const [invalidText, setInvalidText] = useState<string | undefined>(undefined);
   const [isAdd, setIsAdd] = useState(true);
 
-  const modulesLoader = useAsyncOperation(specsApi.getModulesForPlane);
+  const resourcesLoader = useAsyncOperation(specsApi.getResourcesForWorkspace);
 
   const [endpointType, setEndpointType] = useState<"template" | "http-operation">("template");
 
@@ -129,7 +129,7 @@ const WSEditorClientConfigDialog: React.FC<WSEditorClientConfigDialogProps> = ({
         await onModuleSelectionUpdate(null);
       } else {
         try {
-          const options = await modulesLoader.execute(plane!.name);
+          const options = await resourcesLoader.execute(plane!.name);
           setModuleOptions(options || []);
           setModuleOptionsCommonPrefix(`/Swagger/Specs/${plane!.name}/`);
           await onModuleSelectionUpdate(null);
@@ -729,7 +729,7 @@ const WSEditorClientConfigDialog: React.FC<WSEditorClientConfigDialogProps> = ({
                 pb: 2,
               }}
             >
-              <AsyncOperationBanner operation={modulesLoader} />
+              <AsyncOperationBanner operation={resourcesLoader} />
               <SwaggerItemSelector
                 name="Module"
                 commonPrefix={moduleOptionsCommonPrefix}

src/web/src/views/workspace/components/WSEditorSwaggerPicker/WSEditorSwaggerPicker.tsx

@@ -89,7 +89,7 @@ const UpdateOptions = ["Default", "Generic(Get&Put) First", "Patch First", "No u
 const WSEditorSwaggerPicker = ({ workspaceName, plane, onClose }: WSEditorSwaggerPickerProps) => {
   const { filterText, updateFilter, filterResources } = useResourceFilter();
 
-  const modulesLoader = useAsyncOperation(specsApi.getModulesForPlane);
+  const resourcesLoader = useAsyncOperation(specsApi.getResourcesForWorkspace);
 
   const [loading, setLoading] = useState(false);
   const [invalidText, setInvalidText] = useState<string | undefined>(undefined);
@@ -120,7 +120,7 @@ const WSEditorSwaggerPicker = ({ workspaceName, plane, onClose }: WSEditorSwagge
       await loadWorkspaceResources();
 
       try {
-        const allModules = await modulesLoader.execute(plane);
+        const allModules = await resourcesLoader.execute(plane);
         setModuleOptions(allModules || []);
         setModuleOptionsCommonPrefix(`/Swagger/Specs/${plane}/`);
 
@@ -611,7 +611,7 @@ const WSEditorSwaggerPicker = ({ workspaceName, plane, onClose }: WSEditorSwagge
         >
           <ListSubheader> Swagger Filters</ListSubheader>
           <MiddlePadding />
-          <AsyncOperationBanner operation={modulesLoader} />
+          <AsyncOperationBanner operation={resourcesLoader} />
           <SwaggerItemSelector
             name="Swagger Module"
             commonPrefix={moduleOptionsCommonPrefix}

src/web/src/views/workspace/components/WorkspaceInstruction/WorkspaceCreateDialog.tsx

@@ -28,7 +28,7 @@ const WorkspaceCreateDialog: React.FC<WorkspaceCreateDialogProps> = ({ openDialo
   const [invalidText, setInvalidText] = useState<string | undefined>(undefined);
   const [workspaceName, setWorkspaceName] = useState<string>(name);
 
-  const modulesLoader = useAsyncOperation(specsApi.getModulesForPlane);
+  const resourcesLoader = useAsyncOperation(specsApi.getResourcesForWorkspace);
 
   const [planes, setPlanes] = useState<Plane[]>([]);
   const [planeOptions, setPlaneOptions] = useState<string[]>([]);
@@ -107,7 +107,7 @@ const WorkspaceCreateDialog: React.FC<WorkspaceCreateDialogProps> = ({ openDialo
         await onModuleSelectionUpdate(null);
       } else {
         try {
-          const options = await modulesLoader.execute(plane.name);
+          const options = await resourcesLoader.execute(plane.name);
           setPlanes((prevPlanes) => {
             const updatedPlanes = [...prevPlanes];
             const index = updatedPlanes.findIndex((v: Plane) => v.name === plane.name);
@@ -257,7 +257,7 @@ const WorkspaceCreateDialog: React.FC<WorkspaceCreateDialogProps> = ({ openDialo
             {invalidText}{" "}
           </Alert>
         )}
-        <AsyncOperationBanner operation={modulesLoader} />
+        <AsyncOperationBanner operation={resourcesLoader} />
         <InputLabel shrink> API Specs</InputLabel>
         <Box
           sx={{
@@ -314,7 +314,7 @@ const WorkspaceCreateDialog: React.FC<WorkspaceCreateDialogProps> = ({ openDialo
           <Button
             disabled={
               loading ||
-              modulesLoader.loading ||
+              resourcesLoader.loading ||
               !selectedPlane ||
               !selectedModule ||
               !selectedResourceProvider ||