Skip to content

Commit 714e572

Browse files
committed
Added Label Management controller/view/routes
1 parent be78fa6 commit 714e572

File tree

4 files changed

+17
-1
lines changed

4 files changed

+17
-1
lines changed

app/controllers/Application.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,8 @@ class Application @Inject() (files: FileService, collections: CollectionService,
496496
api.routes.javascript.Extractions.addExtractorInfo,
497497
api.routes.javascript.Extractions.getExtractorInfo,
498498
api.routes.javascript.Extractions.deleteExtractor,
499+
api.routes.javascript.Extractions.createExtractorsLabel,
500+
api.routes.javascript.Extractions.updateExtractorsLabel,
499501
api.routes.javascript.Folders.createFolder,
500502
api.routes.javascript.Folders.deleteFolder,
501503
api.routes.javascript.Folders.updateFolderName,
@@ -523,6 +525,7 @@ class Application @Inject() (files: FileService, collections: CollectionService,
523525
controllers.routes.javascript.Collections.newCollectionWithParent,
524526
controllers.routes.javascript.Spaces.stagingArea,
525527
controllers.routes.javascript.Extractors.selectExtractors,
528+
controllers.routes.javascript.Extractors.manageLabels,
526529
controllers.routes.javascript.Extractors.showJobHistory,
527530
controllers.routes.javascript.CurationObjects.submit,
528531
controllers.routes.javascript.CurationObjects.getCurationObject,

app/controllers/Extractors.scala

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,15 @@ class Extractors @Inject() (extractions: ExtractionService,
6666
Ok(views.html.updateExtractors(runningExtractors, selectedExtractors, groups))
6767
}
6868

69+
def manageLabels = ServerAdminAction { implicit request =>
70+
implicit val user = request.user
71+
val categories = List[String]("EXTRACT")
72+
val extractors = extractorService.listExtractorsInfo(categories)
73+
val labels = extractorService.listExtractorsLabels()
74+
75+
Ok(views.html.extractorLabels(labels, extractors))
76+
}
77+
6978
/**
7079
* Processes POST request. Updates list of extractors associated with this instance in mongo.
7180
*/

app/views/updateExtractors.scala.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ <h1>Extractor Catalog</h1>
3131

3232
<!-- TODO: Link to Extractor Labels view iff user is server admin -->
3333
@if(Permission.checkServerAdmin(user)) {
34-
<a href="#" style="margin-top:-3.0em;" class="btn btn-default btn-xs pull-right">
34+
<a href="@routes.Extractors.manageLabels" style="margin-top:-3.0em;" class="btn btn-default btn-xs pull-right">
3535
<span class="glyphicon glyphicon-wrench"></span> Manage
3636
</a>
3737
}

conf/routes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ POST /spaces/submit
179179
# ----------------------------------------------------------------------
180180
# EXTRACTORS
181181
# ----------------------------------------------------------------------
182+
GET /extractors/labels @controllers.Extractors.manageLabels()
182183
GET /extractors/:extractorName @controllers.Extractors.showExtractorInfo(extractorName)
183184
GET /extractors/:extractorName/metrics @controllers.Extractors.showExtractorMetrics(extractorName)
184185
GET /extractors/:extractorName/logs @controllers.Extractors.showExtractorLog(extractorName)
@@ -423,6 +424,9 @@ POST /api/files/:id/sendUnarchiveRequest
423424
GET /api/extractors @api.Extractions.listExtractors(categories: List[String] ?= List.empty)
424425
GET /api/extractors/:name @api.Extractions.getExtractorInfo(name: String)
425426
POST /api/extractors @api.Extractions.addExtractorInfo()
427+
POST /api/extractors/labels @api.Extractions.createExtractorsLabel()
428+
PUT /api/extractors/labels/:id @api.Extractions.updateExtractorsLabel(id: UUID)
429+
426430

427431
POST /api/files/:file_id/extractions @api.Extractions.submitFileToExtractor(file_id: UUID)
428432
POST /api/datasets/:ds_id/extractions @api.Extractions.submitDatasetToExtractor(ds_id: UUID)

0 commit comments

Comments
 (0)