Add null-pointer check in getFieldAndTable (but be careful downstream...)

put commas in +n on filter human-strings
Change to post multipart/form-data for exports - fixes giant filter making request-too-big error from javalin
2025-07-21 06:38:43 +00:00 · 2024-02-23 14:58:35 -06:00 · 2024-02-23 14:58:15 -06:00 · 2024-02-23 14:57:51 -06:00 · 2024-02-22 20:30:51 -06:00 · 2024-02-22 12:16:27 -06:00
4 changed files with 11 additions and 6 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -7,7 +7,7 @@ orbs:
 executors:
  java17:
    docker:
-      - image: 'cimg/openjdk:17.0'
+      - image: 'cimg/openjdk:17.0.9'

 commands:
  install_java17:
--- a/src/qqq/components/query/ExportMenuItem.tsx
+++ b/src/qqq/components/query/ExportMenuItem.tsx
@ -45,7 +45,7 @@ export default function ExportMenuItem(props: QExportMenuItemProps)

   return (
      <MenuItem
-         disabled={!totalRecords}
+         disabled={totalRecords === 0}
         onClick={() =>
         {
            ///////////////////////////////////////////////////////////////////////////////
@ -98,7 +98,7 @@ export default function ExportMenuItem(props: QExportMenuItemProps)
                  </head>
                  <body>
                     Generating file <u>${filename}</u>${totalRecords ? " with " + totalRecords.toLocaleString() + " record" + (totalRecords == 1 ? "" : "s") : ""}...
-                     <form id="exportForm" method="post" action="${url}" >
+                     <form id="exportForm" method="post" action="${url}" enctype="multipart/form-data">
                        <input type="hidden" name="fields" value="${visibleFields.join(",")}">
                        <input type="hidden" name="filter" id="filter">
                     </form>
--- a/src/qqq/utils/qqq/FilterUtils.tsx
+++ b/src/qqq/utils/qqq/FilterUtils.tsx
@ -395,10 +395,10 @@ class FilterUtils
            switch (andMoreFormat)
            {
               case "andNOther":
-                  labels.push(` and ${n} other value${n == 1 ? "" : "s"}.`);
+                  labels.push(` and ${n.toLocaleString()} other value${n == 1 ? "" : "s"}.`);
                  break;
               case "+N":
-                  labels[labels.length-1] += ` +${n}`;
+                  labels[labels.length-1] += ` +${n.toLocaleString()}`;
                  break;
            }
         }
--- a/src/qqq/utils/qqq/TableUtils.ts
+++ b/src/qqq/utils/qqq/TableUtils.ts
@ -93,6 +93,11 @@ class TableUtils
    *******************************************************************************/
   public static getFieldAndTable(tableMetaData: QTableMetaData, fieldName: string): [QFieldMetaData, QTableMetaData]
   {
+      if(fieldName == null || tableMetaData == null)
+      {
+         return ([null, null]);
+      }
+
      if (fieldName.indexOf(".") > -1)
      {
         const nameParts = fieldName.split(".", 2);
@ -110,7 +115,7 @@ class TableUtils
         return ([tableMetaData.fields.get(fieldName), tableMetaData]);
      }

-      return (null);
+      return ([null, null]);
   }
Author	SHA1	Message	Date
Darin Kelkhoff	28ae2283f6	Add null-pointer check in getFieldAndTable (but be careful downstream...)	2024-02-23 14:58:35 -06:00
Darin Kelkhoff	077845bc42	put commas in +n on filter human-strings	2024-02-23 14:58:15 -06:00
Darin Kelkhoff	0262f8e365	Change to post multipart/form-data for exports - fixes giant filter making request-too-big error from javalin	2024-02-23 14:57:51 -06:00
Darin Kelkhoff	8cffbbcac4	Update to cimg/openjdk:17.0.9	2024-02-22 20:30:51 -06:00
Darin Kelkhoff	37eb280d79	Revert to previous check for disabling export-menu items - that is - totalRecords === 0, instead of !totalRecords. makes tables w/o count allowed to do exports again.	2024-02-22 12:16:27 -06:00