Release 3.2.0-beta.5

CluedIn-io · Oct 8, 2020 · 8e1bec3 · 8e1bec3
1 parent 2de7e05
commit 8e1bec3
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 10 deletions.
diff --git a/docker/compose/docker-compose.micro.yml b/docker/compose/docker-compose.micro.yml
@@ -13,13 +13,18 @@ services:
     - DbUserName=${CLUEDIN_SQLSERVER_USER}
     - DbName=${CLUEDIN_CLEAN_DBNAME:-DataStore.Db.MicroServices}
     - ForceTableCreation=${CLUEDIN_CLEAN_FORCETABLECREATION:-false}
+    - AnnotationURL=http://${CLUEDIN_ANNOTATION_HOST:-annotation}:${CLUEDIN_ANNOTATION_PORT:-8888}
+    - DataSourceURL=http://${CLUEDIN_DATASOURCE_HOST:-datasource}:${CLUEDIN_DATASOURCE_PORT:-8888}
+    - NODE_ENV=${CLUEDIN_ENVIRONMENT}
     ports:
       - "${CLUEDIN_CLEAN_LOCALPORT:-9009}:8888"
     depends_on:
     - elasticsearch
     - rabbitmq
     - sqlserver
     - seq
+    - annotation
+    - datasource
 
   annotation:
     image: cluedin/cluedin-micro-annotation:${CLUEDIN_ANNOTATION_TAG}
@@ -32,6 +37,7 @@ services:
     - SeqURL=http://${CLUEDIN_SEQ_HOST:-seq}:5341
     - SeqLoggingLevel=debug
     - ForceTableCreation=${CLUEDIN_ANNOTATION_FORCETABLECREATION:-false}
+    - NODE_ENV=${CLUEDIN_ENVIRONMENT}
     ports:
       - "${CLUEDIN_ANNOTATION_LOCALPORT:-9010}:8888"
     depends_on:
@@ -54,6 +60,7 @@ services:
     - AnnotationURL=http://${CLUEDIN_ANNOTATION_HOST:-annotation}:${CLUEDIN_ANNOTATION_PORT:-8888}
     - ConsoleLoggingLevel=info
     - ForceTableCreation=${CLUEDIN_DATASOURCE_FORCETABLECREATION:-false}
+    - NODE_ENV=${CLUEDIN_ENVIRONMENT}
     ports:
       - "${CLUEDIN_DATASOURCE_LOCALPORT:-9011}:8888"
     depends_on:

diff --git a/docker/compose/docker-compose.server.yml b/docker/compose/docker-compose.server.yml
@@ -42,16 +42,19 @@ services:
       - CLUEDIN_connectionStrings__Metrics=Data Source=${CLUEDIN_SQLSERVER_HOST};Initial Catalog=DataStore.Db.Metrics;User Id=${CLUEDIN_SQLSERVER_USER};Password=${CLUEDIN_SQLSERVER_PASS};MultipleActiveResultSets=True;connection timeout=0;Max Pool Size=200;Pooling=True
       - CLUEDIN_connectionStrings__ML-Logging=Data Source=${CLUEDIN_SQLSERVER_HOST};Initial Catalog=DataStore.Db.ML-Logging;User Id=${CLUEDIN_SQLSERVER_USER};Password=${CLUEDIN_SQLSERVER_PASS};MultipleActiveResultSets=True;connection timeout=0;Max Pool Size=200;Pooling=True
       - CLUEDIN_connectionStrings__WebAppStore=Data Source=${CLUEDIN_SQLSERVER_HOST};Initial Catalog=DataStore.Db.WebApp;User Id=${CLUEDIN_SQLSERVER_USER};Password=${CLUEDIN_SQLSERVER_PASS};MultipleActiveResultSets=True;connection timeout=0;Max Pool Size=200;Pooling=True
-      - CLUEDIN_appSettings__Agent_Enabled=false
+      - CLUEDIN_appSettings__Agent_Enabled=true
       - CLUEDIN_appSettings__Models_Enabled=false
       - DOTNET_Environment=${CLUEDIN_ENVIRONMENT}
       - CLUEDIN_appSettings__EmailUserName=${CLUEDIN_EMAIL_USER}
       - CLUEDIN_appSettings__EmailPassword=${CLUEDIN_EMAIL_PASS}
       - CLUEDIN_appSettings__EmailServer=${CLUEDIN_EMAIL_HOST}
       - CLUEDIN_appSettings__EmailPort=${CLUEDIN_EMAIL_PORT}
       - CLUEDIN_appSettings__EmailSender=${CLUEDIN_EMAIL_SENDER}
