Skip to content

Commit 90453ab

Browse files
bbimberbbimber
authored
Merge pull request #45 from bimberlabinternal/25.3_fb_merge
Merge discvr-24.11 to discvr-25.3
2 parents e3127ec + f10977f commit 90453ab

File tree

5 files changed

+29
-18
lines changed

5 files changed

+29
-18
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
name: Build DISCVR
22
on:
3+
workflow_dispatch:
34
push:
45
pull_request:
56
jobs:

‎LDK/api-src/org/labkey/api/ldk/table/AbstractDataDefinedTable.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@
5757
* Date: 4/2/13
5858
* Time: 2:54 PM
5959
*/
60-
abstract public class AbstractDataDefinedTable extends CustomPermissionsTable
60+
abstract public class AbstractDataDefinedTable<SchemaType extends UserSchema> extends CustomPermissionsTable<SchemaType>
6161
{
6262
protected String _pk;
6363

6464
protected String _filterColumn;
6565
protected String _filterValue;
6666
protected String _valueColumn;
6767

68-
public AbstractDataDefinedTable(UserSchema schema, SchemaTableInfo table, ContainerFilter cf, String filterColumn, String valueColumn, String tableName, String filterValue)
68+
public AbstractDataDefinedTable(SchemaType schema, SchemaTableInfo table, ContainerFilter cf, String filterColumn, String valueColumn, String tableName, String filterValue)
6969
{
7070
super(schema, table, cf);
7171
_filterColumn = filterColumn;
@@ -77,23 +77,23 @@ public AbstractDataDefinedTable(UserSchema schema, SchemaTableInfo table, Contai
7777
}
7878

7979
@Override
80-
public CustomPermissionsTable init()
80+
public CustomPermissionsTable<SchemaType> init()
8181
{
8282
super.init();
8383

8484
ColumnInfo col = getRealTable().getColumn(_filterColumn);
8585
addCondition(col, _filterValue); //enforce only showing rows from this category
8686

8787
List<String> pks = getRealTable().getPkColumnNames();
88-
assert pks.size() > 0;
88+
assert !pks.isEmpty();
8989
_pk = pks.get(0);
9090

9191
var valueCol = getMutableColumn(_valueColumn);
9292
assert valueCol != null;
9393

9494
valueCol.setKeyField(true);
9595
valueCol.setNullable(false);
96-
getMutableColumn(_pk).setKeyField(false);
96+
getMutableColumnOrThrow(_pk).setKeyField(false);
9797

9898
ColumnInfo filterCol = getColumn(_filterColumn);
9999
assert filterCol != null;
@@ -135,7 +135,7 @@ protected class UpdateService extends SimpleQueryUpdateService
135135
{
136136
private final ValuesManager _vm;
137137

138-
public UpdateService(SimpleUserSchema.SimpleTable ti)
138+
public UpdateService(SimpleUserSchema.SimpleTable<SchemaType> ti)
139139
{
140140
super(ti, ti.getRealTable());
141141

@@ -217,8 +217,7 @@ public boolean testIfRowExists(String value)
217217
{
218218
boolean ret = _distinctValues.contains(value);
219219

220-
if (!_distinctValues.contains(value))
221-
_distinctValues.add(value);
220+
_distinctValues.add(value);
222221

223222
return ret;
224223
}

‎LDK/api-src/org/labkey/api/ldk/table/ContainerScopedTable.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,8 @@ public Object call()
287287
Object pesudoPkVal = it.getInputColumnValue(inputColMap.get(_pseudoPk));
288288
if (pesudoPkVal != null)
289289
{
290-
if (_context.getInsertOption() != QueryUpdateService.InsertOption.MERGE && keyManager.rowExists(c, pesudoPkVal))
290+
// NOTE: this code is called for both inserts and updates:
291+
if (_context.getInsertOption() == QueryUpdateService.InsertOption.INSERT && keyManager.rowExists(c, pesudoPkVal))
291292
{
292293
_context.getErrors().addRowError(new ValidationException("A record is already present with value: " + pesudoPkVal));
293294
}

‎LDK/test/src/org/labkey/test/tests/external/labModules/LabModulesTest.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,15 @@
1616
package org.labkey.test.tests.external.labModules;
1717

1818
import org.apache.commons.lang3.StringUtils;
19+
import org.apache.commons.lang3.time.DateFormatUtils;
20+
import org.apache.commons.lang3.time.DateUtils;
1921
import org.apache.commons.lang3.tuple.Pair;
2022
import org.apache.poi.ss.usermodel.Sheet;
2123
import org.apache.poi.ss.usermodel.Workbook;
2224
import org.junit.Assert;
2325
import org.junit.Test;
2426
import org.junit.experimental.categories.Category;
27+
import org.labkey.api.util.DateUtil;
2528
import org.labkey.remoteapi.CommandException;
2629
import org.labkey.remoteapi.Connection;
2730
import org.labkey.remoteapi.collections.CaseInsensitiveHashMap;
@@ -1415,6 +1418,7 @@ private void samplesTableTest() throws Exception
14151418
columnLabels.add(getColumnLabel(srr, name));
14161419
}
14171420

1421+
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
14181422
List<List<String>> rows = new ArrayList<>();
14191423
for (Map<String, Object> row : srr.getRows())
14201424
{
@@ -1425,7 +1429,7 @@ private void samplesTableTest() throws Exception
14251429
String val = row.get(name) == null ? "" : String.valueOf(row.get(name));
14261430
if (name.toLowerCase().contains("date"))
14271431
{
1428-
val = StringUtils.isEmpty(val) ? "" : ExcelHelper.getDateTimeFormat().format(new Date(val));
1432+
val = StringUtils.isEmpty(val) ? "" : ExcelHelper.getDateTimeFormat().format(Date.parse(val));
14291433
}
14301434

14311435
target.add(val);

‎laboratory/src/org/labkey/laboratory/query/LaboratoryTableCustomizer.java‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import org.labkey.api.data.SQLFragment;
2020
import org.labkey.api.data.TableCustomizer;
2121
import org.labkey.api.data.TableInfo;
22-
import org.labkey.api.data.WrappedColumnInfo;
2322
import org.labkey.api.gwt.client.FacetingBehaviorType;
2423
import org.labkey.api.laboratory.LaboratoryService;
2524
import org.labkey.api.ldk.LDKService;
@@ -184,7 +183,8 @@ public void customizeColumns(AbstractTableInfo ti)
184183
{
185184
container.setHidden(true);
186185

187-
BaseColumnInfo wrappedContainer = WrappedColumnInfo.wrapAsCopy(ti, FieldKey.fromString("workbook"), container, "Workbook", null);
186+
ExprColumn wrappedContainer = new ExprColumn(ti, FieldKey.fromString("workbook"), container.getValueSql(ExprColumn.STR_TABLE_ALIAS), container.getJdbcType(), container);
187+
wrappedContainer.setLabel("Workbook");
188188
wrappedContainer.setName("workbook");
189189
wrappedContainer.setCalculated(true);
190190
wrappedContainer.setShownInInsertView(false);
@@ -373,7 +373,8 @@ private void appendMajorEventsCol(final UserSchema us, AbstractTableInfo ds, fin
373373
final String pkColSelectName = pk.getFieldKey().toSQLString();
374374
final String pkColRawName = pk.getName();
375375

376-
BaseColumnInfo col = WrappedColumnInfo.wrapAsCopy(ds, FieldKey.fromString(name), pk, "Major Events", null);
376+
BaseColumnInfo col = new ExprColumn(ds, FieldKey.fromString(name), pk.getValueSql(ExprColumn.STR_TABLE_ALIAS), pk.getJdbcType(), pk);
377+
col.setLabel("Major Events");
377378
col.setDescription("This column shows all major events recorded in this subject's history and will calculate the time elapsed between the current sample and these dates.");
378379
col.setName(name);
379380
col.setCalculated(true);
@@ -454,7 +455,8 @@ private void appendOverlapingProjectsCol(final UserSchema us, AbstractTableInfo
454455
final String subjectSelectName = ds.getSqlDialect().makeLegalIdentifier(subjectColName);
455456
final String dateSelectName = dateColName == null ? null : ds.getSqlDialect().makeLegalIdentifier(dateColName);
456457

457-
BaseColumnInfo col = WrappedColumnInfo.wrapAsCopy(ds, FieldKey.fromString(name), pk, "Overlapping Groups", null);
458+
BaseColumnInfo col = new ExprColumn(ds, FieldKey.fromString(name), pk.getValueSql(ExprColumn.STR_TABLE_ALIAS), pk.getJdbcType(), pk);
459+
col.setLabel("Overlapping Groups");
458460
col.setDescription("This column shows all groups to which this subject belonged at the time of this sample.");
459461
col.setName(name);
460462
col.setCalculated(true);
@@ -503,7 +505,8 @@ public TableInfo getLookupTableInfo()
503505

504506
//add pivot column
505507
String pivotColName = "overlappingProjectsPivot";
506-
BaseColumnInfo col2 = WrappedColumnInfo.wrapAsCopy(ds, FieldKey.fromString(pivotColName), pk, "Overlapping Group List", null);
508+
BaseColumnInfo col2 = new ExprColumn(ds, FieldKey.fromString(pivotColName), pk.getValueSql(ExprColumn.STR_TABLE_ALIAS), pk.getJdbcType(), pk);
509+
col2.setLabel("Overlapping Group List");
507510
col2.setName(pivotColName);
508511
col2.setCalculated(true);
509512
col2.setShownInInsertView(false);
@@ -572,7 +575,8 @@ public void appendProjectsCol(final UserSchema us, AbstractTableInfo ds, final S
572575
final String publicTableName = ds.getPublicName();
573576

574577
final String colName = ds.getName() + "_allProjects";
575-
BaseColumnInfo col = WrappedColumnInfo.wrapAsCopy(ds, FieldKey.fromString(name), pk, "Groups", null);
578+
BaseColumnInfo col = new ExprColumn(ds, FieldKey.fromString(name), pk.getValueSql(ExprColumn.STR_TABLE_ALIAS), pk.getJdbcType(), pk);
579+
col.setLabel("Groups");
576580
col.setName(name);
577581
col.setCalculated(true);
578582
col.setShownInInsertView(false);
@@ -622,7 +626,8 @@ public TableInfo getLookupTableInfo()
622626
//add pivot column
623627
String pivotColName = "allProjectsPivot";
624628
final String lookupName = ds.getName() + "_allProjectsPivot";
625-
BaseColumnInfo col2 = WrappedColumnInfo.wrapAsCopy(ds, FieldKey.fromString(pivotColName), pk, "Group Summary List", null);
629+
BaseColumnInfo col2 = new ExprColumn(ds, FieldKey.fromString(pivotColName), pk.getValueSql(ExprColumn.STR_TABLE_ALIAS), pk.getJdbcType(), pk);
630+
col2.setLabel("Group Summary List");
626631
col2.setName(pivotColName);
627632
col2.setCalculated(true);
628633
col2.setShownInInsertView(false);
@@ -772,7 +777,8 @@ private void appendRelativeDatesCol(final UserSchema us, AbstractTableInfo ds, f
772777
final String pkColSelectName = pk.getFieldKey().toSQLString();
773778
final String pkColRawName = pk.getName();
774779

775-
BaseColumnInfo col = WrappedColumnInfo.wrapAsCopy(ds, FieldKey.fromString(name), pk, "Relative Dates", null);
780+
BaseColumnInfo col = new ExprColumn(ds, FieldKey.fromString(name), pk.getValueSql(ExprColumn.STR_TABLE_ALIAS), pk.getJdbcType(), pk);
781+
col.setLabel("Relative Dates");
776782
col.setName(name);
777783
col.setCalculated(true);
778784
col.setShownInInsertView(false);

0 commit comments

Comments
 (0)