UI: Configuration: add ui config control attribute for showing/hiding…

… the stars block in the dashboard task page (Only Pro version) #1708
dcm4che · Nov 29, 2018 · 75717be · 75717be
1 parent 76216a9
commit 75717be
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 0 deletions.
diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/schema/dcm4chee-archive-ui.schema b/dcm4chee-arc-assembly/src/main/resources/ldap/schema/dcm4chee-archive-ui.schema
@@ -335,6 +335,12 @@ attributetype ( 1.2.40.0.13.1.15.111.3.57 NAME 'dicomuiDockerContainer'
   EQUALITY caseExactIA5Match
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
+attributetype ( 1.2.40.0.13.1.15.111.3.58 NAME 'dcmuiShowStarBlock'
+  DESC 'Show Star Block - tasks without defined deviceName'
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+  SINGLE-VALUE )
+
 objectclass ( 1.2.40.0.13.1.15.111.4.1 NAME 'dcmuiConfig'
   DESC 'Archive UI Configuration'
   SUP top STRUCTURAL
@@ -386,6 +392,7 @@ objectclass ( 1.2.40.0.13.1.15.111.4.5 NAME 'dcmuiDashboardConfig'
   MAY (
     dcmuiQueueName $
     dcmuiExportName $
+    dcmuiShowStarBlock $
     dcmuiCountAET $
     dicomuiDeviceName $
     dicomuiIgnoreParams $

diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/slapd/dcm4chee-archive-ui-modify.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/slapd/dcm4chee-archive-ui-modify.ldif
@@ -285,6 +285,11 @@ olcAttributeTypes: ( 1.2.40.0.13.1.15.111.3.57 NAME 'dicomuiDockerContainer'
   DESC 'Names of the archive docker containers used in the hardware page'
   EQUALITY caseExactIA5Match
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+olcAttributeTypes: ( 1.2.40.0.13.1.15.111.3.58 NAME 'dcmuiShowStarBlock'
+  DESC 'Show Star Block - tasks without defined deviceName'
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+  SINGLE-VALUE )
 -
 delete: olcObjectClasses
 -
@@ -336,6 +341,7 @@ olcObjectClasses: ( 1.2.40.0.13.1.15.111.4.5 NAME 'dcmuiDashboardConfig'
   MAY (
     dcmuiQueueName $
     dcmuiExportName $
+    dcmuiShowStarBlock $
     dcmuiCountAET $
     dicomuiDeviceName $
     dicomuiIgnoreParams $

diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/slapd/dcm4chee-archive-ui.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/slapd/dcm4chee-archive-ui.ldif
@@ -282,6 +282,11 @@ olcAttributeTypes: ( 1.2.40.0.13.1.15.111.3.57 NAME 'dicomuiDockerContainer'
   DESC 'Names of the archive docker containers used in the hardware page'
   EQUALITY caseExactIA5Match
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+olcAttributeTypes: ( 1.2.40.0.13.1.15.111.3.58 NAME 'dcmuiShowStarBlock'
+  DESC 'Show Star Block - tasks without defined deviceName'
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+  SINGLE-VALUE )
 olcObjectClasses: ( 1.2.40.0.13.1.15.111.4.1 NAME 'dcmuiConfig'
   DESC 'Archive UI Configuration'
   SUP top STRUCTURAL
@@ -329,6 +334,7 @@ olcObjectClasses: ( 1.2.40.0.13.1.15.111.4.5 NAME 'dcmuiDashboardConfig'
   MAY (
     dcmuiQueueName $
     dcmuiExportName $
+    dcmuiShowStarBlock $
     dcmuiCountAET $
     dicomuiDeviceName $
     dicomuiIgnoreParams $

diff --git a/dcm4chee-arc-conf-ui/src/main/java/org/dcm4chee/arc/conf/ui/UIDashboardConfig.java b/dcm4chee-arc-conf-ui/src/main/java/org/dcm4chee/arc/conf/ui/UIDashboardConfig.java
@@ -50,6 +50,7 @@
 public class UIDashboardConfig {
     private String name;
     private String[] queueNames = {};
+    private boolean showStarBlock;
     private String[] exportNames = {};
     private String[] deviceNames = {};
     private String countAet;
@@ -81,6 +82,14 @@ public void setQueueNames(String[] queueNames) {
         this.queueNames = queueNames;
     }
 
+    public boolean isShowStarBlock() {
+        return showStarBlock;
+    }
+
+    public void setShowStarBlock(boolean showStarBlock) {
+        this.showStarBlock = showStarBlock;
+    }
+
     public String[] getExportNames() {
         return exportNames;
     }

diff --git a/...e-arc-conf-ui/src/main/java/org/dcm4chee/arc/conf/ui/json/JsonArchiveUIConfiguration.java b/...e-arc-conf-ui/src/main/java/org/dcm4chee/arc/conf/ui/json/JsonArchiveUIConfiguration.java
@@ -254,6 +254,7 @@ private void writeUIDashboardConfigs(JsonWriter writer, Collection<UIDashboardCo
             writer.writeNotNullOrDef("dcmuiDashboardConfigName", uiDashboardConfig.getName(), null);
             writer.writeNotEmpty("dcmuiQueueName", uiDashboardConfig.getQueueNames());
             writer.writeNotEmpty("dcmuiExportName", uiDashboardConfig.getExportNames());
+            writer.writeNotDef("dcmuiShowStarBlock", uiDashboardConfig.isShowStarBlock(), true);
             writer.writeNotEmpty("dicomuiDeviceName", uiDashboardConfig.getDeviceNames());
             writer.writeNotEmpty("dicomuiIgnoreParams", uiDashboardConfig.getIgnoreParams());
             writer.writeNotEmpty("dicomuiDockerContainer", uiDashboardConfig.getDockerContainers());
@@ -656,6 +657,9 @@ private void loadUIDashboardConfigs(UIConfig uiConfig, JsonReader reader) {
                     case "dicomuiIgnoreParams":
                         uiDashboardConfig.setIgnoreParams(reader.stringArray());
                         break;
+                    case "dcmuiShowStarBlock":
+                        uiDashboardConfig.setShowStarBlock(reader.booleanValue());
+                        break;
                     case "dicomuiDockerContainer":
                         uiDashboardConfig.setDockerContainers(reader.stringArray());
                         break;

diff --git a/...e-arc-conf-ui/src/main/java/org/dcm4chee/arc/conf/ui/ldap/LdapArchiveUIConfiguration.java b/...e-arc-conf-ui/src/main/java/org/dcm4chee/arc/conf/ui/ldap/LdapArchiveUIConfiguration.java
@@ -262,6 +262,7 @@ private Attributes storeTo(ConfigurationChanges.ModifiedObject ldapObj, UIDashbo
         attrs.put(new BasicAttribute("objectclass", "dcmuiDashboardConfig"));
         attrs.put(new BasicAttribute("dcmuiDashboardConfigName", uiDashboardConfig.getName()));
         LdapUtils.storeNotEmpty(ldapObj, attrs, "dcmuiQueueName", uiDashboardConfig.getQueueNames());
+        LdapUtils.storeNotDef(ldapObj,attrs,"dcmuiShowStarBlock",uiDashboardConfig.isShowStarBlock(),true);
         LdapUtils.storeNotEmpty(ldapObj, attrs, "dcmuiExportName", uiDashboardConfig.getExportNames());
         LdapUtils.storeNotEmpty(ldapObj, attrs, "dicomuiDeviceName", uiDashboardConfig.getDeviceNames());
         LdapUtils.storeNotEmpty(ldapObj, attrs, "dicomuiIgnoreParams", uiDashboardConfig.getIgnoreParams());
@@ -511,6 +512,7 @@ private void loadDashboardConfigs(UIConfig uiConfig, String uiConfigDN) throws N
                 SearchResult sr = ne.next();
                 Attributes attrs = sr.getAttributes();
                 UIDashboardConfig uiDashboardConfig = new UIDashboardConfig((String) attrs.get("dcmuiDashboardConfigName").get());
+                uiDashboardConfig.setShowStarBlock(LdapUtils.booleanValue(attrs.get("dcmuiShowStarBlock"), true));
                 uiDashboardConfig.setCountAet(LdapUtils.stringValue(attrs.get("dcmuiCountAET"),null));
                 uiDashboardConfig.setQueueNames(LdapUtils.stringArray(attrs.get("dcmuiQueueName")));
                 uiDashboardConfig.setExportNames(LdapUtils.stringArray(attrs.get("dcmuiExportName")));
@@ -1051,6 +1053,9 @@ private List<ModificationItem> storeDiffs(ConfigurationChanges diffs,String dn,
         LdapUtils.storeDiff(ldapObj, mods, "dicomuiIgnoreParams",
                 prev.getIgnoreParams(),
                 uiDashboardConfig.getIgnoreParams());
+        LdapUtils.storeDiffObject(ldapObj, mods, "dcmuiShowStarBlock",
+                prev.isShowStarBlock(),
+                uiDashboardConfig.isShowStarBlock(),true);
         LdapUtils.storeDiff(ldapObj, mods, "dicomuiDockerContainer",
                 prev.getDockerContainers(),
                 uiDashboardConfig.getDockerContainers());

diff --git a/dcm4chee-arc-ui2/src/assets/schema/uiDashboard.schema.json b/dcm4chee-arc-ui2/src/assets/schema/uiDashboard.schema.json
@@ -11,6 +11,12 @@
       "description": "UI Dashboard Configuration Name",
       "type": "string"
     },
+    "dcmuiShowStarBlock":{
+      "title": "Show Star Block",
+      "description": "Show Star Block - tasks without defined deviceName",
+      "type": "boolean",
+      "default" : true
+    },
     "dcmuiQueueName": {
       "title": "Queues",
       "description": "Queue Names for UI Dashboard Configuration used in queue block",