From 1a974c2d385594146bb4d873e1feae245a3cc14f Mon Sep 17 00:00:00 2001 From: Seyi Adebajo Date: Mon, 10 Oct 2016 09:29:16 -0700 Subject: [PATCH] DSS-5178 DSS-5277: Implements Compliance and Confidential Spec Adds 'logs/' to ignored files Updates EmberSelectorComponent to handle a list of string options or list of options with value and label, flags the currently selected option, and bubble change actions with 'selectionDidChange' action DSS-5178: Removes previous updates to search.js: moving jQuery + DOM heavy imperative implementation to Ember component DSS-5178: Adds templates and components DropRegion and DraggableItem DSS-5178: Adds getSecuritySpec action and compliance types to Dataset controller, cleans up Datasets route and removes inline securitySpec fetch from route DSS-5178: Updates templates for compliance spec DSS-5178: Adds compliance component and updates template Adds .DS_Store to gitignore DSS-5277: Adds dataset-confidential component to DOM, Creates DatasetConfidential component, refactors out data handling from component DSS-5277: Moves data fetching to Dataset Route model and set model data on controller, Adds template for confidential spec component DSS-5178: Moves view related complianceTypes to component DSS-5277 DSS-5178: Adds styling for tab content --- .gitignore | 2 + web/app/views/index.scala.html | 91 +++-- web/app/views/main.scala.html | 249 ++++++++---- .../javascripts/components/components.js | 372 +++++++++++++++++- .../javascripts/controllers/datasets.js | 29 ++ web/public/javascripts/routers/datasets.js | 85 ++-- 6 files changed, 686 insertions(+), 142 deletions(-) diff --git a/.gitignore b/.gitignore index 475e45ffb4..9eb3c26d85 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,5 @@ bin/ backend-service/lib metadata-etl/src/main/resources/application.properties **/test/resources/*.properties +logs/ +.DS_Store diff --git a/web/app/views/index.scala.html b/web/app/views/index.scala.html index 8d6126f290..fb54f1f3cc 100644 --- a/web/app/views/index.scala.html +++ b/web/app/views/index.scala.html @@ -249,21 +249,15 @@ - + + diff --git a/web/app/views/main.scala.html b/web/app/views/main.scala.html index 5913852e74..217c2b0da4 100644 --- a/web/app/views/main.scala.html +++ b/web/app/views/main.scala.html @@ -163,11 +163,6 @@ class="form-control input-sm keyword-search" placeholder="Enter Keywords..." /> - + {{else}} + + {{/if}} + + + + {{else}} +

Confidential spec is not available

+ {{/if}} + +