Merge branch 'develop'

Conflicts:
	ModelCatalogueCorePlugin/ModelCatalogueCorePluginGrailsPlugin.groovy

.gitignore

@@ -1,5 +1,6 @@
 # FormsPlugin
 /ModelCatalogueFormsPlugin
 *.iml
-*/web-app/*
-*/.idea/*
+**/web-app/*
+**/.idea/*
+**/atlassian-ide-plugin.xml

ModelCatalogueCorePlugin/.gitignore

@@ -50,6 +50,9 @@ grails-app/assets/bower_components/*
 # elasticsearch index
 /data
 
+# blob data
+/storage
+
 
 # other
 *.iws

ModelCatalogueCorePlugin/application.properties

@@ -3,4 +3,4 @@
 app.grails.version=2.3.7
 app.name=ModelCatalogueCorePlugin
 app.servlet.version=2.5
-app.version=0.3.1
+app.version=0.5.0

ModelCatalogueCorePlugin/bower.json

@@ -18,9 +18,17 @@
   "dependencies": {
     "bootstrap": "~3.0.3",
     "angular-bootstrap": "~0.10.0",
-    "angular": "~1.2.11",
-    "angular-mocks": "~1.2.11",
+    "angular": "~1.2.17",
+    "angular-animate": "~1.2.17",
+    "angular-mocks": "~1.2.17",
+    "angular-cookies": "~1.2.17",
     "jasmine": "~2.0.0",
-    "angular-ui-router": "~0.2.9"
+    "angular-ui-router": "~0.2.9",
+    "ng-file-upload": "~1.4.0",
+    "ng-file-upload-shim": "~1.4.0",
+    "angular-loading-bar": "~0.4.3",
+    "angular-http-auth": "~1.2.1",
+    "jquery-ui": "~1.10.4",
+    "angular-sanitize": "~1.2.20"
   }
 }

ModelCatalogueCorePlugin/fixtures/assets/A_directory.groovy

@@ -0,0 +1,6 @@
+import org.modelcatalogue.core.Asset
+
+fixture{
+    A_directory(Asset, name:"directory",
+            description: "random directory")
+}

ModelCatalogueCorePlugin/fixtures/assets/A_file.groovy

@@ -0,0 +1,6 @@
+import org.modelcatalogue.core.Asset
+import org.modelcatalogue.core.PublishedElementStatus
+
+fixture{
+    A_file(Asset, name:"file", description: "random file", status: PublishedElementStatus.FINALIZED)
+}

ModelCatalogueCorePlugin/fixtures/assets/A_file1.groovy

@@ -0,0 +1,6 @@
+import org.modelcatalogue.core.Asset
+import org.modelcatalogue.core.PublishedElementStatus
+
+fixture{
+    A_file1(Asset, name:"file1", description: "some random file 1", status: PublishedElementStatus.FINALIZED)
+}

ModelCatalogueCorePlugin/fixtures/assets/A_file2.groovy

@@ -0,0 +1,6 @@
+import org.modelcatalogue.core.Asset
+import org.modelcatalogue.core.PublishedElementStatus
+
+fixture{
+    A_file2(Asset, name:"ASSET", description: "some random file 2", status: PublishedElementStatus.FINALIZED)
+}

ModelCatalogueCorePlugin/fixtures/assets/A_file3.groovy

@@ -0,0 +1,6 @@
+import org.modelcatalogue.core.Asset
+import org.modelcatalogue.core.PublishedElementStatus
+
+fixture{
+    A_file3(Asset, name:"A_file3", description: "the random name 3", status: PublishedElementStatus.FINALIZED)
+}

ModelCatalogueCorePlugin/fixtures/assets/A_file4.groovy

@@ -0,0 +1,6 @@
+import org.modelcatalogue.core.Asset
+import org.modelcatalogue.core.PublishedElementStatus
+
+fixture{
+    A_file4(Asset, name:"A_file4", description: "some random file 4", status: PublishedElementStatus.FINALIZED)
+}

ModelCatalogueCorePlugin/fixtures/assets/A_file5.groovy

@@ -0,0 +1,6 @@
+import org.modelcatalogue.core.Asset
+import org.modelcatalogue.core.PublishedElementStatus
+
+fixture{
+    A_file5(Asset, name:"A_file5", description: "random file 5", status: PublishedElementStatus.FINALIZED)
+}

ModelCatalogueCorePlugin/fixtures/assets/A_file6.groovy

@@ -0,0 +1,6 @@
+import org.modelcatalogue.core.Asset
+import org.modelcatalogue.core.PublishedElementStatus
+
+fixture{
+    A_file6(Asset, name:"A_file6", description: "random file 6", status: PublishedElementStatus.FINALIZED)
+}

ModelCatalogueCorePlugin/fixtures/assets/A_file7.groovy

@@ -0,0 +1,5 @@
+import org.modelcatalogue.core.Asset
+
+fixture{
+    A_file7(Asset, name:"A_file7", description: "random file 7")
+}

ModelCatalogueCorePlugin/fixtures/assets/A_file8.groovy

@@ -0,0 +1,5 @@
+import org.modelcatalogue.core.Asset
+
+fixture{
+    A_file8(Asset, name:"A_file8", description: "random file 8")
+}

ModelCatalogueCorePlugin/fixtures/assets/A_file9.groovy

@@ -0,0 +1,5 @@
+import org.modelcatalogue.core.Asset
+
+fixture{
+    A_file9(Asset, name:"A_file9", description: "random file 9")
+}

ModelCatalogueCorePlugin/fixtures/assets/A_image.groovy

@@ -0,0 +1,6 @@
+import org.modelcatalogue.core.Asset
+
+fixture{
+    A_image(Asset, name:"image",
+            description: "random image")
+}

ModelCatalogueCorePlugin/grails-app/assets/javascripts/modelcatalogue/core/actionableItemEnhancer.coffee

@@ -0,0 +1,14 @@
+angular.module('mc.core.actionableItemEnhancer', ['mc.util.rest', 'mc.util.enhance', 'mc.core.modelCatalogueApiRoot']).config ['enhanceProvider', (enhanceProvider)->
+  condition = (item) -> item.hasOwnProperty('actionLinks')
+  factory   = ['modelCatalogueApiRoot', 'rest', '$rootScope', 'enhance', (modelCatalogueApiRoot, rest, $rootScope, enhance) ->
+    (element) ->
+      link = "#{modelCatalogueApiRoot}#{element.actionLinks}"
+      element.action = () ->
+        enhance(rest(method: 'POST', url: link, data: element)).then (result)->
+          $rootScope.$broadcast 'actionsResolved', element
+          result
+      element
+  ]
+
+  enhanceProvider.registerEnhancerFactory('action', condition, factory)
+]

ModelCatalogueCorePlugin/grails-app/assets/javascripts/modelcatalogue/core/catalogueElementEnhancer.coffee

@@ -37,7 +37,12 @@ angular.module('mc.core.catalogueElementEnhancer', ['ui.router', 'mc.util.rest',
           self.refresh        = () -> enhance rest method: 'GET', url: "#{modelCatalogueApiRoot}#{self.link}"
           self.validate       = () -> enhance rest method: 'POST', url: "#{modelCatalogueApiRoot}#{self.link}/validate", data: self.getUpdatePayload()
           self.update         = () -> enhance rest method: 'PUT', url: "#{modelCatalogueApiRoot}#{self.link}", data: self.getUpdatePayload()
-          self.show           = () -> $state.go('mc.resource.show', {resource: names.getPropertyNameFromType(self.elementType), id: self.id}) ; self
+          self.show           = () ->
+            if(self.elementTypeName=="Data Import")
+              $state.go('mc.dataArchitect.imports.show', {id: self.id}); self
+            else
+              $state.go('mc.resource.show', {resource: names.getPropertyNameFromType(self.elementType), id: self.id}); self
+
 
           self.isInstanceOf   = (type) ->
             # TODO create hierarchy service
@@ -47,7 +52,8 @@ angular.module('mc.core.catalogueElementEnhancer', ['ui.router', 'mc.util.rest',
             return false  if self.elementType is 'org.modelcatalogue.core.Relationship'     and type isnt 'org.modelcatalogue.core.Relationship'
             return false  if self.elementType is 'org.modelcatalogue.core.Mapping'          and type isnt 'org.modelcatalogue.core.Mapping'
             return true   if type is 'org.modelcatalogue.core.CatalogueElement'
-            return true   if type in ['org.modelcatalogue.core.ExtendibleElement', 'org.modelcatalogue.core.PublishedElement'] and self.elementType in ['org.modelcatalogue.core.Model', 'org.modelcatalogue.core.DataElement']
+            return true   if type is 'org.modelcatalogue.core.ExtendibleElement'            and self.elementType is  'org.modelcatalogue.core.ValueDomain'
+            return true   if type in ['org.modelcatalogue.core.ExtendibleElement', 'org.modelcatalogue.core.PublishedElement'] and self.elementType in ['org.modelcatalogue.core.Asset', 'org.modelcatalogue.core.Model', 'org.modelcatalogue.core.DataElement']
             return self.elementType == type
 
 

ModelCatalogueCorePlugin/grails-app/assets/javascripts/modelcatalogue/core/catalogueElementResource.coffee

@@ -9,6 +9,9 @@ angular.module('mc.core.catalogueElementResource', ['mc.core.modelCatalogueApiRo
       getIndexPath: () ->
         "#{modelCatalogueApiRoot}/#{@pathName}"
 
+      getByUUID: (uuid) ->
+        enhance rest method: 'GET', url: "#{@getIndexPath()}/uuid/#{uuid}"
+
       get: (id) ->
         enhance rest method: 'GET', url: "#{@getIndexPath()}/#{id}"
 
@@ -23,12 +26,12 @@ angular.module('mc.core.catalogueElementResource', ['mc.core.modelCatalogueApiRo
           $rootScope.$broadcast 'catalogueElementCreated', result
           result
 
-      update: (data) ->
+      update: (data, params) ->
         if !data.id?
           throw "Missing ID, use save instead"
         props = angular.copy(data)
         delete props.id
-        enhance rest method: 'PUT', url: "#{@getIndexPath()}/#{data.id}", data: props, params: {format: 'json'}
+        enhance rest method: 'PUT', url: "#{@getIndexPath()}/#{data.id}", data: props, params: angular.extend({format: 'json'}, params)
 
       validate: (data) ->
         enhance rest method: 'POST', url: "#{@getIndexPath()}/validate", data: data

ModelCatalogueCorePlugin/grails-app/assets/javascripts/modelcatalogue/core/index.coffee

@@ -6,6 +6,7 @@
 #= require listReferenceEnhancer
 #= require modelCatalogueApiRoot
 #= require removableItemEnhancer
+#= require actionableItemEnhancer
 #= require modelCatalogueSearch
 #= require modelCatalogueDataArchitect
 
@@ -22,4 +23,5 @@ angular.module 'mc.core', [
   'mc.core.modelCatalogueSearch'
   'mc.core.modelCatalogueDataArchitect'
   'mc.core.removableItemEnhancer'
+  'mc.core.actionableItemEnhancer'
 ]

ModelCatalogueCorePlugin/grails-app/assets/javascripts/modelcatalogue/core/listReferenceEnhancer.coffee

@@ -3,8 +3,8 @@ angular.module('mc.core.listReferenceEnhancer', ['mc.util.rest', 'mc.util.enhanc
   factory   = ['modelCatalogueApiRoot', 'rest', '$rootScope', 'enhance', (modelCatalogueApiRoot, rest, $rootScope, enhance) ->
     (listReference) ->
       link = "#{modelCatalogueApiRoot}#{listReference.link}"
-      query = (tail = null) ->
-        enhance rest method: 'GET', url: "#{link}#{if tail? then '/' + tail else ''}"
+      query = (tail = null, params = {}) ->
+        enhance rest method: 'GET', url: "#{link}#{if tail? then '/' + tail else ''}", params: params
       query.total = listReference.count
       query.link = link.toString()
       query.itemType = listReference.itemType

ModelCatalogueCorePlugin/grails-app/assets/javascripts/modelcatalogue/core/modelCatalogueDataArchitect.coffee

@@ -13,5 +13,21 @@ angular.module("mc.core.modelCatalogueDataArchitect", ['mc.util.rest', 'mc.util.
     params = angular.extend({keyOne: query}, {keyTwo: query2}, additionalParams)
     enhance rest method: 'GET', url: "#{modelCatalogueApiRoot}/dataArchitect/findRelationsByMetadataKeys", params: params
 
+  modelCatalogueDataArchitect.imports = (additionalParams = {}) ->
+    params = angular.extend(additionalParams)
+    enhance rest method: 'GET', url: "#{modelCatalogueApiRoot}/dataArchitect/imports", params: params
+
+  modelCatalogueDataArchitect.getImport = (id, additionalParams = {}) ->
+    params = angular.extend({id: id}, additionalParams)
+    enhance rest method: 'GET', url: "#{modelCatalogueApiRoot}/dataArchitect/imports/#{id}", params: params
+
+  modelCatalogueDataArchitect.resolveAll = (id, additionalParams = {}) ->
+    params = angular.extend({id: id}, additionalParams)
+    enhance rest method: 'POST', url: "#{modelCatalogueApiRoot}/dataArchitect/imports/#{id}/resolveAll", params: params
+
+  modelCatalogueDataArchitect.ingestQueue = (id, additionalParams = {}) ->
+    params = angular.extend({id: id}, additionalParams)
+    enhance rest method: 'POST', url: "#{modelCatalogueApiRoot}/dataArchitect/imports/#{id}/ingestQueue", params: params
+
   modelCatalogueDataArchitect
 ]