properties.shouldShow()

archive-configurations/ELAR/fields.json5

@@ -15,20 +15,6 @@
       description: "This is usually the same person as the Collection Steward."
     }
   ],
-  session: [
-    {
-      key: "description"
-      //multilingual: true
-    },
-    {
-      key: "customFields",
-      visibility: "never"
-    }
-  ],
-  people: [
-    {
-      key: "customFields",
-      visibility: "never"
-    }
-  ]
+  session: [],
+  people: []
 }

archive-configurations/lameta/fields.json5

@@ -86,7 +86,7 @@
     {
       key: "archiveConfigurationName",
       form: "ArchiveConfiguration",
-      default: "unknown",
+      default: "default",
       xmlTag: "ArchiveConfigurationName",
       englishLabel: "Archive Configuration used by this project",
       vocabulary: "ArchiveConfigurationName"

e2e/e2eFileList.ts

@@ -33,6 +33,8 @@ export class E2eFileList {
     // this gets really flaky with the mocking and background copying.
     // for now, if we actualy need this file, let's just put it where we want it
     if (wait) {
+      // pause for a second
+      await this.page.waitForTimeout(500);
       fs.writeFileSync(wait.path, "hello world");
 
       await waitForCondition(wait.page, () => {

package.json

@@ -20,6 +20,7 @@
     "//----watch": "The nature of watch is that we can't run two commands, so you'll have to have 2 terminals if you want to watch both",
     "//---build-is-what-github-actions-runs": "",
     "build": "yarn strings:extract && tsc && yarn vite build",
+    "e2ebuild": "yarn vite build --config vite.config.nonminified.js",
     "postinstall": "yarn patch-package && electron-builder install-app-deps",
     "//----dev": "this is the normal day-to-day way of running while developing, with compiling of main, preload, and render",
     "dev": "yarn check-node && vite",

src/ArchiveConfigurationSummary.tsx

@@ -32,6 +32,8 @@ const ArchiveConfigurationSummary: React.FunctionComponent<
   const personCustomizations = customizations.filter(
     (c) => c.area === "person"
   );
+  console.log("****", props.configurationName);
+
   return (
     <div>
       <h2>Session Access Choices</h2>

src/components/AutoForm.tsx

@@ -170,7 +170,8 @@ class AutoForm extends React.Component<IProps> {
           f.definition.visibility !== "never" &&
           f.definition.showOnAutoForm &&
           !f.definition.isCustom &&
-          !f.definition.isAdditional
+          !f.definition.isAdditional &&
+          f.definition.key !== "customFields" // this is handled special, below
       )
       .sort((a, b) => {
         const x =
@@ -199,7 +200,7 @@ class AutoForm extends React.Component<IProps> {
         ) : (
           ""
         )}
-        {this.props.folder.hasCustomFieldsTable ? (
+        {this.props.folder.properties.shouldShow("customFields") ? (
           <CustomFieldsTable file={this.props.folder.metadataFile!} />
         ) : (
           ""

src/model/Folder/Folder.ts

@@ -128,9 +128,6 @@ export abstract class Folder {
   public get hasMoreFieldsTable(): boolean {
     return false;
   }
-  public get hasCustomFieldsTable(): boolean {
-    return false;
-  }
 
   public abstract importIdMatchesThisFolder(id: string): boolean;
   public abstract get folderType(): IFolderType;

src/model/Project/Session/Session.ts

@@ -165,10 +165,6 @@ export class Session extends Folder {
   public get hasMoreFieldsTable(): boolean {
     return true;
   }
-  public get hasCustomFieldsTable(): boolean {
-    return true;
-  }
-
   // A note about name vs. ID. Here "ID" may be the name or the code, since
   // the rule we inherited from SM Classic is that if a Person has something
   // in the "code" field, then that acts as the display name and id around

src/model/field/FieldSet.ts

@@ -125,4 +125,18 @@ export class FieldSet extends Dictionary<string, Field> {
     field.key = newKey;
     this.setValue(field.key, field);
   }
+
+  public shouldShow(key: string): boolean {
+    if (!this.containsKey(key)) {
+      return false;
+    }
+    if (this.getValueOrThrow(key).definition.visibility === "never") {
+      return false;
+    }
+    // support "ifNotEmpty"
+    if (this.getValueOrThrow(key).definition.visibility === "ifNotEmpty") {
+      return this.getHasValue(key);
+    }
+    return true;
+  }
 }

vite.config.nonminified.js

@@ -0,0 +1,11 @@
+import { defineConfig } from "vite";
+import baseConfig from "./vite.config";
+
+export default defineConfig({
+  ...baseConfig,
+  build: {
+    ...baseConfig.build,
+    minify: false,
+    cssMinify: false
+  }
+});