Support update Maven profiles (#1331)

Signed-off-by: Sheng Chen <[email protected]>

Author: jdneo

src/project-settings/assets/classpath/features/ClasspathConfigurationView.tsx

@@ -8,16 +8,16 @@ import Output from "./components/Output";
 import Sources from "./components/Sources";
 import Libraries from "./components/Libraries";
 import Exception from "./components/Exception";
-import { ClasspathViewException, ProjectInfo } from "../../../handlers/classpath/types";
-import { catchException, initializeProjectsData, listVmInstalls, loadClasspath, updateActiveTab } from "./classpathConfigurationViewSlice";
+import { ClasspathViewException, ProjectInfo } from "../../../types";
+import { catchException, listVmInstalls, loadClasspath, updateActiveTab } from "./classpathConfigurationViewSlice";
 import JdkRuntime from "./components/JdkRuntime";
 import { ClasspathRequest } from "../../vscode/utils";
 import { VSCodePanelTab, VSCodePanelView, VSCodePanels, VSCodeProgressRing } from "@vscode/webview-ui-toolkit/react";
 import { ProjectType } from "../../../../utils/webview";
 import UnmanagedFolderSources from "./components/UnmanagedFolderSources";
 import Hint from "./components/Hint";
 import "../style.scss";
-import { listProjects, setProjectType } from "../../mainpage/features/commonSlice";
+import { setProjectType } from "../../mainpage/features/commonSlice";
 
 const ClasspathConfigurationView = (): JSX.Element => {
   const activeTab: string = useSelector((state: any) => state.classpathConfig.ui.activeTab);
@@ -62,10 +62,7 @@ const ClasspathConfigurationView = (): JSX.Element => {
 
   const onMessage = (event: any) => {
     const { data } = event;
-    if (data.command === "classpath.onDidListProjects") {
-      dispatch(initializeProjectsData({ projectsNum: data.projectInfo?.length }));
-      dispatch(listProjects(data.projectInfo));
-    } else if (data.command === "classpath.onDidListVmInstalls") {
+    if (data.command === "classpath.onDidListVmInstalls") {
       dispatch(listVmInstalls(data.vmInstalls))
     } else if (data.command === "classpath.onDidLoadProjectClasspath") {
       dispatch(setProjectType({
@@ -87,7 +84,6 @@ const ClasspathConfigurationView = (): JSX.Element => {
       // redux store is empty. When switching between tabs, the
       // state will be preserved.
       ClasspathRequest.onWillListProjects();
-      ClasspathRequest.onWillListVmInstalls();
     }
     return () => {
       window.removeEventListener("message", onMessage);

src/project-settings/assets/classpath/features/classpathConfigurationViewSlice.ts

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-import { createSlice, current } from "@reduxjs/toolkit";
+import { createSlice } from "@reduxjs/toolkit";
 import _ from "lodash";
-import { ClasspathEntry } from "../../../handlers/classpath/types";
+import { ClasspathEntry } from "../../../types";
 
 export const classpathConfigurationViewSlice = createSlice({
     name: "classpathConfig",
@@ -25,7 +25,7 @@ export const classpathConfigurationViewSlice = createSlice({
       updateActiveTab: (state, action) => {
         state.ui.activeTab = action.payload;
       },
-      initializeProjectsData: (state, action) => {
+      initializeClasspathData: (state, action) => {
         const projectNum = action.payload.projectsNum;
         state.data.activeVmInstallPath = Array(projectNum).fill("");
         state.data.sources = Array(projectNum).fill([]);
@@ -40,13 +40,13 @@ export const classpathConfigurationViewSlice = createSlice({
         state.data.output[activeProjectIndex] = action.payload.output;
         state.data.activeVmInstallPath[activeProjectIndex] = action.payload.activeVmInstallPath;
         // Only update the array when they have different elements.
-        const currentSources = _.sortBy(current(state.data.sources), ["path", "output"]); // TODO: activeProjectIndex needed?
+        const currentSources = _.sortBy(state.data.sources[activeProjectIndex], ["path", "output"]);
         const newSources = _.sortBy(action.payload.sources, ["path", "output"]);
         if (!_.isEqual(currentSources, newSources)) {
           state.data.sources[activeProjectIndex] = action.payload.sources;
         }
 
-        const currentLibs = _.sortBy(current(state.data.libraries), ["path"]);
+        const currentLibs = _.sortBy(state.data.libraries[activeProjectIndex], ["path"]);
         const newLibs = _.sortBy(action.payload.libraries, ["path"]);
         if (!_.isEqual(currentLibs, newLibs)) {
           state.data.libraries[activeProjectIndex] = action.payload.libraries;
@@ -97,7 +97,7 @@ function isDifferentStringArray(a1: string[], a2: string[]): boolean {
 
 export const {
   updateActiveTab,
-  initializeProjectsData,
+  initializeClasspathData,
   listVmInstalls,
   loadClasspath,
   updateSource,

src/project-settings/assets/classpath/features/components/Exception.tsx

@@ -4,7 +4,7 @@
 import React from "react";
 import { useSelector } from "react-redux";
 import { encodeCommandUriWithTelemetry, supportedByNavigator } from "../../../../../utils/webview";
-import { ClasspathViewException } from "../../../../handlers/classpath/types";
+import { ClasspathViewException } from "../../../../types";
 import { WEBVIEW_ID } from "../../utils";
 
 const Exception = (): JSX.Element | null => {

src/project-settings/assets/classpath/features/components/Hint.tsx

@@ -3,7 +3,7 @@
 
 import { VSCodeLink} from "@vscode/webview-ui-toolkit/react";
 import React, { useEffect } from "react";
-import { ProjectInfo } from "../../../../handlers/classpath/types";
+import { ProjectInfo } from "../../../../types";
 import { useSelector } from "react-redux";
 import { ProjectType } from "../../../../../utils/webview";
 import { updateMaxHeight } from "../../utils";

src/project-settings/assets/classpath/features/components/JdkRuntime.tsx

@@ -5,7 +5,7 @@ import React, { Dispatch, useEffect, useState } from "react";
 import { ClasspathRequest, CommonRequest } from "../../../vscode/utils";
 import { VSCodeDivider, VSCodeDropdown, VSCodeOption, } from "@vscode/webview-ui-toolkit/react";
 import { useDispatch, useSelector } from "react-redux";
-import { VmInstall } from "../../../../handlers/classpath/types";
+import { VmInstall } from "../../../../types";
 import { setJdks } from "../classpathConfigurationViewSlice";
 
 const JdkRuntime = (): JSX.Element => {
@@ -97,6 +97,9 @@ const JdkRuntime = (): JSX.Element => {
     // to change its style.
     document.querySelector("#jdk-dropdown")?.shadowRoot
         ?.querySelector(".listbox")?.setAttribute("style", "max-height: initial;");
+    if (vmInstalls.length === 0) {
+      ClasspathRequest.onWillListVmInstalls();
+    }
     return () => window.removeEventListener("message", onDidChangeJdk);
   }, []);
 

src/project-settings/assets/classpath/features/components/Libraries.tsx

@@ -7,7 +7,7 @@ import { useSelector, useDispatch } from "react-redux";
 import { removeReferencedLibrary, addLibraries } from "../classpathConfigurationViewSlice";
 import { ClasspathRequest } from "../../../vscode/utils";
 import { VSCodeButton, VSCodeDataGrid, VSCodeDataGridCell, VSCodeDataGridRow, VSCodeDivider } from "@vscode/webview-ui-toolkit/react";
-import { ClasspathEntry, ClasspathEntryKind } from "../../../../handlers/classpath/types";
+import { ClasspathEntry, ClasspathEntryKind } from "../../../../types";
 
 const Libraries = (): JSX.Element => {
 

src/project-settings/assets/classpath/features/components/Sources.tsx

@@ -7,7 +7,7 @@ import { Dispatch } from "@reduxjs/toolkit";
 import { updateSource } from "../classpathConfigurationViewSlice";
 import { ClasspathRequest } from "../../../vscode/utils";
 import { VSCodeButton, VSCodeDataGrid, VSCodeDataGridCell, VSCodeDataGridRow, VSCodeDivider, VSCodeTextField } from "@vscode/webview-ui-toolkit/react";
-import { ClasspathEntry, ClasspathEntryKind } from "../../../../handlers/classpath/types";
+import { ClasspathEntry, ClasspathEntryKind } from "../../../../types";
 
 const Sources = (): JSX.Element => {
 

src/project-settings/assets/classpath/features/components/UnmanagedFolderSources.tsx

@@ -8,7 +8,7 @@ import { updateSource } from "../classpathConfigurationViewSlice";
 import { ClasspathRequest } from "../../../vscode/utils";
 import { ProjectType } from "../../../../../utils/webview";
 import { VSCodeButton, VSCodeDataGrid, VSCodeDataGridCell, VSCodeDataGridRow, VSCodeDivider } from "@vscode/webview-ui-toolkit/react";
-import { ClasspathEntry } from "../../../../handlers/classpath/types";
+import { ClasspathEntry } from "../../../../types";
 
 const UnmanagedFolderSources = (): JSX.Element => {
 

src/project-settings/assets/classpath/style.scss

@@ -112,6 +112,11 @@
   }
 }
 
+.setting-section-subtitle {
+  display: flex;
+  align-items: baseline;
+}
+
 .setting-section-text {
   width: 100%;
   max-width: 420px;

src/project-settings/assets/mainpage/features/ProjectSettingView.tsx

@@ -4,13 +4,16 @@
 import React, { Dispatch } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import ClasspathConfigurationView from "../../classpath/features/ClasspathConfigurationView";
-import { updateActiveTab } from "../../classpath/features/classpathConfigurationViewSlice";
+import { initializeClasspathData, updateActiveTab } from "../../classpath/features/classpathConfigurationViewSlice";
 import "../style.scss";
-import { updateActiveSection } from "./commonSlice";
+import { listProjects, updateActiveSection } from "./commonSlice";
 import ProjectSelector from "./component/ProjectSelector";
 import { VSCodeDivider } from "@vscode/webview-ui-toolkit/react";
 import Footer from "./component/Footer";
 import SideBar from "./component/SideBar";
+import MavenConfigurationView from "../../maven/features/MavenConfigurationView";
+import { SectionId } from "../../../types";
+import { initializeMavenData } from "../../maven/features/mavenConfigurationViewSlice";
 
 const ProjectSettingView = (): JSX.Element => {
   const activeSection: string = useSelector((state: any) => state.commonConfig.ui.activeSection);
@@ -24,8 +27,10 @@ const ProjectSettingView = (): JSX.Element => {
   }, []);
 
   const getSectionContent = () => {
-    if (activeSection === "classpath") {
+    if (activeSection === SectionId.Classpath) {
       return <ClasspathConfigurationView />;
+    } else if (activeSection === SectionId.Maven) {
+      return <MavenConfigurationView />;
     }
 
     return null;
@@ -38,7 +43,7 @@ const ProjectSettingView = (): JSX.Element => {
       dispatch(updateActiveSection(routes[0]));
       if (routes.length > 1) {
         switch (routes[0]) {
-          case "classpath":
+          case SectionId.Classpath:
             // TODO: sometimes when directly trigger 'Configure Java Runtime', the tab won't
             // focus to the JDK part, need to investigate
             dispatch(updateActiveTab(routes[1]));
@@ -47,6 +52,10 @@ const ProjectSettingView = (): JSX.Element => {
             break;
         }
       }
+    } else if (data.command === "main.onDidListProjects") {
+      dispatch(initializeClasspathData({ projectsNum: data.projectInfo?.length }));
+      dispatch(initializeMavenData({ projectsNum: data.projectInfo?.length }));
+      dispatch(listProjects(data.projectInfo));
     }
   }