ui component cleanup

Author: paxtonhare

marklogic-data-hub/src/main/java/com/marklogic/hub/FlowManager.java

@@ -16,30 +16,21 @@
 package com.marklogic.hub;
 
 import com.marklogic.client.DatabaseClient;
-import com.marklogic.client.DatabaseClientFactory;
 import com.marklogic.client.extensions.ResourceManager;
 import com.marklogic.client.extensions.ResourceServices.ServiceResult;
 import com.marklogic.client.extensions.ResourceServices.ServiceResultIterator;
 import com.marklogic.client.io.DOMHandle;
 import com.marklogic.client.util.RequestParameters;
 import com.marklogic.hub.flow.*;
 import com.marklogic.hub.flow.impl.FlowRunnerImpl;
-import com.marklogic.spring.batch.hub.FlowConfig;
-import com.marklogic.spring.batch.hub.RunHarmonizeFlowConfig;
-import com.marklogic.spring.batch.hub.StagingConfig;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.launch.JobLauncher;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 public class FlowManager extends ResourceManager {
     private static final String HUB_NS = "http://marklogic.com/data-hub";

marklogic-data-hub/src/main/java/com/marklogic/hub/flow/impl/FlowRunnerImpl.java

@@ -1,12 +1,6 @@
 package com.marklogic.hub.flow.impl;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.marklogic.client.DatabaseClient;
-import com.marklogic.client.extensions.ResourceManager;
-import com.marklogic.client.extensions.ResourceServices;
-import com.marklogic.client.io.Format;
-import com.marklogic.client.io.StringHandle;
-import com.marklogic.client.util.RequestParameters;
 import com.marklogic.hub.HubConfig;
 import com.marklogic.hub.HubDatabase;
 import com.marklogic.hub.flow.*;

marklogic-data-hub/src/trace-ui/src/app/ml-error/ml-error.style.scss renamed to marklogic-data-hub/src/trace-ui/src/app/ml-error/ml-error.component.scss

@@ -6,7 +6,7 @@ import * as _ from 'lodash';
 @Component({
   selector: 'app-ml-error',
   templateUrl: './ml-error.component.html',
-  styleUrls: ['./ml-error.style.scss'],
+  styleUrls: ['./ml-error.component.scss'],
 })
 export class MlErrorComponent implements OnInit {
   @Input() error: MlError;

marklogic-data-hub/src/trace-ui/src/app/ml-error/ml-error.component.ts

@@ -28,15 +28,16 @@ <h1>Traces</h1>
             <tr>
               <th class="mdl-data-table__cell--non-numeric">Type</th>
               <th class="mdl-data-table__cell--non-numeric">Identifier</th>
+              <th class="mdl-data-table__cell--non-numeric">Job ID</th>
               <th class="mdl-data-table__cell--non-numeric">Created</th>
             </tr>
           </thead>
           <tbody>
             <tr *ngFor="let trace of traces" (click)="showTrace(trace.traceId)" [ngClass]="{'error' : trace.hasError }">
-              <td colspan="4" *ngIf="!trace.identifier && !trace.collectorPlugin" style="text-align: center">This trace has an invalid format</td>
-              <td *ngIf="trace.identifier"><i class="mdi" [ngClass]="getIconClass(trace)"></i> {{trace.flowType}}</td>
-              <td *ngIf="trace.identifier" class="mdl-data-table__cell--non-numeric">{{trace.identifier | truncate:25}}</td>
-              <td *ngIf="trace.identifier">{{trace.created | amTimeAgo}}</td>
+              <td><i class="mdi" [ngClass]="getIconClass(trace)"></i> {{trace.flowType}}</td>
+              <td class="mdl-data-table__cell--non-numeric">{{trace.identifier | truncate:25}}</td>
+              <td class="mdl-data-table__cell--non-numeric">{{trace.jobId}}</td>
+              <td>{{trace.created | amTimeAgo}}</td>
             </tr>
           </tbody>
         </table>

marklogic-data-hub/src/trace-ui/src/app/traces/traces.component.html

@@ -1,7 +1,6 @@
 package com.marklogic.gradle.task
 
 import com.marklogic.client.DatabaseClient
-import com.marklogic.hub.DataHub
 import com.marklogic.hub.HubConfig
 import org.gradle.testkit.runner.BuildResult
 import org.gradle.testkit.runner.GradleRunner

ml-data-hub-plugin/src/test/groovy/com/marklogic/gradle/task/BaseTest.groovy

@@ -23,20 +23,11 @@
 import com.marklogic.quickstart.model.FlowModel;
 import com.marklogic.quickstart.model.PluginModel;
 import com.marklogic.quickstart.util.FileUtil;
-import com.marklogic.spring.batch.hub.FlowConfig;
-import com.marklogic.spring.batch.hub.StagingConfig;
 import org.apache.commons.io.FileUtils;
-import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.launch.JobLauncher;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 
-import javax.xml.parsers.ParserConfigurationException;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
@@ -47,7 +38,6 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.UUID;
 
 @Service
 public class FlowManagerService {

quick-start/src/main/java/com/marklogic/quickstart/service/FlowManagerService.java

@@ -17,7 +17,6 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.marklogic.hub.flow.Flow;
-import com.marklogic.hub.flow.FlowStatusListener;
 import com.marklogic.hub.flow.FlowType;
 import com.marklogic.quickstart.EnvironmentAware;
 import com.marklogic.quickstart.model.EntityModel;
@@ -26,7 +25,6 @@
 import com.marklogic.quickstart.service.EntityManagerService;
 import com.marklogic.quickstart.service.FlowManagerService;
 import com.marklogic.quickstart.service.JobService;
-import org.springframework.batch.core.JobExecution;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

quick-start/src/main/java/com/marklogic/quickstart/web/EntitiesController.java

@@ -6,7 +6,7 @@ import * as _ from 'lodash';
 @Component({
   selector: 'app-ml-error',
   templateUrl: './ml-error.component.html',
-  styleUrls: ['./ml-error.style.scss'],
+  styleUrls: ['./ml-error.component.scss'],
 })
 export class MlErrorComponent implements OnInit {
   @Input() error: MlError;