+      - CLUEDIN_appSettings__EmailDirectory=${CLUEDIN_EMAIL_DIR:-}
+      - CLUEDIN_appSettings__JobServer_DashboardVisible=${CLUEDIN_JOBS_DASHBOARD:-localOnly}
     volumes:
         - "./components:/components"
+        - ".${CLUEDIN_EMAIL_DIR:-}:/app/${CLUEDIN_EMAIL_DIR:-emails}"
     ports:
       - "${CLUEDIN_SERVER_LOCALPORT:-9000}:9000"
       - "${CLUEDIN_SERVER_AUTH_LOCALPORT:-9001}:9001"

diff --git a/docker/compose/docker-compose.ui.yml b/docker/compose/docker-compose.ui.yml
@@ -10,7 +10,7 @@ services:
     - REACT_APP_UI_BUCKET=/public/img/providers/
     - REACT_APP_UI_CDN_URL=/
     - REACT_APP_UI_CLUEDIN_APP_DOMAIN=${CLUEDIN_DOMAIN}
-    - REACT_APP_UI_CLUEDIN_FEATURES=follow;savedSearches;users;data-governance;developer;settings;integrations;extended-sar;cluedinClean;annotation;datasource
+    - REACT_APP_UI_CLUEDIN_FEATURES=preparation;${CLUEDIN_UI_FEATURES_USERS};${CLUEDIN_UI_FEATURES_DATAGOVERNANCE};${CLUEDIN_UI_FEATURES_DEVELOPER};${CLUEDIN_UI_FEATURES_SETTINGS};${CLUEDIN_UI_FEATURES_INTEGRATIONS};${CLUEDIN_UI_FEATURES_EXTENDEDSAR};${CLUEDIN_UI_FEATURES_OPENREFINE};${CLUEDIN_UI_FEATURES_CLEAN};${CLUEDIN_UI_FEATURES_GLOSSARY};${CLUEDIN_UI_FEATURES_STREAMS};${CLUEDIN_UI_FEATURES_ANNOTATION};${CLUEDIN_UI_FEATURES_DATASOURCE};${CLUEDIN_UI_FEATURES_FOLLOW};${CLUEDIN_UI_FEATURES_SAVEDSEARCHES};${CLUEDIN_UI_FEATURES_METRICS};${CLUEDIN_UI_FEATURES_ENRICHER}
     - REACT_APP_UI_CLUEDIN_CLEAN_URL=http://${CLUEDIN_DOMAIN}:${CLUEDIN_OPENREFINE_LOCALPORT:-3333}/
     - REACT_APP_UI_GQL_URL=http://${CLUEDIN_DOMAIN}:${CLUEDIN_GQL_LOCALPORT:-8888}/
     - REACT_APP_UI_COOKIE_DOMAIN_NAME=${CLUEDIN_DOMAIN}
@@ -31,6 +31,7 @@ services:
         - "APP_API_URL=http://${CLUEDIN_WEBAPI_HOST:-webapi}:9008/"
         - "PUBLIC_API=http://${CLUEDIN_SERVER_HOST:-server}:9007/"
         - "WEBHOOKS_URL=http://${CLUEDIN_SERVER_HOST:-server}:9006/"
+        - "NODE_ENV=${CLUEDIN_ENVIRONMENT}"
     ports:
     - "${CLUEDIN_GQL_LOCALPORT:-8888}:8888"
     depends_on:

diff --git a/env/default/.env b/env/default/.env
@@ -32,6 +32,7 @@ CLUEDIN_GQL_HOST=
 CLUEDIN_GQL_LOCALPORT=
 CLUEDIN_GQL_TAG=latest
 CLUEDIN_INSTALLER_TAG=latest
+CLUEDIN_JOBS_DASHBOARD=true
 CLUEDIN_NEO4J_BOLT_LOCALPORT=
 CLUEDIN_NEO4J_HOST=
 CLUEDIN_NEO4J_HTTP_LOCALPORT=
@@ -65,6 +66,22 @@ CLUEDIN_SUBMITTER_PORT=
 CLUEDIN_SUBMITTER_TAG=latest
 CLUEDIN_UI_LOCALPORT=
 CLUEDIN_UI_TAG=latest
+CLUEDIN_UI_FEATURES_CLEAN=
+CLUEDIN_UI_FEATURES_FOLLOW=
+CLUEDIN_UI_FEATURES_GLOSSARY=
+CLUEDIN_UI_FEATURES_OPENREFINE=cluedinClean
+CLUEDIN_UI_FEATURES_SAVEDSEARCHES=
+CLUEDIN_UI_FEATURES_STREAMS=
+CLUEDIN_UI_FEATURES_USERS=users
+CLUEDIN_UI_FEATURES_DATAGOVERNANCE=data-governance
+CLUEDIN_UI_FEATURES_DEVELOPER=developer
+CLUEDIN_UI_FEATURES_SETTINGS=settings      
+CLUEDIN_UI_FEATURES_INTEGRATIONS=integrations  
+CLUEDIN_UI_FEATURES_EXTENDEDSAR=extended-sar   
+CLUEDIN_UI_FEATURES_ANNOTATION=annotation    
+CLUEDIN_UI_FEATURES_DATASOURCE=datasource
+CLUEDIN_UI_FEATURES_METRICS=metrics
+CLUEDIN_UI_FEATURES_ENRICHER=enricher     
 CLUEDIN_WEBAPI_HOST=
 CLUEDIN_WEBAPI_LOCALPORT=
 CLUEDIN_WEBAPI_TAG=latest
