openvsx-webui-test 0.18.0-dev.0 → 0.18.0-dev.2

package/src/pages/extension-detail/extension-detail-reviews.tsx

@@ -35,6 +35,7 @@ export const ExtensionDetailReviews: FunctionComponent<ExtensionDetailReviewsPro
     const [loading, setLoading] = useState<boolean>(true);
     const [revoked, setRevoked] = useState<boolean>(false);
     const [removeDialogOpen, setRemoveDialogOpen] = useState(false);
+    const [removeCommentFromUser, setRemoveCommentFromUser] = useState<UserData | undefined>(undefined);
     const [removeReviewSet, setRemoveReviewSet] = useState(new Set<string>());
     const context = useContext(MainContext);
     const abortController = useRef<AbortController>(new AbortController());
@@ -111,56 +112,65 @@ export const ExtensionDetailReviews: FunctionComponent<ExtensionDetailReviewsPro
         }
     };
 
-    const handleAdminRemoveReviewButton = async (r: ExtensionReview) => {
-        addRemoveReviewRequest(r.user.loginName);
+    const handleAdminRemoveReviewButton = async () => {
+        if (removeCommentFromUser === undefined) {
+            return;
+        }
+        addRemoveReviewRequest(removeCommentFromUser.loginName);
         try {
-            const result = await context.service.deleteUserReview(abortController.current, props.extension, r.user);
+            const result = await context.service.deleteUserReview(abortController.current, props.extension, removeCommentFromUser);
             if (isError(result)) {
                 throw result;
             }
             saveCompleted();
+            setRemoveDialogOpen(false);
         } catch (err) {
             context.handleError(err);
         } finally {
-            deleteRemoveReviewRequest(r.user.loginName);
+            deleteRemoveReviewRequest(removeCommentFromUser.loginName);
         }
     };
 
     const renderAdminRemoveButton = (r: ExtensionReview): ReactNode => {
-        return <>
-            <Button
-                variant='contained'
-                color='error'
-                onClick={() => setRemoveDialogOpen(true)} >
-                Remove review
-            </Button>
-            <Dialog
-                open={removeDialogOpen}
-                onClose={() => setRemoveDialogOpen(false)}>
-                <DialogTitle>Remove Review</DialogTitle>
-                <DialogContent>
-                    <DialogContentText component='div'>
-                        <Typography>Confirm removal of review comment from <code>{r.user.loginName}</code>?</Typography>
-                    </DialogContentText>
-                </DialogContent>
-                <DialogActions>
-                    <Button
-                        variant='contained'
-                        color='primary'
-                        onClick={() => setRemoveDialogOpen(false)} >
-                        Cancel
-                    </Button>
-                    <ButtonWithProgress
-                        autoFocus
-                        color='error'
-                        sx={{ ml: 1 }}
-                        working={removeReviewSet.has(r.user.loginName)}
-                        onClick={() => handleAdminRemoveReviewButton(r)} >
-                        Remove review
-                    </ButtonWithProgress>
-                </DialogActions>
-            </Dialog>
-            </>;
+        return <Button
+            variant='contained'
+            color='error'
+            sx={{ ml: 1 }}
+            onClick={() => {
+                setRemoveCommentFromUser(r.user);
+                setRemoveDialogOpen(true);
+            }}>
+            Remove review
+        </Button>;
+    };
+
+    const renderAdminRemoveDialog = () => {
+        return <Dialog
+            open={removeDialogOpen}
+            onClose={() => setRemoveDialogOpen(false)}>
+            <DialogTitle>Remove Review</DialogTitle>
+            <DialogContent>
+                <DialogContentText component='div'>
+                    <Typography>Confirm removal of review comment from <code>{removeCommentFromUser?.loginName}</code>?</Typography>
+                </DialogContentText>
+            </DialogContent>
+            <DialogActions>
+                <Button
+                    variant='contained'
+                    color='primary'
+                    onClick={() => setRemoveDialogOpen(false)} >
+                    Cancel
+                </Button>
+                <ButtonWithProgress
+                    autoFocus
+                    color='error'
+                    sx={{ ml: 1 }}
+                    working={removeReviewSet.has(removeCommentFromUser?.loginName ?? '')}
+                    onClick={() => handleAdminRemoveReviewButton()} >
+                    Remove review
+                </ButtonWithProgress>
+            </DialogActions>
+        </Dialog>;
     };
 
     const renderReviewList = (list?: ExtensionReviewList): ReactNode => {
@@ -251,6 +261,7 @@ export const ExtensionDetailReviews: FunctionComponent<ExtensionDetailReviewsPro
         <Box>
             <DelayedLoadIndicator loading={loading}/>
             {renderReviewList(reviewList)}
+            {context.user?.role === 'admin' && renderAdminRemoveDialog()}
         </Box>
     </>;
 

package/src/server-request.ts

@@ -28,7 +28,7 @@ export interface ErrorResponse {
     trace?: string;
 }
 
-export async function sendRequest<Res>(req: ServerAPIRequest): Promise<Res> {
+export async function sendRequest<Res>(req: ServerAPIRequest, retry: boolean = true): Promise<Res> {
     req.method ??= 'GET';
     req.headers ??= {};
     if (!req.headers['Accept']) {
@@ -50,7 +50,7 @@ export async function sendRequest<Res>(req: ServerAPIRequest): Promise<Res> {
         param.credentials = 'include';
     }
 
-    const options: any = {
+    const options: any = retry ? {
         retries: 10,
         retryDelay: (attempt: number, error: Error, response: Response) => {
             return Math.pow(2, attempt) * 1000;
@@ -58,7 +58,7 @@ export async function sendRequest<Res>(req: ServerAPIRequest): Promise<Res> {
         retryOn: (attempt: number, error: Error, response: Response) => {
             return error !== null || response.status >= 500;
         }
-    };
+    } : {};
 
     const response = await fetchBuilder(fetch, options)(req.endpoint, param);
     if (response.ok) {