Remove the user-defined flag field option (#7447)

Author: labkey-klum

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

@@ -40,7 +40,6 @@ public class GWTDomain<FieldType extends GWTPropertyDescriptor> implements IsSer
     @Getter @Setter private String container;
     @Getter @Setter private boolean allowFileLinkProperties;
     @Getter @Setter private boolean allowAttachmentProperties;
-    @Getter @Setter private boolean allowFlagProperties;
     @Getter @Setter private boolean allowTextChoiceProperties;
     @Getter @Setter private boolean allowMultiChoiceProperties;
     @Getter @Setter private boolean allowSampleSubjectProperties;
@@ -89,7 +88,6 @@ public GWTDomain(GWTDomain<FieldType> src)
         this.container = src.container;
         this.allowFileLinkProperties = src.allowFileLinkProperties;
         this.allowAttachmentProperties = src.allowAttachmentProperties;
-        this.allowFlagProperties = src.allowFlagProperties;
         this.allowTextChoiceProperties = src.allowTextChoiceProperties;
         this.allowMultiChoiceProperties = src.allowMultiChoiceProperties;
         this.allowSampleSubjectProperties = src.allowSampleSubjectProperties;

api/gwtsrc/org/labkey/api/gwt/client/ui/PropertyType.java

@@ -40,7 +40,6 @@ public enum PropertyType
     xsdTime("http://www.w3.org/2001/XMLSchema#time", true, "Time", null, "time"),
     expFileLink("http://cpas.fhcrc.org/exp/xml#fileLink", false, "File"),
     expAttachment("http://www.labkey.org/exp/xml#attachment", false, "Attachment"),
-    expFlag("http://www.labkey.org/exp/xml#flag", false, "Flag (String)"),
     xsdFloat("http://www.w3.org/2001/XMLSchema#float", true, "Number (Float)", "Float", "float"),
     xsdDecimal("http://www.w3.org/2001/XMLSchema#decimal", true, "Number (Decimal)", "Decimal", "float"),
     xsdLong("http://www.w3.org/2001/XMLSchema#long", true, "Long Integer", "Long", "int"),

api/src/org/labkey/api/assay/AbstractAssayProvider.java

@@ -1688,12 +1688,6 @@ public Pair<ExpProtocol, Integer> getAssayResultRowIdFromLsid(Container containe
         return Pair.of(protocol, rowId);
     }
 
-    @Override
-    public boolean supportsFlagColumnType(ExpProtocol.AssayDomainTypes type)
-    {
-        return false;
-    }
-
     @Override
     public Module getDeclaringModule()
     {

api/src/org/labkey/api/assay/AssayProvider.java

@@ -22,9 +22,9 @@
 import org.jetbrains.annotations.Nullable;
 import org.labkey.api.assay.actions.AssayRunUploadForm;
 import org.labkey.api.assay.pipeline.AssayRunAsyncContext;
+import org.labkey.api.assay.plate.FilterCriteria;
 import org.labkey.api.assay.transform.AnalysisScript;
 import org.labkey.api.assay.transform.DataExchangeHandler;
-import org.labkey.api.assay.plate.FilterCriteria;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.ContainerFilter;
 import org.labkey.api.exp.ExperimentException;
@@ -331,8 +331,6 @@ enum Scope
 
     void registerLsidHandler();
 
-    boolean supportsFlagColumnType(ExpProtocol.AssayDomainTypes type);
-
     /**@ return the module in which this assay provider is declared */
     Module getDeclaringModule();
 

api/src/org/labkey/api/assay/AssayUrls.java

@@ -88,7 +88,6 @@ public interface AssayUrls extends UrlProvider
     ActionURL getUpdateQCStateURL(Container container, ExpProtocol protocol);
 
     ActionURL getBeginURL(Container container);
-    ActionURL getSetResultFlagURL(Container container);
     ActionURL getChooseAssayTypeURL(Container container);
     ActionURL getImportAssayDesignURL(Container container);
     ActionURL getShowSelectedDataURL(Container container, ExpProtocol protocol);

api/src/org/labkey/api/exp/PropertyDescriptor.java

@@ -545,12 +545,7 @@ public Map<String, Object> getAuditRecordMap(@Nullable String validatorStr, @Nul
         if (!StringUtils.isEmpty(getLabel()))
             map.put("Label", getLabel());
         if (null != getPropertyType())
-        {
-            if (org.labkey.api.gwt.client.ui.PropertyType.expFlag.getURI().equals(getConceptURI()))
-                map.put("Type", "Flag");
-            else
-                map.put("Type", getPropertyType().getXarName());
-        }
+            map.put("Type", getPropertyType().getXarName());
         if (getPropertyType().getJdbcType().isText())
             map.put("Scale", getScale());
         if (!StringUtils.isEmpty(getDescription()))

api/src/org/labkey/api/exp/property/DomainKind.java

@@ -321,7 +321,6 @@ public boolean matchesTemplateXML(String templateName, DomainTemplateType templa
 
     public boolean allowFileLinkProperties() { return false; }
     public boolean allowAttachmentProperties() { return false; }
-    public boolean allowFlagProperties() { return true; }
     public boolean allowTextChoiceProperties() { return true; }
     public boolean allowMultiChoiceProperties() { return false; }
     public boolean allowSampleSubjectProperties() { return true; }

api/src/org/labkey/api/exp/property/DomainUtil.java

@@ -458,7 +458,6 @@ private static GWTDomain<GWTPropertyDescriptor> getDomain(Domain dd)
         {
             gwtDomain.setAllowAttachmentProperties(kind.allowAttachmentProperties());
             gwtDomain.setAllowFileLinkProperties(kind.allowFileLinkProperties());
-            gwtDomain.setAllowFlagProperties(kind.allowFlagProperties());
             gwtDomain.setAllowTextChoiceProperties(kind.allowTextChoiceProperties());
             gwtDomain.setAllowMultiChoiceProperties(allowMultiChoice(kind));
             gwtDomain.setAllowSampleSubjectProperties(kind.allowSampleSubjectProperties());
@@ -478,7 +477,6 @@ public static GWTDomain<GWTPropertyDescriptor> getTemplateDomainForDomainKind(Do
         gwtDomain.setDomainKindName(kind.getKindName());
         gwtDomain.setAllowAttachmentProperties(kind.allowAttachmentProperties());
         gwtDomain.setAllowFileLinkProperties(kind.allowFileLinkProperties());
-        gwtDomain.setAllowFlagProperties(kind.allowFlagProperties());
         gwtDomain.setAllowTextChoiceProperties(kind.allowTextChoiceProperties());
         gwtDomain.setAllowMultiChoiceProperties(allowMultiChoice(kind));
         gwtDomain.setAllowSampleSubjectProperties(kind.allowSampleSubjectProperties());

assay/package-lock.json

@@ -12,7 +12,7 @@
     "clean": "rimraf resources/web/assay/gen && rimraf resources/views/gen && rimraf resources/web/gen"
   },
   "dependencies": {
-    "@labkey/components": "7.20.2"
+    "@labkey/components": "7.20.5"
   },
   "devDependencies": {
     "@labkey/build": "8.8.0",