diff --git a/powershell/bootstrap.ps1 b/powershell/bootstrap.ps1
@@ -8,7 +8,8 @@ function Invoke-CreateOrg {
         [string]$Name,
         [ValidatePattern("^[a-zA-Z0-9.!#$%&*+\/=?^_{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$")]
         [string]$Email = "admin@${Name}.com",
-        [string]$Pass = "P@ssword!123"
+        [string]$Pass = "P@ssword!123",
+        [switch]$AllowEmailSignup = $false
     )
 
     $serverPort  = GetEnvironmentValue -Name $Env -Key 'CLUEDIN_SERVER_AUTH_LOCALPORT' -DefaultValue '9001'
@@ -22,7 +23,7 @@ function Invoke-CreateOrg {
         }
         Body = @{
             grant_type = 'password'
-            allowEmailDomainSignup = 'false'
+            allowEmailDomainSignup = $AllowEmailSignup
             username = $Email
             email = $Email
             password = $Pass
@@ -41,8 +42,19 @@ function Invoke-CreateOrg {
     } catch {
         $success = $false
         Write-Host "Create organization was not successful"
-        if($_.ErrorDetails.Message) {
-            ($_.ErrorDetails.Message | ConvertFrom-Json).password.'$values'
+        $ex = $_
+        if($ex.ErrorDetails.Message) {
+            try {
+                $json = $_.ErrorDetails.Message | ConvertFrom-Json
+                $json.psobject.members.name |
+                    ForEach-Object {
+                        if($json.$_.psobject.members.name -contains '$values') {
+                            $json.$_.'$values'
+                        }
+                    }
+            } catch {
+                Write-Host $ex.ErrorDetails.Message
+            }
         }
     } finally {
         If($success) {

diff --git a/powershell/cluedin.classes.ps1 b/powershell/cluedin.classes.ps1
@@ -197,7 +197,7 @@ class EnvironmentToggle {
             else { $current = $current.Value }
             $this.Container[$Variable] = $current
         }
-        Set-Item $path $Value
+        Set-Item $path.ToUpper() $Value
     }
 
     [void] Reset() {

diff --git a/powershell/docker.ps1 b/powershell/docker.ps1
@@ -25,8 +25,8 @@ function DockerCompose {
 
     $compose = "docker-compose $projectName $composeFiles $envPath $action"
 
-    $disableFags = $Disable | Where-Object { $_ } | ForEach-Object { "--scale ${_}=0" }
-    if($disableFags) { $compose += " ${disableFags}" }
+    $disableFlags = $Disable | Where-Object { $_ } | ForEach-Object { "--scale ${_}=0" }
+    if($disableFlags) { $compose += " ${disableFlags}" }
 
     if($AdditionalArgs) { $compose += " ${AdditionalArgs}" }
 

diff --git a/powershell/environment.ps1 b/powershell/environment.ps1
@@ -10,6 +10,7 @@ function Invoke-Environment {
         [Parameter(Position=0, ParameterSetName='get')]
         [Parameter(Position=0, ParameterSetName='unset')]
         [Parameter(Position=0, ParameterSetName='remove')]
+        [Parameter(Position=0, ParameterSetName='setTagOverride')]
         [string]$Name = 'default',
         [Parameter(ParameterSetName='set', Mandatory)]
         [string[]]$Set,
@@ -18,6 +19,7 @@ function Invoke-Environment {
         [string]$Tag = [string]::Empty,
         [Parameter(ParameterSetName='set')]
         [Parameter(ParameterSetName='setTag')]
+        [Parameter(ParameterSetName='setTagOverride', Mandatory)]
         [string[]]$TagOverride = @(),
         [Parameter(ParameterSetName='get')]
         [switch]$Get,
@@ -31,7 +33,7 @@ function Invoke-Environment {
     process {
 
         switch ($PSCmdlet.ParameterSetName) {
-            {$_ -in @('set', 'setTag')} {
+            {$_ -in @('set', 'setTag', 'setTagOverride')} {
                 $env = (GetEnvironment $Name) ?? (GetEnvironment 'default')
 
                 if($Set) {