GitHub #503: Add option to open URL links in a new tab in the domain designer UI (LabKey Issue: 54178) (#7304)

- update @labkey/components package version
- Server side support for domain field URLTargetWindow property, saved with exp.PropertyDescriptor row
- exp.PropertyDescriptor add column for URLTarget (sql upgrade script and version bump)

Author: cnathe

api/gwtsrc/org/labkey/api/gwt/client/assay/model/GWTPropertyDescriptorMixin.java

@@ -38,10 +38,12 @@
 })
 public abstract class GWTPropertyDescriptorMixin
 {
-    GWTPropertyDescriptorMixin(@JsonProperty("PHI") StringProperty phi, @JsonProperty("URL") StringProperty url)
+    GWTPropertyDescriptorMixin(@JsonProperty("PHI") StringProperty phi, @JsonProperty("URL") StringProperty url, @JsonProperty("URLTarget") StringProperty URLTarget)
     { }
     @JsonProperty("PHI")
     abstract void setPHI(String phi); // rename property on deserialize
     @JsonProperty("URL")
     abstract void setURL(String url); // rename property on deserialize
+    @JsonProperty("URLTarget")
+    abstract void setURLTarget(String urlTarget); // rename property on deserialize
 }

api/gwtsrc/org/labkey/api/gwt/client/model/GWTPropertyDescriptor.java

@@ -59,6 +59,7 @@ public class GWTPropertyDescriptor implements IsSerializable
     private final BooleanProperty mvEnabled = new BooleanProperty(false);
     private final StringProperty importAliases = new StringProperty();
     private final StringProperty url = new StringProperty();
+    private final StringProperty urlTarget = new StringProperty();
     private final BooleanProperty shownInInsertView = new BooleanProperty(true);
     private final BooleanProperty shownInUpdateView = new BooleanProperty(true);
     private final BooleanProperty shownInDetailsView = new BooleanProperty(true);
@@ -137,6 +138,7 @@ public GWTPropertyDescriptor(GWTPropertyDescriptor s, boolean isNew)
         setDefaultDisplayValue(s.getDefaultDisplayValue());
         setImportAliases(s.getImportAliases());
         setURL(s.getURL());
+        setURLTarget(s.getURLTarget());
         setFacetingBehaviorType(s.getFacetingBehaviorType());
         setPHI(s.getPHI());
         setExcludeFromShifting(s.isExcludeFromShifting());
@@ -662,6 +664,16 @@ public void setURL(String url)
         this.url.set(url);
     }
 
+    public String getURLTarget()
+    {
+        return urlTarget.toString();
+    }
+
+    public void setURLTarget(String urlTarget)
+    {
+        this.urlTarget.set(urlTarget);
+    }
+
     public String getLookupDescription()
     {
         if (StringUtils.isEmpty(getLookupSchema()) || StringUtils.isEmpty(getLookupQuery()))

api/schemas/expTypes.xsd

@@ -529,6 +529,7 @@
             <xs:element name="SemanticType" type="string" minOccurs="0" maxOccurs="1"/>
             <xs:element name="Format" type="string" minOccurs="0" maxOccurs="1"/>
             <xs:element name="URL" type="string" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="URLTarget" type="string" minOccurs="0" maxOccurs="1"/>
             <xs:element name="FK" minOccurs="0">
                 <xs:annotation>
                     <xs:documentation>A structure that describes a foreign key relationship between a column in the current table and a target column in another table. </xs:documentation>

api/src/org/labkey/api/data/AbstractWrappedColumnInfo.java

@@ -566,9 +566,9 @@ public StringExpression getURL()
     }
 
     @Override
-    public String getURLTargetWindow()
+    public String getURLTarget()
     {
-        return delegate.getURLTargetWindow();
+        return delegate.getURLTarget();
     }
 
     @Override

api/src/org/labkey/api/data/BaseColumnInfo.java

@@ -559,7 +559,7 @@ public void copyURLFrom(ColumnInfo col, @Nullable FieldKey parent, @Nullable Map
             }
             setURL(url);
         }
-        setURLTargetWindow(col.getURLTargetWindow());
+        setURLTarget(col.getURLTarget());
         setURLCls(col.getURLCls());
         setOnClick(col.getOnClick());
     }
