1.2.5

Lookbehind in regex is not supported in Safari browsers. This implementation
should be more efficient so why not.

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 1.2.5 (2021-03-12)
+
+- Support specifying custom types when uploading files.
+- Fix JS compatibility issue with Safari browser.
+
 ## 1.2.4 (2021-02-24)
 
 - The data model state of a CPE is no longer forgotten after unsuccessful

README.md

@@ -17,7 +17,7 @@ supported versions are:
 
 Install GenieACS from NPM:
 
-    sudo npm install -g --unsafe-perm genieacs
+    sudo npm install -g genieacs
 
 To build from source instead, clone this repo or download the source archive
 then _cd_ into the source directory then run:

docs/installation-guide.rst

@@ -34,7 +34,7 @@ Install GenieACS
 
   .. parsed-literal::
 
-    sudo npm install -g --unsafe-perm genieacs@\ |release|
+    sudo npm install -g genieacs@\ |release|
 
 .. topic:: Installing from source
 

lib/common/yaml.ts

@@ -29,21 +29,36 @@ function stringifyKey(str: string): string {
 function foldString(str: string): string[] {
   if (str.length <= LINE_WIDTH) return [str];
   if (str.startsWith(" ")) return [str];
-  const words = str.split(/(?<=[^ ]) (?=[^ ])/);
   const lines: string[] = [];
 
   let idx = 0;
-  let len = 0;
-  for (const [i, word] of words.entries()) {
-    len += word.length + 1;
-    if (len >= LINE_WIDTH && len !== word.length) {
-      lines.push(words.slice(idx, i).join(" "));
-      idx = i;
-      len = 0;
-    }
+  let cand = 0;
+  for (let i = 1; i < str.length - 1; ++i) {
+    if (str[i] !== " ") continue;
+
+    if (str[i + 1] === " ") {
+      i += 2;
+      while (str[i] === " ") ++i;
+      continue;
     }
 
-  if (idx < words.length) lines.push(words.slice(idx).join(" "));
+    if (i <= idx + LINE_WIDTH) {
+      cand = i;
+      continue;
+    }
+
+    const c = cand > idx ? cand : i;
+    lines.push(str.slice(idx, c));
+    idx = c + 1;
+    cand = i;
+  }
+
+  if (cand > idx && str.length > idx + LINE_WIDTH) {
+    lines.push(str.slice(idx, cand));
+    idx = cand + 1;
+  }
+
+  lines.push(str.slice(idx));
 
   return lines;
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "genieacs",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "A TR-069 Auto Configuration Server (ACS)",
   "repository": {
     "type": "git",
@@ -41,33 +41,33 @@
     "@rollup/plugin-typescript": "^8.2.0",
     "@types/codemirror": "0.0.108",
     "@types/jsonwebtoken": "^8.5.0",
-    "@types/koa": "^2.13.0",
+    "@types/koa": "^2.13.1",
     "@types/koa-compress": "^4.0.1",
     "@types/koa-router": "^7.4.1",
     "@types/koa-static": "^4.0.1",
     "@types/mithril": "^2.0.6",
-    "@types/mongodb": "^3.6.8",
-    "@types/node": "^14.14.31",
+    "@types/mongodb": "^3.6.9",
+    "@types/node": "^14.14.34",
     "@types/parsimmon": "^1.10.6",
-    "@types/seedrandom": "^2.4.28",
-    "@typescript-eslint/eslint-plugin": "^4.15.2",
-    "@typescript-eslint/parser": "^4.15.2",
+    "@types/seedrandom": "^3.0.0",
+    "@typescript-eslint/eslint-plugin": "^4.17.0",
+    "@typescript-eslint/parser": "^4.17.0",
     "ava": "^3.15.0",
     "codemirror": "^5.59.4",
     "cssnano": "^4.1.10",
-    "eslint": "^7.20.0",
+    "eslint": "^7.22.0",
     "eslint-config-prettier": "^8.1.0",
     "esm": "^3.2.25",
     "mithril": "^2.0.4",
-    "postcss": "^8.2.6",
+    "postcss": "^8.2.8",
     "postcss-import": "^14.0.0",
     "postcss-preset-env": "^6.7.0",
     "prettier": "^2.2.1",
-    "rollup": "^2.39.1",
+    "rollup": "^2.41.2",
     "rollup-plugin-terser": "^7.0.2",
-    "svgo": "^2.1.0",
+    "svgo": "^2.2.2",
     "ts-node": "^9.1.1",
-    "typescript": "^4.1.5",
+    "typescript": "^4.2.3",
     "yaml": "^1.10.0"
   },
   "engines": {

ui/css/app.css

@@ -342,6 +342,13 @@ body {
   flex-grow: 1;
   margin: 10px;
   min-height: 250px;
+
+  /* Workaround for Chrome ignoring bottom margin when flex container overflows */
+  &::after {
+    content: "";
+    display: block;
+    padding-bottom: 1px;
+  }
 }
 
 table.table {

ui/datalist.ts

@@ -0,0 +1,62 @@
+/**
+ * Copyright 2013-2021  GenieACS Inc.
+ *
+ * This file is part of GenieACS.
+ *
+ * GenieACS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * GenieACS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with GenieACS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import m, { ClosureComponent, Component, Vnode } from "mithril";
+
+const elements: Map<string, Vnode> = new Map();
+
+// Source: https://werxltd.com/wp/2010/05/13/javascript-implementation-of-javas-string-hashcode-method/
+function hash(str: string): number {
+  let res = 0;
+  for (let i = 0; i < str.length; ++i) {
+    const c = str.charCodeAt(i);
+    res = (res << 5) - res + c;
+    res |= 0;
+  }
+  return res;
+}
+
+export function getDatalistId(options: string[]): string {
+  const id = "datalist" + options.reduce((acc, cur) => acc ^ hash(cur), 0);
+  if (!elements.has(id)) {
+    const n = m(
+      "datalist",
+      { id },
+      options.map((o) => m("option", { value: o }))
+    );
+    elements.set(id, n);
+  }
+  return id;
+}
+
+const component: ClosureComponent = (): Component => {
+  return {
+    view: () => {
+      return [...elements.values()];
+    },
+    onupdate: () => {
+      for (const id of elements.keys()) {
+        const used = document.querySelector(`[list='${id}']`);
+        if (!used) elements.delete(id);
+      }
+    },
+  };
+};
+
+export default component;

ui/drawer-component.ts

@@ -121,12 +121,15 @@ function renderStagingDownload(task: StageTask): Children {
   if (productClass) productClass = decodeURIComponent(productClass);
 
   const typesList = [
+    ...new Set([
       "",
       "1 Firmware Upgrade Image",
       "2 Web Content",
       "3 Vendor Configuration File",
       "4 Tone File",
       "5 Ringer File",
+      ...files.value.map((f) => f["metadata.fileType"]).filter((f) => f),
+    ]),
   ].map((t) =>
     m(
       "option",

ui/files-page.ts

@@ -45,7 +45,6 @@ const attributes: {
   {
     id: "metadata.fileType",
     label: "Type",
-    type: "combo",
     options: [
       "1 Firmware Upgrade Image",
       "2 Web Content",

ui/layout.ts

@@ -24,6 +24,7 @@ import userMenu from "./user-menu";
 import adminMenu from "./admin-menu";
 import * as overlay from "./overlay";
 import { version as VERSION } from "../package.json";
+import datalist from "./datalist";
 
 const adminPages = [
   "presets",
@@ -69,6 +70,7 @@ const component: ClosureComponent = (): Component => {
           ])
         ),
         overlay.render(),
+        m(datalist),
       ];
     },
   };

ui/put-form-component.ts

@@ -20,6 +20,7 @@
 import { VnodeDOM, ClosureComponent, Component, Children } from "mithril";
 import { m } from "./components";
 import codeEditorComponent from "./code-editor-component";
+import { getDatalistId } from "./datalist";
 
 const singular = {
   presets: "preset",
@@ -151,9 +152,14 @@ function createField(current, attr, focus): Children {
     });
   }
 
+  let datalist: string = null;
+  if (attr.options) datalist = getDatalistId(attr.options);
+
   return m("input", {
     type: attr.type === "password" ? "password" : "text",
     name: attr.id,
+    list: datalist,
+    autocomplete: datalist ? "off" : null,
     disabled: attr.id === "_id" && !current.isNew,
     value: current.object[attr.id],
     oncreate: focus