Improve rebuild failed button

Author: stuartwdouglas

java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/verifier/VerifyBuiltArtifactsCommand.java

@@ -241,7 +241,6 @@ private List<String> getExcludes() throws IOException {
             newExcludes.addAll(lines);
         }
 
-        newExcludes.addAll(excludes);
         for (var exclude : excludes) {
             if (exclude.matches("^[+-^]:.*$")) {
                 newExcludes.add(exclude.replaceAll("^([+-^])", "^\\\\$1"));

java-components/management-console/src/main/java/com/redhat/hacbs/management/resources/AdminResource.java

@@ -1,7 +1,9 @@
 package com.redhat.hacbs.management.resources;
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.function.UnaryOperator;
 
 import jakarta.inject.Inject;
@@ -55,16 +57,28 @@ public void rebuildAll() {
     @POST
     @Path("rebuild-failed")
     public void rebuildFailed() {
+        Set<String> seen = new HashSet<>();
         for (StoredArtifactBuild sb : StoredArtifactBuild.<StoredArtifactBuild> list("state",
                 ModelConstants.ARTIFACT_BUILD_MISSING)) {
             BuildQueue.rebuild(sb.mavenArtifact, false, Map.of());
         }
         for (StoredArtifactBuild sb : StoredArtifactBuild.<StoredArtifactBuild> list("state",
                 ModelConstants.ARTIFACT_BUILD_FAILED)) {
-            BuildQueue.rebuild(sb.mavenArtifact, false, Map.of());
+            if (sb.buildIdentifier == null || sb.buildIdentifier.dependencyBuildName == null) {
+                BuildQueue.rebuild(sb.mavenArtifact, false, Map.of());
+            } else if (!seen.contains(sb.buildIdentifier.dependencyBuildName)) {
+                BuildQueue.rebuild(sb.mavenArtifact, false, Map.of());
+                seen.add(sb.buildIdentifier.dependencyBuildName);
+            }
         }
     }
 
+    @POST
+    @Path("clear-build-queue")
+    public void clearBuildQueue() {
+        BuildQueue.deleteAll();
+    }
+
     @POST
     @Path("import-froms3")
     public void s3Import() {

java-components/management-console/src/main/webui/src/app/ControlPanel/ControlPanel.tsx

@@ -19,25 +19,30 @@ const ControlPanel: React.FunctionComponent = () => {
     <CardBody>
       <ActionList>
         <ActionListItem>
-          <Button variant="danger" id="rebuild-all" onClick={() => AdminResourceService.postApiAdminRebuildAll()}>
+          <Button variant="danger" id="rebuild-all" onClick={AdminResourceService.postApiAdminRebuildAll}>
             Rebuild All
           </Button>
         </ActionListItem>
         <ActionListItem>
-          <Button variant="warning" id="rebuild-failed" onClick={() => AdminResourceService.postApiAdminRebuildFailed()}>
+          <Button variant="warning" id="rebuild-failed" onClick={AdminResourceService.postApiAdminRebuildFailed}>
             Rebuild Failed
           </Button>
         </ActionListItem>
         <ActionListItem>
-          <Button variant="danger" id="rebuild-failed" onClick={() => AdminResourceService.postApiAdminCleanOutDatabase()}>
+          <Button variant="danger" id="rebuild-failed" onClick={AdminResourceService.postApiAdminCleanOutDatabase}>
             Delete All Data
           </Button>
         </ActionListItem>
         <ActionListItem>
-          <Button variant="warning" id="s3-import" onClick={() => AdminResourceService.postApiAdminImportFroms3()}>
+          <Button variant="warning" id="s3-import" onClick={AdminResourceService.postApiAdminImportFroms3}>
             S3 Import
           </Button>
         </ActionListItem>
+        <ActionListItem>
+          <Button variant="warning" id="s3-import" onClick={AdminResourceService.postApiAdminClearBuildQueue}>
+            Clear Build Queue
+          </Button>
+        </ActionListItem>
       </ActionList>
     </CardBody>
   </Card>

java-components/management-console/src/main/webui/src/services/openapi/services/AdminResourceService.ts

@@ -16,6 +16,16 @@ export class AdminResourceService {
             url: '/api/admin/clean-out-database',
         });
     }
+    /**
+     * @returns any Created
+     * @throws ApiError
+     */
+    public static postApiAdminClearBuildQueue(): CancelablePromise<any> {
+        return __request(OpenAPI, {
+            method: 'POST',
+            url: '/api/admin/clear-build-queue',
+        });
+    }
     /**
      * @returns any Created
      * @throws ApiError