@@ -1166,7 +1166,7 @@ public void loadFromXml(ColumnType xmlCol, boolean merge)
         if (xmlCol.isSetUrl())
             setURL(StringExpressionFactory.fromXML(xmlCol.getUrl(), false));
         if (xmlCol.isSetUrlTarget())
-            setURLTargetWindow(xmlCol.getUrlTarget());
+            setURLTarget(xmlCol.getUrlTarget());
         if (xmlCol.isSetIsAutoInc())
             _isAutoIncrement = xmlCol.getIsAutoInc();
         if (xmlCol.isSetHasDbSequence())

api/src/org/labkey/api/data/ColumnRenderProperties.java

@@ -84,7 +84,7 @@ public interface ColumnRenderProperties extends ImportAliasable
 
     StringExpression getURL();
 
-    String getURLTargetWindow();
+    String getURLTarget();
 
     String getURLCls();
 

api/src/org/labkey/api/data/ColumnRenderPropertiesImpl.java

@@ -86,7 +86,7 @@ public abstract class ColumnRenderPropertiesImpl implements MutableColumnRenderP
     protected boolean _shownInDetailsView = true;
     protected boolean _shownInLookupView = false;
     protected StringExpression _url;
-    protected String _urlTargetWindow;
+    protected String _urlTarget;
     protected String _urlCls;
     protected String _onClick;
     // methods use Set<>, but I'm using a List<> here because it is simpler and more thread safe and explicitly preserves order
@@ -157,6 +157,7 @@ public void copyTo(ColumnRenderPropertiesImpl to)
         to._recommendedVariable = _recommendedVariable;
         to._defaultScale = _defaultScale;
         to._url = _url;
+        to._urlTarget = _urlTarget;
         to._importAliases = copyFixedList(_importAliases);
         to._facetingBehaviorType = _facetingBehaviorType;
         to._crosstabColumnMember = _crosstabColumnMember;
@@ -422,16 +423,22 @@ public void setURL(StringExpression url)
     }
 
     @Override
-    public String getURLTargetWindow()
+    public String getURLTarget()
     {
-        return _urlTargetWindow;
+        return _urlTarget;
     }
 
     @Override
-    public void setURLTargetWindow(String urlTargetWindow)
+    public void setURLTarget(String urlTarget)
     {
         assert _checkLocked();
-        _urlTargetWindow = urlTargetWindow;
+        _urlTarget = urlTarget;
+    }
+
+    @Override
+    public void setURLTargetWindow(String urlTarget)
+    {
+        setURLTarget(urlTarget);
     }
 
     @Override

api/src/org/labkey/api/data/DataColumn.java

@@ -116,7 +116,7 @@ public DataColumn(ColumnInfo col, boolean withLookups)
         StringExpression url = withLookups ? _boundColumn.getEffectiveURL() : _boundColumn.getURL();
         if (null != url)
             super.setURLExpression(url);
-        setLinkTarget(_boundColumn.getURLTargetWindow());
+        setLinkTarget(_boundColumn.getURLTarget());
         setLinkCls(_boundColumn.getURLCls());
         setOnClick(_boundColumn.getOnClick());
         setFormatString(_displayColumn.getFormat());

api/src/org/labkey/api/data/MutableColumnRenderProperties.java

@@ -46,7 +46,8 @@ public interface MutableColumnRenderProperties extends ColumnRenderProperties, M
 
     void setURL(StringExpression url);
 
-    void setURLTargetWindow(String urlTargetWindow);
+    void setURLTarget(String urlTarget);
+    void setURLTargetWindow(String urlTarget);
 
     void setURLCls(String urlCls);
 

api/src/org/labkey/api/data/WrappedColumnInfo.java

@@ -392,10 +392,23 @@ public StringExpression getURL()
         }
 
         @Override
-        public void setURLTargetWindow(String urlTargetWindow)
+        public void setURLTarget(String urlTarget)
         {
             checkLocked();
-            throw new UnsupportedOperationException();
+            delegate = new AbstractWrappedColumnInfo(delegate)
+            {
+                @Override
+                public String getURLTarget()
+                {
+                    return urlTarget;
+                }
+            };
+        }
+
+        @Override
+        public void setURLTargetWindow(String urlTarget)
+        {
+            setURLTarget(urlTarget);
         }
 
         @Override