public/docs
1
0
Fork 0
mirror of https://github.com/sismics/docs.git synced 2025-12-13 09:46:17 +00:00
Code Issues Releases Wiki Activity

Closes #192: workflow active info + search criteria

Browse Source
This commit is contained in:
Benjamin Gamard
2018-03-06 12:27:45 +01:00
parent 71f15e1736
commit 2c90df2c2d
10 changed files with 158 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs-web/src/main/java/com/sismics/docs/rest/resource/DocumentResource.java
View File

@@ -333,6 +333,7 @@ public class DocumentResource extends BaseResource {
* @apiSuccess {Number} documents.create_date Create date (timestamp)
* @apiSuccess {String} documents.language Language
* @apiSuccess {Boolean} documents.shared True if the document is shared
* @apiSuccess {Boolean} documents.active_route True if a route is active on this document
* @apiSuccess {Number} documents.file_count Number of files in this document
* @apiSuccess {Object[]} documents.tags List of tags
* @apiSuccess {String} documents.tags.id ID
@@ -397,6 +398,7 @@ public class DocumentResource extends BaseResource {
.add("create_date", documentDto.getCreateTimestamp())
.add("language", documentDto.getLanguage())
.add("shared", documentDto.getShared())
.add("active_route", documentDto.isActiveRoute())
.add("file_count", documentDto.getFileCount())
.add("tags", tags));
}
@@ -514,6 +516,12 @@ public class DocumentResource extends BaseResource {
documentCriteria.setCreatorId(user.getId());
}
break;
case "workflow":
// New shared state criteria
if (params[1].equals("me")) {
documentCriteria.setActiveRoute(true);
}
break;
case "full":
// New full content search criteria
fullQuery.add(params[1]);

6
docs-web/src/main/webapp/src/app/docs/controller/document/Document.js
View File

@@ -200,6 +200,12 @@ angular.module('docs').controller('Document', function ($scope, $rootScope, $tim
return s + 'tag:' + t.name + ' ';
}, '');
}
if ($scope.advsearch.shared) {
search += 'shared:yes ';
}
if ($scope.advsearch.workflow) {
search += 'workflow:me ';
}
$scope.search = search;
$scope.searchOpened = false;
};

2
docs-web/src/main/webapp/src/index.html
View File

@@ -167,7 +167,7 @@
</div>
<div class="row" ng-controller="Footer">
<div class="col-md-12 footer text-center text-muted">
<div class="col-md-12 footer text-center text-muted small">
<div class="alert alert-danger" ng-show="app.global_storage_quota && app.global_storage_quota * 0.8 < app.global_storage_current"
translate="index.global_quota_warning"
translate-values="{ current: app.global_storage_current / 1000000, percent: app.global_storage_current / app.global_storage_quota * 100, total: app.global_storage_quota / 1000000 }">

3
docs-web/src/main/webapp/src/locale/en.json
View File

@@ -46,6 +46,8 @@
"search_before_date": "Before this date",
"search_after_date": "After this date",
"search_tags": "Tags",
"search_shared": "Only shared documents",
"search_workflow": "Workflow assigned to me",
"search_clear": "Clear",
"any_language": "Any language",
"add_document": "Add a document",
@@ -56,6 +58,7 @@
"search": "Search",
"search_empty": "No matches for <strong>\"{{ search }}\"</strong>",
"shared": "Shared",
"active_route": "Workflow assigned to me",
"title": "Title",
"description": "Description",
"contributors": "Contributors",

13
docs-web/src/main/webapp/src/partial/docs/document.html
View File

@@ -118,6 +118,18 @@
</div>
</div>
<div class="checkbox">
<label>
<input type="checkbox" ng-model="advsearch.shared"> {{ 'document.search_shared' | translate }}
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" ng-model="advsearch.workflow"> {{ 'document.search_workflow' | translate }}
</label>
</div>
<div class="form-group text-center">
<button type="submit" ng-click="startSearch()" class="btn btn-primary">
<span class="glyphicon glyphicon-search"></span> {{ 'document.search' | translate }}
@@ -158,6 +170,7 @@
<td colspan="2">
{{ document.title }} ({{ document.file_count }})
<span class="glyphicon glyphicon-share" ng-if="document.shared" uib-tooltip="{{ 'document.shared' | translate }}"></span>
<span class="glyphicon glyphicon-random" ng-if="document.active_route" uib-tooltip="{{ 'document.active_route' | translate }}"></span>
<a href="#/document/view/{{ document.id }}" target="_blank" ng-click="$event.stopPropagation()"><span class="glyphicon glyphicon-link"></span></a>
<div class="pull-right text-muted small">{{ document.create_date | timeAgo: dateFormat }}</div>

