@linzjs/step-ag-grid 14.9.1 → 14.9.3

package/package.json

@@ -2,7 +2,7 @@
   "name": "@linzjs/step-ag-grid",
   "repository": "github:linz/step-ag-grid.git",
   "license": "MIT",
-  "version": "14.9.1",
+  "version": "14.9.3",
   "keywords": [
     "aggrid",
     "ag-grid",
@@ -44,7 +44,6 @@
     "react": ">=17",
     "react-dom": ">=17",
     "react-transition-state": "^2.0.2",
-    "sanitize-filename": "^1.6.3",
     "uuid": "^9.0.0"
   },
   "scripts": {

package/src/components/Grid.tsx

@@ -124,7 +124,7 @@ export const Grid = ({
     }
 
     const headerCellCount = gridDivRef.current?.getElementsByClassName("ag-header-cell-label")?.length;
-    if (headerCellCount != params.columnDefs.length) {
+    if (headerCellCount < 2) {
       // Don't resize grids until all the columns are visible
       // as `autoSizeColumns` will fail silently in this case
       needsAutoSize.current = true;

package/src/lui/timeoutHook.tsx

@@ -43,11 +43,17 @@ interface IntervalHookProps {
   timeoutMs: number;
   callback: () => void;
 }
+
 export const useIntervalHook = ({ callback, timeoutMs }: IntervalHookProps) => {
+  const callbackRef = useRef(callback);
+  callbackRef.current = callback;
+
   useEffect(() => {
-    const interval = setInterval(callback, timeoutMs);
+    const interval = setInterval(() => {
+      callbackRef.current && callbackRef.current();
+    }, timeoutMs);
     return () => {
       clearInterval(interval);
     };
-  });
+  }, [timeoutMs]);
 };

package/src/utils/util.test.ts

@@ -13,7 +13,17 @@ describe("sanitiseFileName", () => {
     expect(isFloat(".1")).toBe(true);
   });
   test("sanitiseFileName", () => {
-    expect(sanitiseFileName(" LT 1235/543 &%//*$ ")).toBe("LT_1235-543_&%-$");
-    expect(sanitiseFileName(" @filename here!!! ")).toBe("@filename_here!!!");
+    expect(sanitiseFileName(" LT 1235/543 &%//*$.csv ")).toBe("LT_1235-543_-.csv");
+    expect(sanitiseFileName(" @filename here!!!.csv ")).toBe("filename_here.csv");
+    // Trim to 64 char max for non extension part
+    expect(sanitiseFileName("long_long_long_long_long_long_long_long_long_long_long_long_long_long_.csv")).toBe(
+      "long_long_long_long_long_long_long_long_long_long_long_long_long.csv",
+    );
+    // Test with no extension
+    expect(sanitiseFileName("long_long_long_long_long_long_long_long_long_long_long_long_long_long_")).toBe(
+      "long_long_long_long_long_long_long_long_long_long_long_long_long",
+    );
+    // Test with no name
+    expect(sanitiseFileName(".csv")).toBe(".csv");
   });
 });

package/src/utils/util.ts

@@ -1,5 +1,4 @@
 import { isEmpty, negate } from "lodash-es";
-import sanitize from "sanitize-filename";
 
 export const isNotEmpty = negate(isEmpty);
 
@@ -47,11 +46,15 @@ export const stringByteLengthIsInvalid = (str: string, maxBytes: number) =>
 
 export const fnOrVar = (fn: any, param: any) => (typeof fn === "function" ? fn(param) : fn);
 
-/**
- * Trim filename and replaces troublesome characters.
- *
- * e.g. " LT 1235/543 &%//*$ " => "LT_1235-543_&%-$"
- * e.g. " @filename here!!!" => "@filename_here!!!"
- */
-export const sanitiseFileName = (filename: string): string =>
-  sanitize(filename.trim().replaceAll(/(\/|\\)+/g, "-")).replaceAll(/\s+/g, "_");
+export const sanitiseFileName = (filename: string): string => {
+  const valid = filename
+    .trim()
+    .replaceAll(/(\/|\\)+/g, "-")
+    .replaceAll(/\s+/g, "_")
+    .replaceAll(/[^\w\-āēīōūĀĒĪŌŪ.]/g, "");
+  const parts = valid.split(".");
+  const fileExt = parts.length > 1 ? parts.pop() : undefined;
+  // Arbitrary max filename length of 64 chars + extension
+  if (!fileExt) return valid.slice().slice(0, 64);
+  return valid.slice(0, -fileExt.length - 1).slice(0, 64) + "." + fileExt;
+};