@teselagen/ui 0.3.68 → 0.3.70

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teselagen/ui",
-  "version": "0.3.68",
+  "version": "0.3.70",
   "main": "./src/index.js",
   "exports": {
     ".": {

package/src/FormComponents/Uploader.js

@@ -729,7 +729,8 @@ function UploaderInner({
                         csvValidationIssue: _csvValidationIssue,
                         matchedHeaders,
                         userSchema,
-                        searchResults
+                        searchResults,
+                        ignoredHeadersMsg
                       } = await tryToMatchSchemas({
                         incomingData: parsedF.data,
                         validateAgainstSchema
@@ -790,6 +791,7 @@ function UploaderInner({
                           filesWIssues.push({
                             file,
                             csvValidationIssue,
+                            ignoredHeadersMsg,
                             matchedHeaders,
                             userSchema,
                             searchResults
@@ -798,6 +800,7 @@ function UploaderInner({
                           filesWOIssues.push({
                             file,
                             csvValidationIssue,
+                            ignoredHeadersMsg,
                             matchedHeaders,
                             userSchema,
                             searchResults

package/src/FormComponents/tryToMatchSchemas.js

@@ -28,10 +28,11 @@ export default async function tryToMatchSchemas({
   await resolveValidateAgainstSchema(validateAgainstSchema);
   const userSchema = getSchema(incomingData);
 
-  const { searchResults, csvValidationIssue } = await matchSchemas({
-    userSchema,
-    officialSchema: validateAgainstSchema
-  });
+  const { searchResults, csvValidationIssue, ignoredHeadersMsg } =
+    await matchSchemas({
+      userSchema,
+      officialSchema: validateAgainstSchema
+    });
 
   const incomingHeadersToScores = {};
 
@@ -67,6 +68,7 @@ export default async function tryToMatchSchemas({
   });
 
   return {
+    ignoredHeadersMsg,
     csvValidationIssue,
     matchedHeaders,
     userSchema,
@@ -150,7 +152,10 @@ async function matchSchemas({ userSchema, officialSchema }) {
           matchedAltPaths.includes(uh.path)
       )
     ) {
-      ignoredUserSchemaFields.push(uh);
+      // check that the column does contain data (if it doesn't, it's probably a blank column)
+      if (userSchema.userData.some(e => e[uh.path])) {
+        ignoredUserSchemaFields.push(uh);
+      }
     }
   });
 
@@ -224,18 +229,16 @@ async function matchSchemas({ userSchema, officialSchema }) {
     }
     // csvValidationIssue = `Some of the data doesn't look quite right. Do these header mappings look correct?`;
   }
-  // if (!csvValidationIssue) {
-  //   //all the headers match up as does the actual data
-  //   return { csvValidationIssue };
-  // }
-  if (!csvValidationIssue && ignoredUserSchemaFields.length) {
-    csvValidationIssue = `It looks like the following headers in your file didn't map to any of the accepted headers: ${ignoredUserSchemaFields
+  let ignoredHeadersMsg;
+  if (ignoredUserSchemaFields.length) {
+    ignoredHeadersMsg = `It looks like the following headers in your file didn't map to any of the accepted headers: ${ignoredUserSchemaFields
       .map(f => f.displayName || f.path)
       .join(", ")}`;
   }
   return {
     searchResults: officialSchema.fields,
-    csvValidationIssue
+    csvValidationIssue,
+    ignoredHeadersMsg
   };
 }
 

package/src/MatchHeaders.js

@@ -13,6 +13,7 @@ export function MatchHeaders({
   onMultiFileUploadSubmit,
   doAllFilesHaveSameHeaders,
   csvValidationIssue,
+  ignoredHeadersMsg,
   searchResults,
   matchedHeaders,
   userSchema,
@@ -37,6 +38,11 @@ export function MatchHeaders({
           {csvValidationIssue}
         </Callout>
       )}
+      {!onMultiFileUploadSubmit && ignoredHeadersMsg && (
+        <Callout style={{ width: "fit-content" }} intent="warning">
+          {ignoredHeadersMsg}
+        </Callout>
+      )}
       <br></br>
       <tr
         style={{

package/src/UploadCsvWizard.js

@@ -76,6 +76,7 @@ const UploadCsvWizardDialog = compose(
   doAllFilesHaveSameHeaders,
   destroyForms,
   csvValidationIssue,
+  ignoredHeadersMsg,
   searchResults,
   matchedHeaders,
   userSchema,
@@ -222,6 +223,7 @@ const UploadCsvWizardDialog = compose(
                       destroyForms,
                       setFilesWIssues,
                       csvValidationIssue,
+                      ignoredHeadersMsg,
                       searchResults,
                       matchedHeaders,
                       userSchema,
@@ -266,6 +268,7 @@ const UploadCsvWizardDialog = compose(
                 reduxFormEntitiesArray,
                 // onMultiFileUploadSubmit,
                 csvValidationIssue,
+                ignoredHeadersMsg,
                 searchResults,
                 matchedHeaders,
                 userSchema,
@@ -312,6 +315,7 @@ const UploadCsvWizardDialog = compose(
           searchResults,
           onUploadWizardFinish,
           csvValidationIssue,
+          ignoredHeadersMsg,
           matchedHeaders,
           //fromRedux:
           changeForm,
@@ -344,6 +348,7 @@ const UploadCsvWizardDialogInner = compose(
   searchResults,
   onUploadWizardFinish,
   csvValidationIssue,
+  ignoredHeadersMsg,
   matchedHeaders,
   //fromRedux:
   handleSubmit,
@@ -383,6 +388,7 @@ const UploadCsvWizardDialogInner = compose(
         {...{
           onMultiFileUploadSubmit,
           csvValidationIssue,
+          ignoredHeadersMsg,
           searchResults,
           matchedHeaders,
           userSchema,

package/src/style.css

@@ -242,3 +242,7 @@ button:not(:disabled):active {
   text-align: unset !important;
   cursor: pointer !important;
 } */
+
+.bp3-dialog-header .bp3-heading {
+  width: 10px; /* tnw: this is a hack to prevent the dialog title from causing the dialog width to expand larger than the dialog content*/
+}

package/style.css

@@ -9060,6 +9060,10 @@ button:not(:disabled):active {
   text-align: unset !important;
   cursor: pointer !important;
 } */
+
+.bp3-dialog-header .bp3-heading {
+  width: 10px; /* tnw: this is a hack to prevent the dialog title from causing the dialog width to expand larger than the dialog content*/
+}
 .tippy-box[data-animation=fade][data-state=hidden]{opacity:0}[data-tippy-root]{max-width:calc(100vw - 10px)}.tippy-box{position:relative;background-color:#333;color:#fff;border-radius:4px;font-size:14px;line-height:1.4;white-space:normal;outline:0;transition-property:transform,visibility,opacity}.tippy-box[data-placement^=top]>.tippy-arrow{bottom:0}.tippy-box[data-placement^=top]>.tippy-arrow:before{bottom:-7px;left:0;border-width:8px 8px 0;border-top-color:initial;transform-origin:center top}.tippy-box[data-placement^=bottom]>.tippy-arrow{top:0}.tippy-box[data-placement^=bottom]>.tippy-arrow:before{top:-7px;left:0;border-width:0 8px 8px;border-bottom-color:initial;transform-origin:center bottom}.tippy-box[data-placement^=left]>.tippy-arrow{right:0}.tippy-box[data-placement^=left]>.tippy-arrow:before{border-width:8px 0 8px 8px;border-left-color:initial;right:-7px;transform-origin:center left}.tippy-box[data-placement^=right]>.tippy-arrow{left:0}.tippy-box[data-placement^=right]>.tippy-arrow:before{left:-7px;border-width:8px 8px 8px 0;border-right-color:initial;transform-origin:center right}.tippy-box[data-inertia][data-state=visible]{transition-timing-function:cubic-bezier(.54,1.5,.38,1.11)}.tippy-arrow{width:16px;height:16px;color:#333}.tippy-arrow:before{content:"";position:absolute;border-color:transparent;border-style:solid}.tippy-content{position:relative;padding:5px 9px;z-index:1}.rg-celleditor-input,
 .rg-celleditor input {
   border: none;