3
docs-web/src/test/java/com/sismics/docs/rest/TestDocumentResource.java
View File

@@ -122,7 +122,8 @@ public class TestDocumentResource extends BaseJerseyTest {
Assert.assertEquals(tag1Id, tags.getJsonObject(0).getString("id"));
Assert.assertEquals("SuperTag", tags.getJsonObject(0).getString("name"));
Assert.assertEquals("#ffff00", tags.getJsonObject(0).getString("color"));
Assert.assertFalse(documents.getJsonObject(0).getBoolean("active_route"));
// List all documents from document3
json = target().path("/document/list")
.queryParam("sort_column", 3)

83
docs-web/src/test/java/com/sismics/docs/rest/TestRouteResource.java
View File

@@ -70,6 +70,28 @@ public class TestRouteResource extends BaseJerseyTest {
Assert.assertEquals("Check the document's metadata", step.getString("name"));
Assert.assertTrue(popEmail().contains("workflow step"));
// List all documents with route1
json = target().path("/document/list")
.queryParam("sort_column", 3)
.queryParam("asc", true)
.request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, route1Token)
.get(JsonObject.class);
JsonArray documents = json.getJsonArray("documents");
Assert.assertEquals(1, documents.size());
Assert.assertFalse(documents.getJsonObject(0).getBoolean("active_route"));
// List all documents with admin
json = target().path("/document/list")
.queryParam("sort_column", 3)
.queryParam("asc", true)
.request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.get(JsonObject.class);
documents = json.getJsonArray("documents");
Assert.assertEquals(1, documents.size());
Assert.assertTrue(documents.getJsonObject(0).getBoolean("active_route"));
// Get the route on document 1
json = target().path("/route")
.queryParam("documentId", document1Id)
@@ -231,6 +253,23 @@ public class TestRouteResource extends BaseJerseyTest {
.get(JsonObject.class);
Assert.assertFalse(json.containsKey("route_step"));
// List all documents with route1
json = target().path("/document/list")
.request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, route1Token)
.get(JsonObject.class);
documents = json.getJsonArray("documents");
Assert.assertEquals(1, documents.size());
Assert.assertFalse(documents.getJsonObject(0).getBoolean("active_route"));
// List all documents with admin
json = target().path("/document/list")
.request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.get(JsonObject.class);
documents = json.getJsonArray("documents");
Assert.assertEquals(0, documents.size());
// Start the default route on document 1
target().path("/route/start").request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, route1Token)
@@ -251,6 +290,33 @@ public class TestRouteResource extends BaseJerseyTest {
.get();
Assert.assertEquals(Response.Status.OK, Response.Status.fromStatusCode(response.getStatus()));
// List all documents with route1
json = target().path("/document/list")
.request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, route1Token)
.get(JsonObject.class);
documents = json.getJsonArray("documents");
Assert.assertEquals(1, documents.size());
Assert.assertFalse(documents.getJsonObject(0).getBoolean("active_route"));
// List all documents with admin
json = target().path("/document/list")
.request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.get(JsonObject.class);
documents = json.getJsonArray("documents");
Assert.assertEquals(1, documents.size());
Assert.assertTrue(documents.getJsonObject(0).getBoolean("active_route"));
// Search documents with admin
json = target().path("/document/list")
.queryParam("search", "workflow:me")
.request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.get(JsonObject.class);
documents = json.getJsonArray("documents");
Assert.assertEquals(1, documents.size());
// Cancel the route on document 1
target().path("/route")
.queryParam("documentId", document1Id)
@@ -269,5 +335,22 @@ public class TestRouteResource extends BaseJerseyTest {
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.get();
Assert.assertEquals(Response.Status.NOT_FOUND, Response.Status.fromStatusCode(response.getStatus()));
// List all documents with route1
json = target().path("/document/list")
.request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, route1Token)
.get(JsonObject.class);
documents = json.getJsonArray("documents");
Assert.assertEquals(1, documents.size());
Assert.assertFalse(documents.getJsonObject(0).getBoolean("active_route"));
// List all documents with admin
json = target().path("/document/list")
.request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.get(JsonObject.class);
documents = json.getJsonArray("documents");
Assert.assertEquals(0, documents.size());
}
}