fix: endpoint pickers only for saved-object sources the host registers #13
No files matched your search
@@ -4,6 +4,11 @@ All notable changes are documented here, following [Keep a Changelog](https://ke
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
### Fixed
|
||||
|
||||
- Endpoint pickers for saved views, saved reports and saved bulk-load profiles are dropped when
|
||||
the host has not registered those possible-value sources, so hosts without them validate.
|
||||
|
||||
### Added
|
||||
|
||||
- File transfer Preferences with connect-permission visibility, read-only connection details,
|
||||
|
||||
@@ -36,6 +36,10 @@ Apply [docs/ddl/file_gateway.sql](docs/ddl/file_gateway.sql) to the host's datab
|
||||
H2 and PostgreSQL and stores UTC timestamps without a zone, matching QQQ's RDBMS binding.
|
||||
The gateway does not create or migrate tables at runtime.
|
||||
|
||||
Register core's saved views, saved reports and saved bulk-load profiles (if the app uses them)
|
||||
before the gateway producer: endpoint pickers for a source the app hasn't registered become plain
|
||||
id fields, so the instance still validates.
|
||||
|
||||
Register metadata while building the QInstance:
|
||||
|
||||
```java
|
||||
|
||||
@@ -29,6 +29,7 @@ import com.kingsrook.qqq.backend.core.alerts.QAlertTypeMetaData;
|
||||
import com.kingsrook.qqq.backend.core.exceptions.QException;
|
||||
import com.kingsrook.qqq.backend.core.model.metadata.MetaDataProducerMultiOutput;
|
||||
import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
|
||||
import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData;
|
||||
import com.kingsrook.qqq.backend.core.model.metadata.layout.QAppMetaData;
|
||||
import com.kingsrook.qqq.backend.core.model.metadata.layout.QAppSection;
|
||||
import com.kingsrook.qqq.backend.core.model.metadata.layout.QIcon;
|
||||
@@ -43,6 +44,9 @@ import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
|
||||
*******************************************************************************/
|
||||
public class FileGatewayQBitProducer implements QBitMetaDataProducer<FileGatewayQBitConfig>
|
||||
{
|
||||
/** Core possible-value sources a host may or may not register. */
|
||||
static final java.util.Set<String> OPTIONAL_HOST_SOURCES = java.util.Set.of("savedView", "savedReport", "savedBulkLoadProfile");
|
||||
|
||||
/*******************************************************************************
|
||||
** The sftp wall owns its list (core's qbit prefixes are transitional and the
|
||||
** assistant may now read audits): partners never reach identity, audits,
|
||||
@@ -149,6 +153,7 @@ public class FileGatewayQBitProducer implements QBitMetaDataProducer<FileGateway
|
||||
table = qBitConfig.getTableMetaDataCustomizer().customizeMetaData(qInstance, table);
|
||||
}
|
||||
table.setSourceQBitName(qBit.getName());
|
||||
dropMissingPickers(qInstance, table);
|
||||
output.add(table);
|
||||
if(FileGatewayTables.MAIN.contains(table.getName()))
|
||||
{
|
||||
@@ -187,4 +192,25 @@ public class FileGatewayQBitProducer implements QBitMetaDataProducer<FileGateway
|
||||
new com.kingsrook.qbits.filegateway.storage.ObjectStorageGatewayStore(qInstance, qBitConfig.getFileGatewayBucketAlias()), qBitConfig, java.time.Clock.systemUTC()));
|
||||
return (new MetaDataProducerMultiOutput());
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Saved views, saved reports and saved bulk-load profiles are optional in a
|
||||
** host. A picker whose possible-value source the host has not registered (yet)
|
||||
** stays a plain id field, so the instance validates; register those core
|
||||
** metadata providers before this producer to get the pickers.
|
||||
*******************************************************************************/
|
||||
static void dropMissingPickers(QInstance qInstance, QTableMetaData table)
|
||||
{
|
||||
for(QFieldMetaData field : table.getFields().values())
|
||||
{
|
||||
String source = field.getPossibleValueSourceName();
|
||||
if(source != null && OPTIONAL_HOST_SOURCES.contains(source) && qInstance.getPossibleValueSource(source) == null)
|
||||
{
|
||||
field.setPossibleValueSourceName(null);
|
||||
field.setPossibleValueSourceFilter(null);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -100,6 +100,8 @@ class FileGatewayQBitProducerTest
|
||||
void contingentPickerMetadata(String source) throws Exception
|
||||
{
|
||||
var instance = new QInstance();
|
||||
instance.addPossibleValueSource(new com.kingsrook.qqq.backend.core.model.metadata.possiblevalues.QPossibleValueSource().withName(source)
|
||||
.withType(com.kingsrook.qqq.backend.core.model.metadata.possiblevalues.QPossibleValueSourceType.TABLE).withTableName(source));
|
||||
new FileGatewayQBitProducer().withQBitConfig(new FileGatewayQBitConfig()).produce(instance);
|
||||
var field = instance.getTable(FileGatewayTables.ALIAS).getField(source + "Id");
|
||||
assertThat(field.getPossibleValueSourceName()).isEqualTo(source);
|
||||
@@ -112,4 +114,27 @@ class FileGatewayQBitProducerTest
|
||||
});
|
||||
assertThat(filter.getSubFilters()).isNullOrEmpty();
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** A host without saved views, reports or bulk-load profiles still validates:
|
||||
** those pickers become plain id fields; present sources keep their pickers.
|
||||
*******************************************************************************/
|
||||
@Test
|
||||
void dropsPickersForMissingHostSources() throws Exception
|
||||
{
|
||||
QInstance instance = new QInstance();
|
||||
com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData alias = FileGatewayTables.tables(new FileGatewayQBitConfig()).stream()
|
||||
.filter(t -> t.getName().equals(FileGatewayTables.ALIAS)).findFirst().orElseThrow();
|
||||
instance.addPossibleValueSource(new com.kingsrook.qqq.backend.core.model.metadata.possiblevalues.QPossibleValueSource().withName("savedView")
|
||||
.withType(com.kingsrook.qqq.backend.core.model.metadata.possiblevalues.QPossibleValueSourceType.TABLE).withTableName("savedView"));
|
||||
FileGatewayQBitProducer.dropMissingPickers(instance, alias);
|
||||
assertThat(alias.getField("savedViewId").getPossibleValueSourceName()).isEqualTo("savedView");
|
||||
assertThat(alias.getField("savedViewId").getPossibleValueSourceFilter()).isNotNull();
|
||||
assertThat(alias.getField("savedReportId").getPossibleValueSourceName()).isNull();
|
||||
assertThat(alias.getField("savedReportId").getPossibleValueSourceFilter()).isNull();
|
||||
assertThat(alias.getField("savedBulkLoadProfileId").getPossibleValueSourceName()).isNull();
|
||||
assertThat(alias.getField("tableName").getPossibleValueSourceName()).isEqualTo("tables");
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user