fix: update code to comments

Author: wenytang-ms

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

@@ -11,19 +11,21 @@ import { removeReferencedLibrary, addLibraries } from "../classpathConfiguration
 import { ClasspathRequest } from "../../../vscode/utils";
 
 import { ClasspathEntry, ClasspathEntryKind } from "../../../../types";
-import { ProjectType } from "../../../../../utils/webview";
+import { isProjectType } from "../../../../../utils/webview";
 
 const Libraries = (): JSX.Element => {
 
   const [hoveredRow, setHoveredRow] = useState<string | null>(null);
+  const addLibraryBtnRef = useRef<HTMLElement>(null);
   const activeProjectIndex: number = useSelector((state: any) => state.commonConfig.ui.activeProjectIndex);
   const activeProjectIndexRef = useRef(activeProjectIndex);
   useEffect(() => {
     activeProjectIndexRef.current = activeProjectIndex;
   }, [activeProjectIndex]);
 
   const libraries: ClasspathEntry[] = useSelector((state: any) => state.classpathConfig.data.libraries[activeProjectIndex]);
-  const projectType: ProjectType = useSelector((state: any) => state.commonConfig.data.projectType[activeProjectIndex]);
+  const projectType: unknown = useSelector((state: any) => state.commonConfig.data.projectType[activeProjectIndex]);
+  const canAddLibrary = isProjectType(projectType);
   const dispatch: Dispatch<any> = useDispatch();
 
   const handleRemove = (index: number) => {
@@ -34,9 +36,22 @@ const Libraries = (): JSX.Element => {
   };
 
   const handleAdd = () => {
+    if (!canAddLibrary) {
+      return;
+    }
     ClasspathRequest.onWillSelectLibraries(projectType);
   };
 
+  useEffect(() => {
+    const el = addLibraryBtnRef.current;
+    if (!el) return;
+    if (canAddLibrary) {
+      el.removeAttribute("disabled");
+    } else {
+      el.setAttribute("disabled", "");
+    }
+  }, [canAddLibrary]);
+
   const onDidAddLibraries = (event: OnDidAddLibrariesEvent) => {
     const {data} = event;
     if (data.command === "classpath.onDidAddLibraries") {
@@ -112,7 +127,7 @@ const Libraries = (): JSX.Element => {
     <div className="setting-section">
       <div>
         <div id="list-actions" className="flex-center setting-list-actions">
-          <vscode-button class="ghost-button" onClick={() => handleAdd()}>
+          <vscode-button ref={addLibraryBtnRef} class="ghost-button" onClick={() => handleAdd()}>
             <span className="codicon codicon-add mr-1"></span>
             Add Library...
           </vscode-button>

src/project-settings/handlers/ClasspathRequestHandler.ts

@@ -8,7 +8,7 @@ import { ClasspathComponent, VmInstall, ClasspathEntry, ClasspathEntryKind } fro
 import _ from "lodash";
 import { instrumentOperation, sendError, sendInfo, setUserError } from "vscode-extension-telemetry-wrapper";
 import { getProjectType } from "../../utils/jdt";
-import { ProjectType } from "../../utils/webview";
+import { ProjectType, isProjectType } from "../../utils/webview";
 
 export class ClasspathRequestHandler implements vscode.Disposable {
     private webview: vscode.Webview;
@@ -362,7 +362,7 @@ export class ClasspathRequestHandler implements vscode.Disposable {
         }
     });
 
-    private selectLibraries = instrumentOperation("projectSettings.classpath.selectLibraries", async (_operationId: string, currentProjectRoot: vscode.Uri, projectType: ProjectType) => {
+    private selectLibraries = instrumentOperation("projectSettings.classpath.selectLibraries", async (_operationId: string, currentProjectRoot: vscode.Uri, projectType: unknown) => {
         const jarFiles: vscode.Uri[] | undefined = await vscode.window.showOpenDialog({
             defaultUri: vscode.workspace.workspaceFolders?.[0].uri,
             openLabel: "Select Jar File",
@@ -386,8 +386,8 @@ export class ClasspathRequestHandler implements vscode.Disposable {
         }
     });
 
-    private toLibraryPathForProject(uri: vscode.Uri, currentProjectRoot: vscode.Uri, projectType: ProjectType): string {
-        if (projectType !== ProjectType.UnmanagedFolder) {
+    private toLibraryPathForProject(uri: vscode.Uri, currentProjectRoot: vscode.Uri, projectType: unknown): string {
+        if (isProjectType(projectType) && projectType !== ProjectType.UnmanagedFolder) {
             return uri.fsPath;
         }
 

src/utils/webview.ts

@@ -54,6 +54,14 @@ export enum ProjectType {
   Others = "Others",
 }
 
+export function isProjectType(projectType: unknown): projectType is ProjectType {
+  return projectType === ProjectType.Default ||
+    projectType === ProjectType.UnmanagedFolder ||
+    projectType === ProjectType.Maven ||
+    projectType === ProjectType.Gradle ||
+    projectType === ProjectType.Others;
+}
+
 export enum NatureId {
   Maven = "org.eclipse.m2e.core.maven2Nature",
   Gradle = "org.eclipse.buildship.core.gradleprojectnature",